Merge branch 'develop' into gsouquet/switch-rooms

2021-05-26 09:51:27 +01:00 · 2021-05-26 09:51:27 +01:00 · c7c6a818f0
commit c7c6a818f0
parent 4851e96297 776b7100b5
89 changed files with 2555 additions and 1232 deletions
--- a/test/components/views/rooms/MemberList-test.js
+++ b/test/components/views/rooms/MemberList-test.js
@ -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]) {