All the test bits and pieces

src/utils/test-fixtures.ts

@@ -0,0 +1,17 @@
+import {
+  mockRtcMembership,
+  mockMatrixRoomMember,
+  mockRemoteParticipant,
+  mockLocalParticipant,
+} from "./test";
+
+export const aliceRtcMember = mockRtcMembership("@alice:example.org", "AAAA");
+export const alice = mockMatrixRoomMember(aliceRtcMember);
+export const aliceId = `${alice.userId}:${aliceRtcMember.deviceId}`;
+export const aliceParticipant = mockRemoteParticipant({ identity: aliceId });
+
+export const localRtcMember = mockRtcMembership("@carol:example.org", "CCCC");
+export const local = mockMatrixRoomMember(localRtcMember);
+export const localParticipant = mockLocalParticipant({ identity: "" });
+
+export const bobRtcMember = mockRtcMembership("@bob:example.org", "BBBB");

src/utils/test-viewmodel.ts

@@ -0,0 +1,71 @@
+import { ConnectionState } from "livekit-client";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+import { RoomMember } from "matrix-js-sdk/src/matrix";
+import { CallMembership, MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc";
+import { BehaviorSubject, of } from "rxjs";
+import { vitest } from "vitest";
+import { E2eeType } from "../e2ee/e2eeType";
+import { CallViewModel } from "../state/CallViewModel";
+import { mockLivekitRoom, mockMatrixRoom, MockRTCSession } from "./test";
+import {
+  aliceRtcMember,
+  aliceParticipant,
+  localParticipant,
+  localRtcMember,
+} from "./test-fixtures";
+import { RelationsContainer } from "matrix-js-sdk/src/models/relations-container";
+
+/**
+ * Construct a basic CallViewModel to test components that make use of it.
+ * @param members
+ * @param initialRemoteRtcMemberships
+ * @returns
+ */
+export function getBasicCallViewModelEnvironment(
+  members: RoomMember[],
+  initialRemoteRtcMemberships: CallMembership[] = [aliceRtcMember],
+): {
+  vm: CallViewModel;
+  remoteRtcMemberships: BehaviorSubject<CallMembership[]>;
+  rtcSession: MockRTCSession;
+} {
+  const matrixRoomMembers = new Map(members.map((p) => [p.userId, p]));
+  const remoteParticipants = of([aliceParticipant]);
+  const liveKitRoom = mockLivekitRoom(
+    { localParticipant },
+    { remoteParticipants },
+  );
+  const matrixRoom = mockMatrixRoom({
+    relations: {
+      getChildEventsForEvent: vitest.fn(),
+    } as Partial<RelationsContainer> as RelationsContainer,
+    client: {
+      getUserId: () => localRtcMember.sender,
+      getDeviceId: () => localRtcMember.deviceId,
+      sendEvent: vitest.fn().mockResolvedValue({ event_id: "$fake:event" }),
+      redactEvent: vitest.fn().mockResolvedValue({ event_id: "$fake:event" }),
+      on: vitest.fn(),
+      off: vitest.fn(),
+    } as Partial<MatrixClient> as MatrixClient,
+    getMember: (userId) => matrixRoomMembers.get(userId) ?? null,
+  });
+
+  const remoteRtcMemberships = new BehaviorSubject<CallMembership[]>(
+    initialRemoteRtcMemberships,
+  );
+
+  const rtcSession = new MockRTCSession(
+    matrixRoom,
+    localRtcMember,
+  ).withMemberships(remoteRtcMemberships);
+
+  const vm = new CallViewModel(
+    rtcSession as unknown as MatrixRTCSession,
+    liveKitRoom,
+    {
+      kind: E2eeType.PER_PARTICIPANT,
+    },
+    of(ConnectionState.Connected),
+  );
+  return { vm, remoteRtcMemberships, rtcSession };
+}

src/utils/test.ts

@@ -4,19 +4,21 @@ Copyright 2023, 2024 New Vector Ltd.
 SPDX-License-Identifier: AGPL-3.0-only
 Please see LICENSE in the repository root for full details.
 */
-import { map, Observable, of, SchedulerLike } from "rxjs";
+import { BehaviorSubject, map, Observable, of, SchedulerLike } from "rxjs";
 import { RunHelpers, TestScheduler } from "rxjs/testing";
-import { expect, vi } from "vitest";
+import { expect, vi, vitest } from "vitest";
 import {
   RoomMember,
   Room as MatrixRoom,
   MatrixEvent,
   Room,
   TypedEventEmitter,
+  MatrixClient,
 } from "matrix-js-sdk/src/matrix";
 import {
   CallMembership,
   Focus,
+  MatrixRTCSession,
   MatrixRTCSessionEvent,
   MatrixRTCSessionEventHandlerMap,
   SessionMembershipData,
@@ -27,6 +29,7 @@ import {
   RemoteParticipant,
   RemoteTrackPublication,
   Room as LivekitRoom,
+  ConnectionState,
 } from "livekit-client";
 
 import {
@@ -36,6 +39,14 @@ import {
 import { E2eeType } from "../e2ee/e2eeType";
 import { DEFAULT_CONFIG, ResolvedConfigOptions } from "../config/ConfigOptions";
 import { Config } from "../config/Config";
+import { CallViewModel } from "../state/CallViewModel";
+import {
+  aliceParticipant,
+  aliceRtcMember,
+  localParticipant,
+  localRtcMember,
+} from "./test-fixtures";
+import { randomUUID } from "crypto";
 
 export function withFakeTimers(continuation: () => void): void {
   vi.useFakeTimers();
@@ -129,6 +140,7 @@ export function mockRtcMembership(
   };
   const event = new MatrixEvent({
     sender: typeof user === "string" ? user : user.userId,
+    event_id: `$-ev-${randomUUID()}:example.org`,
   });
   return new CallMembership(event, data);
 }

src/utils/testReactions.tsx

@@ -27,53 +27,41 @@ import {
   ElementCallReactionEventType,
   ReactionOption,
 } from "../reactions";
+import { MockRTCSession } from "./test";
 
-export const TestReactionsWrapper = ({
-  rtcSession,
-  children,
-}: PropsWithChildren<{
-  rtcSession: MockRTCSession | MatrixRTCSession;
-}>): ReactNode => {
-  return (
-    <ReactionsProvider rtcSession={rtcSession as unknown as MatrixRTCSession}>
-      {children}
-    </ReactionsProvider>
-  );
-};
+// export class ReactionsMockRTCSession extends EventEmitter {
+//   public memberships: {
+//     sender: string;
+//     eventId: string;
+//     createdTs: () => Date;
+//   }[];
 
-export class MockRTCSession extends EventEmitter {
-  public memberships: {
-    sender: string;
-    eventId: string;
-    createdTs: () => Date;
-  }[];
+//   public constructor(
+//     public readonly room: MockRoom,
+//     membership: Record<string, string>,
+//   ) {
+//     super();
+//     this.memberships = Object.entries(membership).map(([eventId, sender]) => ({
+//       sender,
+//       eventId,
+//       createdTs: (): Date => new Date(),
+//     }));
+//   }
 
-  public constructor(
-    public readonly room: MockRoom,
-    membership: Record<string, string>,
-  ) {
-    super();
-    this.memberships = Object.entries(membership).map(([eventId, sender]) => ({
-      sender,
-      eventId,
-      createdTs: (): Date => new Date(),
-    }));
-  }
+//   public testRemoveMember(userId: string): void {
+//     this.memberships = this.memberships.filter((u) => u.sender !== userId);
+//     this.emit(MatrixRTCSessionEvent.MembershipsChanged);
+//   }
 
-  public testRemoveMember(userId: string): void {
-    this.memberships = this.memberships.filter((u) => u.sender !== userId);
-    this.emit(MatrixRTCSessionEvent.MembershipsChanged);
-  }
-
-  public testAddMember(sender: string): void {
-    this.memberships.push({
-      sender,
-      eventId: `!fake-${randomUUID()}:event`,
-      createdTs: (): Date => new Date(),
-    });
-    this.emit(MatrixRTCSessionEvent.MembershipsChanged);
-  }
-}
+//   public testAddMember(sender: string): void {
+//     this.memberships.push({
+//       sender,
+//       eventId: `!fake-${randomUUID()}:event`,
+//       createdTs: (): Date => new Date(),
+//     });
+//     this.emit(MatrixRTCSessionEvent.MembershipsChanged);
+//   }
+// }
 
 export function createHandRaisedReaction(
   parentMemberEvent: string,
@@ -126,6 +114,7 @@ export class MockRoom extends EventEmitter {
   public get client(): MatrixClient {
     return {
       getUserId: (): string => this.ownUserId,
+      getDeviceId: (): string => "ABCDEF",
       sendEvent: async (
         ...props: Parameters<MatrixClient["sendEvent"]>
       ): ReturnType<MatrixClient["sendEvent"]> => {