matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-27 04:21:52 +03:00
Code Activity

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686

Browse Source 
 Conflicts:
	src/components/views/avatars/RoomAvatar.tsx
	test/stores/SpaceStore-test.ts
	test/test-utils.js
This commit is contained in:
Michael Telatynski
2021-07-19 16:47:31 +01:00
parent 5986609731 676d2aa187
commit de42a00ca4
104 changed files with 2492 additions and 2123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/test-utils.js
View File

@ -96,6 +96,7 @@ export function createTestClient() {
},
},
decryptEventIfNeeded: () => Promise.resolve(),
isUserIgnored: jest.fn().mockReturnValue(false),
getCapabilities: jest.fn().mockResolvedValue({}),
};
}