fix tests and remove duplicated mocks.

src/state/CallViewModel/localMember/LocalMember.test.ts

@@ -104,7 +104,7 @@ describe("LocalMembership", () => {
         getOldestMembership: vi.fn().mockReturnValue({
           getPreferredFoci: vi.fn().mockReturnValue([focusFromOlderMembership]),
         }),
-        joinRoomSession: vi.fn(),
+        joinRTCSession: vi.fn(),
       }) as unknown as MatrixRTCSession;
 
       enterRTCSession(
@@ -121,7 +121,12 @@ describe("LocalMembership", () => {
         },
       );
 
-      expect(mockedSession.joinRoomSession).toHaveBeenLastCalledWith(
+      expect(mockedSession.joinRTCSession).toHaveBeenLastCalledWith(
+        {
+          deviceId: "DEVICE",
+          memberId: "@alice:example.org:DEVICE",
+          userId: "@alice:example.org",
+        },
         [
           {
             livekit_alias: "roomId",
@@ -163,7 +168,7 @@ describe("LocalMembership", () => {
         },
         memberships: [],
         getFocusInUse: vi.fn(),
-        joinRoomSession: vi.fn(),
+        joinRTCSession: vi.fn(),
       }) as unknown as MatrixRTCSession;
 
       enterRTCSession(

src/state/CallViewModel/localMember/LocalTransport.test.ts

@@ -154,6 +154,7 @@ describe("LocalTransport", () => {
     await flushPromises();
     // final
     expect(localTransport$.value).toStrictEqual({
+      forceOldJwtEndpoint: false,
       livekit_alias: "!room:example.org",
       livekit_service_url: "https://lk.example.org",
       type: "livekit",
@@ -195,6 +196,7 @@ describe("LocalTransport", () => {
     await flushPromises();
     // final
     expect(localTransport$.value).toStrictEqual({
+      forceOldJwtEndpoint: false,
       livekit_alias: "!example_room_id",
       livekit_service_url: "https://lk.example.org",
       type: "livekit",
@@ -247,6 +249,7 @@ describe("LocalTransport", () => {
       expect(localTransport$.value).toBe(null);
       await flushPromises();
       expect(localTransport$.value).toStrictEqual({
+        forceOldJwtEndpoint: false,
         livekit_alias: "!example_room_id",
         livekit_service_url: "https://lk.example.org",
         type: "livekit",
@@ -259,6 +262,7 @@ describe("LocalTransport", () => {
       expect(localTransport$.value).toBe(null);
       await flushPromises();
       expect(localTransport$.value).toStrictEqual({
+        forceOldJwtEndpoint: false,
         livekit_alias: "!example_room_id",
         livekit_service_url: "https://lk.example.org",
         type: "livekit",
@@ -273,6 +277,7 @@ describe("LocalTransport", () => {
       expect(localTransport$.value).toBe(null);
       await flushPromises();
       expect(localTransport$.value).toStrictEqual({
+        forceOldJwtEndpoint: false,
         livekit_alias: "!example_room_id",
         livekit_service_url: "https://lk.example.org",
         type: "livekit",
@@ -304,6 +309,7 @@ describe("LocalTransport", () => {
       expect(localTransport$.value).toBe(null);
       await flushPromises();
       expect(localTransport$.value).toStrictEqual({
+        forceOldJwtEndpoint: false,
         livekit_alias: "!example_room_id",
         livekit_service_url: "https://lk.example.org",
         type: "livekit",

src/state/CallViewModel/localMember/LocalTransport.ts

@@ -84,7 +84,9 @@ export const createLocalTransport$ = ({
   useOldestMember$,
   useOldJwtEndpoint$,
   delayId$,
-}: Props): Behavior<LivekitTransport | null> => {
+}: Props): Behavior<
+  (LivekitTransport & { forceOldJwtEndpoint: boolean }) | null
+> => {
   /**
    * The transport over which we should be actively publishing our media.
    * undefined when not joined.
@@ -108,7 +110,7 @@ export const createLocalTransport$ = ({
    *
    * @throws MatrixRTCTransportMissingError | FailToGetOpenIdToken
    */
-  const preferredTransport$: Behavior<LivekitTransport | null> = scope.behavior(
+  const preferredTransport$ = scope.behavior(
     combineLatest([customLivekitUrl.value$, delayId$, useOldJwtEndpoint$]).pipe(
       switchMap(([customUrl, delayId, forceOldJwtEndpoint]) =>
         from(