matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-08-06 12:02:40 +03:00
Code Activity

Fix tests

Browse Source
This commit is contained in:
Robin Townsend
2022-11-26 00:28:11 -05:00
parent 19e02e894f
commit 5511a6ef8c
2 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
spec/unit/webrtc/groupCall.spec.ts
View File

@@ -58,6 +58,7 @@ const FAKE_STATE_EVENTS = [
}), }),
getStateKey: () => FAKE_USER_ID_1, getStateKey: () => FAKE_USER_ID_1,
getRoomId: () => FAKE_ROOM_ID, getRoomId: () => FAKE_ROOM_ID,
getTs: () => 0,
}, },
{ {
getContent: () => ({ getContent: () => ({
@@ -73,6 +74,7 @@ const FAKE_STATE_EVENTS = [
}), }),
getStateKey: () => FAKE_USER_ID_2, getStateKey: () => FAKE_USER_ID_2,
getRoomId: () => FAKE_ROOM_ID, getRoomId: () => FAKE_ROOM_ID,
getTs: () => 0,
}, { }, {
getContent: () => ({ getContent: () => ({
"m.expires_ts": Date.now() + ONE_HOUR, "m.expires_ts": Date.now() + ONE_HOUR,
@@ -88,9 +90,21 @@ const FAKE_STATE_EVENTS = [
}), }),
getStateKey: () => "user3", getStateKey: () => "user3",
getRoomId: () => FAKE_ROOM_ID, getRoomId: () => FAKE_ROOM_ID,
getTs: () => 0,
}, },
]; ];
const mockGetStateEvents = (type: EventType, userId?: string): MatrixEvent[] | MatrixEvent | null => {
if (type === EventType.GroupCallMemberPrefix) {
return userId === undefined
? FAKE_STATE_EVENTS as MatrixEvent[]
: FAKE_STATE_EVENTS.find(e => e.getStateKey() === userId) as MatrixEvent;
} else {
const fakeEvent = { getContent: () => ({}), getTs: () => 0 } as MatrixEvent;
return userId === undefined ? [fakeEvent] : fakeEvent;
}
};
const ONE_HOUR = 1000 * 60 * 60; const ONE_HOUR = 1000 * 60 * 60;
const createAndEnterGroupCall = async (cli: MatrixClient, room: Room): Promise<GroupCall> => { const createAndEnterGroupCall = async (cli: MatrixClient, room: Room): Promise<GroupCall> => {
@@ -774,11 +788,7 @@ describe('Group Call', function() {
mockClient = typedMockClient as unknown as MatrixClient; mockClient = typedMockClient as unknown as MatrixClient;
room = new Room(FAKE_ROOM_ID, mockClient, FAKE_USER_ID_1); room = new Room(FAKE_ROOM_ID, mockClient, FAKE_USER_ID_1);
room.currentState.getStateEvents = jest.fn().mockImplementation((type: EventType, userId: string) => { room.currentState.getStateEvents = jest.fn().mockImplementation(mockGetStateEvents);
return type === EventType.GroupCallMemberPrefix
? FAKE_STATE_EVENTS.find(e => e.getStateKey() === userId) || FAKE_STATE_EVENTS
: { getContent: () => ([]) };
});
room.currentState.members[FAKE_USER_ID_1] = { room.currentState.members[FAKE_USER_ID_1] = {
userId: FAKE_USER_ID_1, userId: FAKE_USER_ID_1,
membership: "join", membership: "join",
@@ -1016,11 +1026,7 @@ describe('Group Call', function() {
userId: FAKE_USER_ID_2, userId: FAKE_USER_ID_2,
membership: "join", membership: "join",
} as unknown as RoomMember; } as unknown as RoomMember;
room.currentState.getStateEvents = jest.fn().mockImplementation((type: EventType, userId: string) => { room.currentState.getStateEvents = jest.fn().mockImplementation(mockGetStateEvents);
return type === EventType.GroupCallMemberPrefix
? FAKE_STATE_EVENTS.find(e => e.getStateKey() === userId) || FAKE_STATE_EVENTS
: { getContent: () => ([]) };
});
groupCall = await createAndEnterGroupCall(mockClient, room); groupCall = await createAndEnterGroupCall(mockClient, room);
}); });

12
spec/unit/webrtc/groupCallEventHandler.spec.ts
View File

@@ -55,14 +55,20 @@ describe('Group Call Event Handler', function() {
membership: "join", membership: "join",
} as unknown as RoomMember; } as unknown as RoomMember;
const mockEvent = makeMockGroupCallStateEvent(FAKE_ROOM_ID, FAKE_GROUP_CALL_ID);
mockRoom = { mockRoom = {
on: () => {}, on: () => {},
off: () => {}, off: () => {},
roomId: FAKE_ROOM_ID, roomId: FAKE_ROOM_ID,
currentState: { currentState: {
getStateEvents: jest.fn().mockReturnValue([makeMockGroupCallStateEvent( getStateEvents: jest.fn((type, key) => {
FAKE_ROOM_ID, FAKE_GROUP_CALL_ID, if (type === mockEvent.getType()) {
)]), return key === undefined ? [mockEvent] : mockEvent;
} else {
return key === undefined ? [] : null;
}
}),
}, },
getMember: (userId: string) => userId === FAKE_USER_ID ? mockMember : null, getMember: (userId: string) => userId === FAKE_USER_ID ? mockMember : null,
} as unknown as Room; } as unknown as Room;