Matrix/element-call-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-call.git synced 2026-07-18 18:59:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

tidy up test init

Browse Source
This commit is contained in:
Hugh Nimmo-Smith
2024-11-07 14:24:20 +00:00
parent 5e8a94778d
commit bb56f4205b
2 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/state/CallViewModel.test.ts
View File

@@ -49,21 +49,21 @@ import { MockRoom, MockRTCSession } from "../useReactions.test";
vi.mock("@livekit/components-core"); vi.mock("@livekit/components-core");
const alice = mockRoomMember({ userId: "@alice:example.org" }); const localRtcMember = mockMembership("@carol:example.org", "CCCC");
const bob = mockRoomMember({ userId: "@bob:example.org" }); const aliceRtcMember = mockMembership("@alice:example.org", "AAAA");
const carol = mockRoomMember({ userId: "@carol:example.org" }); const bobRtcMember = mockMembership("@bob:example.org", "BBBB");
const dave = mockRoomMember({ userId: "@dave:example.org" }); const daveRtcMember = mockMembership("@dave:example.org", "DDDD");
const aliceDev = "AAAA"; const alice = mockRoomMember(aliceRtcMember);
const bobDev = "BBBB"; const bob = mockRoomMember(bobRtcMember);
const carolDev = "CCCC"; const carol = mockRoomMember(localRtcMember);
const daveDev = "DDDD"; const dave = mockRoomMember(daveRtcMember);
const aliceId = `${alice.userId}:${aliceDev}`;
const bobId = `${bob.userId}:${bobDev}`;
const carolId = `${carol.userId}:${carolDev}`;
const daveId = `${dave.userId}:${daveDev}`;
const localParticipant = mockLocalParticipant({ identity: carolId }); const aliceId = `${alice.userId}:${aliceRtcMember.deviceId}`;
const bobId = `${bob.userId}:${bobRtcMember.deviceId}`;
const daveId = `${dave.userId}:${daveRtcMember.deviceId}`;
const localParticipant = mockLocalParticipant({ identity: "" });
const aliceParticipant = mockRemoteParticipant({ identity: aliceId }); const aliceParticipant = mockRemoteParticipant({ identity: aliceId });
const aliceSharingScreen = mockRemoteParticipant({ const aliceSharingScreen = mockRemoteParticipant({
@@ -77,12 +77,9 @@ const bobSharingScreen = mockRemoteParticipant({
}); });
const daveParticipant = mockRemoteParticipant({ identity: daveId }); const daveParticipant = mockRemoteParticipant({ identity: daveId });
const members = new Map([alice, bob, carol, dave].map((p) => [p.userId, p])); const roomMembers = new Map(
[alice, bob, carol, dave].map((p) => [p.userId, p]),
const aliceRtcMember = mockMembership(alice, aliceDev); );
const bobRtcMember = mockMembership(bob, bobDev);
const localRtcMember = mockMembership(carol, carolDev);
const daveRtcMember = mockMembership(dave, daveDev);
export interface GridLayoutSummary { export interface GridLayoutSummary {
type: "grid"; type: "grid";
@@ -197,10 +194,10 @@ function withCallViewModel(
): void { ): void {
const room = mockMatrixRoom({ const room = mockMatrixRoom({
client: { client: {
getUserId: () => carol.userId, getUserId: () => localRtcMember.sender,
getDeviceId: () => carolDev, getDeviceId: () => localRtcMember.deviceId,
} as Partial<MatrixClient> as MatrixClient, } as Partial<MatrixClient> as MatrixClient,
getMember: (userId) => members.get(userId) ?? null, getMember: (userId) => roomMembers.get(userId) ?? null,
}); });
const rtcSession = new MockRTCSession(room as unknown as MockRoom); const rtcSession = new MockRTCSession(room as unknown as MockRoom);
rtcMembers.subscribe((m) => { rtcMembers.subscribe((m) => {

11
src/utils/test.ts
View File

@@ -122,8 +122,15 @@ export function mockMembership(
// Maybe it'd be good to move this to matrix-js-sdk? Our testing needs are // Maybe it'd be good to move this to matrix-js-sdk? Our testing needs are
// rather simple, but if one util to mock a member is good enough for us, maybe // rather simple, but if one util to mock a member is good enough for us, maybe
// it's useful for matrix-js-sdk consumers in general. // it's useful for matrix-js-sdk consumers in general.
export function mockRoomMember(member: Partial<RoomMember>): RoomMember { export function mockRoomMember(
return { ...mockEmitter(), ...member } as RoomMember; rtcMembership: CallMembership,
member: Partial<RoomMember> = {},
): RoomMember {
return {
...mockEmitter(),
userId: rtcMembership.sender,
...member,
} as RoomMember;
} }
export function mockMatrixRoom(room: Partial<MatrixRoom>): MatrixRoom { export function mockMatrixRoom(room: Partial<MatrixRoom>): MatrixRoom {