matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-31 13:44:28 +03:00
Code Activity

Merge branch 'develop' into gsouquet/switch-rooms

Browse Source
This commit is contained in:
Germain Souquet
2021-05-26 09:51:27 +01:00
parent 4851e96297 776b7100b5
commit c7c6a818f0
89 changed files with 2555 additions and 1232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/components/views/rooms/MemberList-test.js
View File

@ -88,6 +88,7 @@ describe('MemberList', () => {
};
memberListRoom.currentState = {
members: {},
getMember: jest.fn(),
getStateEvents: (eventType, stateKey) => stateKey === undefined ? [] : null, // ignore 3pid invites
};
for (const member of [...adminUsers, ...moderatorUsers, ...defaultUsers]) {