matrix/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2025-08-08 03:42:14 +03:00
Code Activity

Revert #124 and #135 (#139)

Browse Source 
This seems to be causing a lot of weirdness, presumably because there's
another missing thing like in #135, but I don't know what it might be and
it feels like it might take a while to find. Backing these changes out
to fix develop while we sort it out.

Fixes https://github.com/element-hq/element-web/issues/28179
This commit is contained in:
David Baker
2024-10-10 15:08:43 +01:00
committed by GitHub
parent 4e5cf1b720
commit 3a59556749
30 changed files with 78 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/test-utils/test-utils.ts
View File

@@ -86,14 +86,13 @@ export function createTestClient(): MatrixClient {
let txnId = 1;
const client = {
startClient: jest.fn(),
getHomeserverUrl: jest.fn(),
getIdentityServerUrl: jest.fn(),
getDomain: jest.fn().mockReturnValue("matrix.org"),
getUserId: jest.fn().mockReturnValue("@userId:matrix.org"),
getSafeUserId: jest.fn().mockReturnValue("@userId:matrix.org"),
getUserIdLocalpart: jest.fn().mockResolvedValue("userId"),
getUser: jest.fn().mockReturnValue({ on: jest.fn(), off: jest.fn(), removeListener: jest.fn() }),
getUser: jest.fn().mockReturnValue({ on: jest.fn(), off: jest.fn() }),
getDevice: jest.fn(),
getDeviceId: jest.fn().mockReturnValue("ABCDEFGHI"),
getStoredCrossSigningForUser: jest.fn(),
@@ -134,8 +133,6 @@ export function createTestClient(): MatrixClient {
getVerificationRequestsToDeviceInProgress: jest.fn().mockReturnValue([]),
setDeviceIsolationMode: jest.fn(),
}),
initCrypto: jest.fn(),
initRustCrypto: jest.fn(),
getPushActionsForEvent: jest.fn(),
getRoom: jest.fn().mockImplementation((roomId) => mkStubRoom(roomId, "My room", client)),
@@ -183,7 +180,6 @@ export function createTestClient(): MatrixClient {
getSyncState: jest.fn().mockReturnValue("SYNCING"),
generateClientSecret: () => "t35tcl1Ent5ECr3T",
isGuest: jest.fn().mockReturnValue(false),
setGuest: jest.fn(),
getRoomHierarchy: jest.fn().mockReturnValue({
rooms: [],
}),
@@ -281,7 +277,6 @@ export function createTestClient(): MatrixClient {
isFallbackICEServerAllowed: jest.fn().mockReturnValue(false),
getAuthIssuer: jest.fn(),
getOrCreateFilter: jest.fn(),
setNotifTimelineSet: jest.fn(),
} as unknown as MatrixClient;
client.reEmitter = new ReEmitter(client);