1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-28 15:22:05 +03:00

Merge branch 'develop' into improved-forwarding-ui

This commit is contained in:
Robin Townsend
2021-05-19 12:39:48 -04:00
67 changed files with 2134 additions and 567 deletions

View File

@ -95,6 +95,7 @@ export function createTestClient() {
getItem: jest.fn(),
},
},
decryptEventIfNeeded: () => Promise.resolve(),
};
}
@ -233,6 +234,7 @@ export function mkStubRoom(roomId = null, name) {
}),
getMembersWithMembership: jest.fn().mockReturnValue([]),
getJoinedMembers: jest.fn().mockReturnValue([]),
getMembers: jest.fn().mockReturnValue([]),
getPendingEvents: () => [],
getLiveTimeline: () => stubTimeline,
getUnfilteredTimelineSet: () => null,
@ -245,6 +247,7 @@ export function mkStubRoom(roomId = null, name) {
maySendMessage: jest.fn().mockReturnValue(true),
currentState: {
getStateEvents: jest.fn(),
getMember: jest.fn(),
mayClientSendStateEvent: jest.fn().mockReturnValue(true),
maySendStateEvent: jest.fn().mockReturnValue(true),
maySendEvent: jest.fn().mockReturnValue(true),