From 3dbef7a552d8341f8fe9800a1752ba12cea76b22 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Mon, 20 Jul 2026 15:14:29 +0200 Subject: [PATCH] Fix tests and lint --- src/UrlParams.test.ts | 4 +--- src/UrlParams.ts | 4 +++- .../CallViewModel/localMember/LocalTransport.test.ts | 11 +++++++++++ src/widget.test.ts | 1 + 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/UrlParams.test.ts b/src/UrlParams.test.ts index 05c5f7ba1..e4a7890f2 100644 --- a/src/UrlParams.test.ts +++ b/src/UrlParams.test.ts @@ -125,9 +125,7 @@ describe("UrlParams", () => { describe("enableClientWellKnownLookups", () => { it("is undefined when not set (so the config value applies)", () => { - expect( - computeUrlParams().enableClientWellKnownLookups, - ).toBeUndefined(); + expect(computeUrlParams().enableClientWellKnownLookups).toBeUndefined(); }); it("is false when set to false", () => { diff --git a/src/UrlParams.ts b/src/UrlParams.ts index abde3f38b..a7e3bafb4 100644 --- a/src/UrlParams.ts +++ b/src/UrlParams.ts @@ -480,7 +480,9 @@ export const computeUrlParams = (search = "", hash = ""): UrlParams => { showControls: parser.getFlag("showControls"), hideScreensharing: parser.getFlag("hideScreensharing"), allowIceFallback: parser.getFlag("allowIceFallback"), - enableClientWellKnownLookups: parser.getFlag("enableClientWellKnownLookups"), + enableClientWellKnownLookups: parser.getFlag( + "enableClientWellKnownLookups", + ), perParticipantE2EE: parser.getFlag("perParticipantE2EE"), controlledAudioDevices: parser.getFlag("controlledAudioDevices"), skipLobby: isWidget ? parser.getFlag("skipLobby") : false, diff --git a/src/state/CallViewModel/localMember/LocalTransport.test.ts b/src/state/CallViewModel/localMember/LocalTransport.test.ts index cf7555fa7..9f642620b 100644 --- a/src/state/CallViewModel/localMember/LocalTransport.test.ts +++ b/src/state/CallViewModel/localMember/LocalTransport.test.ts @@ -19,6 +19,7 @@ import { type CallMembership, type LivekitTransportConfig, } from "matrix-js-sdk/lib/matrixrtc"; +import { MatrixError } from "matrix-js-sdk"; import { BehaviorSubject, filter, lastValueFrom } from "rxjs"; import fetchMock from "fetch-mock"; @@ -471,6 +472,11 @@ describe("LocalTransport", () => { it("supports getting transport via well-known", async () => { localTransportOpts.client.getDomain.mockReturnValue("example.org"); + // Pretend the server doesn't implement the transports endpoint to trigger + // the .well-known fallback. + localTransportOpts.client._unstable_getRTCTransports.mockRejectedValue( + new MatrixError({ errcode: "M_UNRECOGNIZED" }, 404), + ); fetchMock.getOnce("https://example.org/.well-known/matrix/client", { "org.matrix.msc4143.rtc_foci": [ { type: "livekit", livekit_service_url: "https://lk.example.org" }, @@ -501,6 +507,11 @@ describe("LocalTransport", () => { it("fails fast if the openId request fails for the well-known config", async () => { localTransportOpts.client.getDomain.mockReturnValue("example.org"); + // Pretend the server doesn't implement the transports endpoint to trigger + // the .well-known fallback. + localTransportOpts.client._unstable_getRTCTransports.mockRejectedValue( + new MatrixError({ errcode: "M_UNRECOGNIZED" }, 404), + ); fetchMock.getOnce("https://example.org/.well-known/matrix/client", { "org.matrix.msc4143.rtc_foci": [ { type: "livekit", livekit_service_url: "https://lk.example.org" }, diff --git a/src/widget.test.ts b/src/widget.test.ts index 2e5bf743b..fde0c807c 100644 --- a/src/widget.test.ts +++ b/src/widget.test.ts @@ -19,6 +19,7 @@ const createRoomWidgetClientSpy = vi.mocked(createRoomWidgetClient); vi.mock("./config/Config", () => ({ Config: { init: vi.fn().mockImplementation(async () => Promise.resolve()), + clientWellKnownLookupsEnabled: vi.fn().mockReturnValue(true), }, })); const configInitSpy = vi.mocked(Config.init);