matrix/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2025-11-29 21:23:11 +03:00
Code Activity

Merge branch 'develop' into improved-forwarding-ui

Browse Source
This commit is contained in:
Robin Townsend
2021-05-19 12:39:48 -04:00
parent e798b36f1d aa4984019c
commit 678b298bab
67 changed files with 2134 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/test-utils.js
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),