Clean up RoomView tests

Fixes a couple of issues with the RoomView tests:

- In many cases, the tests were erroring, but, due to error boundaries, not
  being caught.
- In many cases, room membership was not being set, so it was just rendering
  the room preview
- The mocks were being manually reset, which was causing console spam.

Signed-off-by: Clark Fischer <clark.fischer@gmail.com>

Author: clarkf

test/components/structures/RoomView-test.tsx

@@ -25,14 +25,7 @@ import { EventType } from "matrix-js-sdk/src/matrix";
 import { MEGOLM_ALGORITHM } from "matrix-js-sdk/src/crypto/olmlib";
 import { fireEvent, render } from "@testing-library/react";
 
-import {
-    stubClient,
-    mockPlatformPeg,
-    unmockPlatformPeg,
-    wrapInMatrixClientContext,
-    flushPromises,
-} from "../../test-utils";
-import { MatrixClientPeg } from "../../../src/MatrixClientPeg";
+import { stubClient, mockPlatformPeg, wrapInMatrixClientContext, flushPromises } from "../../test-utils";
 import { Action } from "../../../src/dispatcher/actions";
 import { defaultDispatcher } from "../../../src/dispatcher/dispatcher";
 import { ViewRoomPayload } from "../../../src/dispatcher/payloads/ViewRoomPayload";
@@ -60,8 +53,7 @@ describe("RoomView", () => {
 
     beforeEach(async () => {
         mockPlatformPeg({ reload: () => {} });
-        stubClient();
-        cli = mocked(MatrixClientPeg.get());
+        cli = mocked(stubClient());
 
         room = new Room(`!${roomCount++}:example.org`, cli, "@alice:example.org");
         room.getPendingEvents = () => [];
@@ -78,11 +70,6 @@ describe("RoomView", () => {
         jest.spyOn(VoipUserMapper.sharedInstance(), "getVirtualRoomForRoom").mockResolvedValue(null);
     });
 
-    afterEach(async () => {
-        unmockPlatformPeg();
-        jest.restoreAllMocks();
-    });
-
     const mountRoomView = async (): Promise<ReactWrapper> => {
         if (stores.roomViewStore.getRoomId() !== room.roomId) {
             const switchedRoom = new Promise<void>((resolve) => {
@@ -199,32 +186,35 @@ describe("RoomView", () => {
         });
 
         it("checks for a virtual room on room event", async () => {
+            const mock = VoipUserMapper.sharedInstance().getVirtualRoomForRoom as unknown as jest.SpyInstance;
             await renderRoomView();
-            expect(VoipUserMapper.sharedInstance().getVirtualRoomForRoom).toHaveBeenCalledWith(room.roomId);
+            expect(mock).toHaveBeenCalledWith(room.roomId);
 
+            mock.mockReset();
             cli.emit(ClientEvent.Room, room);
 
             // called again after room event
-            expect(VoipUserMapper.sharedInstance().getVirtualRoomForRoom).toHaveBeenCalledTimes(2);
+            expect(VoipUserMapper.sharedInstance().getVirtualRoomForRoom).toHaveBeenCalled();
         });
     });
 
     describe("video rooms", () => {
         beforeEach(async () => {
             // Make it a video room
             room.isElementVideoRoom = () => true;
+            room.updateMyMembership("join");
             await SettingsStore.setValue("feature_video_rooms", null, SettingLevel.DEVICE, true);
         });
 
         it("normally doesn't open the chat panel", async () => {
             jest.spyOn(NotificationState.prototype, "isUnread", "get").mockReturnValue(false);
-            await mountRoomView();
+            await renderRoomView();
             expect(stores.rightPanelStore.isOpen).toEqual(false);
         });
 
         it("opens the chat panel if there are unread messages", async () => {
             jest.spyOn(NotificationState.prototype, "isUnread", "get").mockReturnValue(true);
-            await mountRoomView();
+            await renderRoomView();
             expect(stores.rightPanelStore.isOpen).toEqual(true);
             expect(stores.rightPanelStore.currentCard.phase).toEqual(RightPanelPhases.Timeline);
         });

test/components/structures/__snapshots__/RoomView-test.tsx.snap

@@ -188,6 +188,20 @@ exports[`RoomView for a local room in state ERROR should match the snapshot 1`]
               class="mx_RoomView_MessageList"
               style="height: 400px;"
             >
+              <div
+                class="mx_EventTileBubble mx_cryptoEvent mx_cryptoEvent_icon mx_cryptoEvent_icon_warning"
+              >
+                <div
+                  class="mx_EventTileBubble_title"
+                >
+                  Encryption not enabled
+                </div>
+                <div
+                  class="mx_EventTileBubble_subtitle"
+                >
+                  The encryption used by this room isn't supported.
+                </div>
+              </div>
               <li
                 class="mx_NewRoomIntro"
               >
@@ -383,6 +397,20 @@ exports[`RoomView for a local room in state NEW should match the snapshot 1`] =
               class="mx_RoomView_MessageList"
               style="height: 400px;"
             >
+              <div
+                class="mx_EventTileBubble mx_cryptoEvent mx_cryptoEvent_icon mx_cryptoEvent_icon_warning"
+              >
+                <div
+                  class="mx_EventTileBubble_title"
+                >
+                  Encryption not enabled
+                </div>
+                <div
+                  class="mx_EventTileBubble_subtitle"
+                >
+                  The encryption used by this room isn't supported.
+                </div>
+              </div>
               <li
                 class="mx_NewRoomIntro"
               >

test/test-utils/test-utils.ts

@@ -185,7 +185,7 @@ export function createTestClient(): MatrixClient {
         isCryptoEnabled: jest.fn().mockReturnValue(false),
         hasLazyLoadMembersEnabled: jest.fn().mockReturnValue(false),
         isInitialSyncComplete: jest.fn().mockReturnValue(true),
-        downloadKeys: jest.fn(),
+        downloadKeys: jest.fn().mockResolvedValue([]),
         fetchRoomEvent: jest.fn().mockRejectedValue({}),
         makeTxnId: jest.fn().mockImplementation(() => `t${txnId++}`),
         sendToDevice: jest.fn().mockResolvedValue(undefined),