From 206905c2f59c1b2769daa5db1bb4939988fb971e Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 17 Oct 2025 16:51:59 +0100 Subject: [PATCH] Make room names deterministic So the tests don't fail if you add other tests or run them individually --- .../components/structures/RoomView-test.tsx | 7 ++++--- .../__snapshots__/RoomView-test.tsx.snap | 16 ++++++++-------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/test/unit-tests/components/structures/RoomView-test.tsx b/test/unit-tests/components/structures/RoomView-test.tsx index 8b474eaef8..7739022345 100644 --- a/test/unit-tests/components/structures/RoomView-test.tsx +++ b/test/unit-tests/components/structures/RoomView-test.tsx @@ -89,7 +89,6 @@ describe("RoomView", () => { let cli: MockedObject; let room: Room; let rooms: Map; - let roomCount = 0; let stores: SdkContextClass; let crypto: CryptoApi; @@ -100,7 +99,9 @@ describe("RoomView", () => { mockPlatformPeg({ reload: () => {} }); cli = mocked(stubClient()); - room = new Room(`!${roomCount++}:example.org`, cli, "@alice:example.org"); + const roomName = (expect.getState().currentTestName ?? "").replace(/[^a-zA-Z0-9]/g, "").toLowerCase(); + + room = new Room(`!${roomName}:example.org`, cli, "@alice:example.org"); jest.spyOn(room, "findPredecessor"); room.getPendingEvents = () => []; rooms = new Map(); @@ -725,7 +726,7 @@ describe("RoomView", () => { }); it("should switch rooms when edit is clicked on a search result for a different room", async () => { - const room2 = new Room(`!${roomCount++}:example.org`, cli, "@alice:example.org"); + const room2 = new Room(`!roomswitchtest:example.org`, cli, "@alice:example.org"); rooms.set(room2.roomId, room2); room.getMyMembership = jest.fn().mockReturnValue(KnownMembership.Join); diff --git a/test/unit-tests/components/structures/__snapshots__/RoomView-test.tsx.snap b/test/unit-tests/components/structures/__snapshots__/RoomView-test.tsx.snap index 7f5eeceba6..9a5a6aba38 100644 --- a/test/unit-tests/components/structures/__snapshots__/RoomView-test.tsx.snap +++ b/test/unit-tests/components/structures/__snapshots__/RoomView-test.tsx.snap @@ -1099,12 +1099,12 @@ exports[`RoomView invites renders an invite room 1`] = ` class="mx_RoomPreviewBar_message" >

- Do you want to join !2:example.org? + Do you want to join !roomviewinvitesrendersaninviteroom:example.org?

- !12:example.org + !roomviewshouldnotdisplaythetimelinewhentheroomencryptionisloading:example.org @@ -1397,7 +1397,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo aria-label="Open room settings" aria-live="off" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" - data-color="5" + data-color="1" data-testid="avatar-img" data-type="round" role="button" @@ -1424,7 +1424,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo - !12:example.org + !roomviewshouldnotdisplaythetimelinewhentheroomencryptionisloading:example.org @@ -1787,7 +1787,7 @@ exports[`RoomView video rooms should render joined video room view 1`] = ` aria-label="Open room settings" aria-live="off" class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52" - data-color="4" + data-color="2" data-testid="avatar-img" data-type="round" role="button" @@ -1814,7 +1814,7 @@ exports[`RoomView video rooms should render joined video room view 1`] = ` - !17:example.org + !roomviewvideoroomsshouldrenderjoinedvideoroomview:example.org