Test CallViewModel in all MatrixRTC modes

src/state/CallViewModel/CallViewModel.test.ts

@@ -60,7 +60,8 @@ import {
 import { MediaDevices } from "../MediaDevices.ts";
 import { getValue } from "../../utils/observable.ts";
 import { type Behavior, constant } from "../Behavior.ts";
-import { withCallViewModel } from "./CallViewModelTestUtils.ts";
+import { withCallViewModel as withCallViewModelInMode } from "./CallViewModelTestUtils.ts";
+import { MatrixRTCMode } from "../../settings/settings.ts";
 
 vi.mock("rxjs", async (importOriginal) => ({
   ...(await importOriginal()),
@@ -229,7 +230,13 @@ function mockRingEvent(
 // need a value to fill in for them when emitting notifications
 const mockLegacyRingEvent = {} as { event_id: string } & ICallNotifyContent;
 
-describe("CallViewModel", () => {
+describe.each([
+  [MatrixRTCMode.Legacy],
+  [MatrixRTCMode.Compatibil],
+  [MatrixRTCMode.Matrix_2_0],
+])("CallViewModel (%s mode)", (mode) => {
+  const withCallViewModel = withCallViewModelInMode(mode);
+
   test("participants are retained during a focus switch", () => {
     withTestScheduler(({ behavior, expectObservable }) => {
       // Participants disappear on frame 2 and come back on frame 3

src/state/CallViewModel/CallViewModelTestUtils.ts

@@ -53,6 +53,7 @@ import {
 import { type Behavior, constant } from "../Behavior";
 import { type ProcessorState } from "../../livekit/TrackProcessorContext";
 import { type MediaDevices } from "../MediaDevices";
+import { type MatrixRTCMode } from "../../settings/settings";
 
 mockConfig({
   livekit: { livekit_service_url: "http://my-default-service-url.com" },
@@ -80,7 +81,8 @@ export interface CallViewModelInputs {
 
 const localParticipant = mockLocalParticipant({ identity: "" });
 
-export function withCallViewModel(
+export function withCallViewModel(mode: MatrixRTCMode) {
+  return (
     {
       remoteParticipants$ = constant([]),
       rtcMembers$ = constant([localRtcMember]),
@@ -95,14 +97,16 @@ export function withCallViewModel(
     continuation: (
       vm: CallViewModel,
       rtcSession: MockRTCSession,
-    subjects: { raisedHands$: BehaviorSubject<Record<string, RaisedHandInfo>> },
+      subjects: {
+        raisedHands$: BehaviorSubject<Record<string, RaisedHandInfo>>;
+      },
       setSyncState: (value: SyncState) => void,
     ) => void,
     options: CallViewModelOptions = {
       encryptionSystem: { kind: E2eeType.PER_PARTICIPANT },
       autoLeaveWhenOthersLeft: false,
     },
-): void {
+  ): void => {
     let syncState = initialSyncState;
     const setSyncState = (value: SyncState): void => {
       const prev = syncState;
@@ -130,7 +134,9 @@ export function withCallViewModel(
       getMembers: () => Array.from(roomMembers.values()),
       getMembersWithMembership: () => Array.from(roomMembers.values()),
     });
-  const rtcSession = new MockRTCSession(room, []).withMemberships(rtcMembers$);
+    const rtcSession = new MockRTCSession(room, []).withMemberships(
+      rtcMembers$,
+    );
     const participantsSpy = vi
       .spyOn(ComponentsCore, "connectedParticipantsObserver")
       .mockReturnValue(remoteParticipants$);
@@ -157,7 +163,9 @@ export function withCallViewModel(
       .spyOn(ComponentsCore, "roomEventSelector")
       .mockImplementation((_room, _eventType) => of());
     const muteStates = mockMuteStates();
-  const raisedHands$ = new BehaviorSubject<Record<string, RaisedHandInfo>>({});
+    const raisedHands$ = new BehaviorSubject<Record<string, RaisedHandInfo>>(
+      {},
+    );
     const reactions$ = new BehaviorSubject<Record<string, ReactionInfo>>({});
 
     const vm = createCallViewModel$(
@@ -176,6 +184,7 @@ export function withCallViewModel(
           }),
         connectionState$,
         windowSize$,
+        matrixRTCMode$: constant(mode),
       },
       raisedHands$,
       reactions$,
@@ -193,4 +202,5 @@ export function withCallViewModel(
     });
 
     continuation(vm, rtcSession, { raisedHands$: raisedHands$ }, setSyncState);
+  };
 }

src/state/CallViewModelWidget.test.ts

@@ -15,6 +15,7 @@ import { constant } from "./Behavior.ts";
 import { aliceParticipant, localRtcMember } from "../utils/test-fixtures.ts";
 import { ElementWidgetActions, widget } from "../widget.ts";
 import { E2eeType } from "../e2ee/e2eeType.ts";
+import { MatrixRTCMode } from "../settings/settings.ts";
 
 vi.mock("@livekit/components-core", { spy: true });
 
@@ -34,9 +35,15 @@ vi.mock("../widget", () => ({
   },
 }));
 
-it("expect leave when ElementWidgetActions.HangupCall is called", async () => {
+it.each([
+  [MatrixRTCMode.Legacy],
+  [MatrixRTCMode.Compatibil],
+  [MatrixRTCMode.Matrix_2_0],
+])(
+  "expect leave when ElementWidgetActions.HangupCall is called (%s mode)",
+  async (mode) => {
     const pr = Promise.withResolvers<string>();
-  withCallViewModel(
+    withCallViewModel(mode)(
       {
         remoteParticipants$: constant([aliceParticipant]),
         rtcMembers$: constant([localRtcMember]),
@@ -66,4 +73,5 @@ it("expect leave when ElementWidgetActions.HangupCall is called", async () => {
 
     const source = await pr.promise;
     expect(source).toBe("user");
-});
+  },
+);