From 04c923bd75e9758187314e5a64e41938bb0c81b1 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 6 Jul 2021 11:35:56 +0100
Subject: [PATCH] fix tests by including client field on the Room stub and
 stubbing getJoinedMemberCount

---
 test/stores/SpaceStore-test.ts | 52 +++++++++++++++++-----------------
 test/test-utils.js             |  4 ++-
 2 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/test/stores/SpaceStore-test.ts b/test/stores/SpaceStore-test.ts
index 4cbd9f43c8..e6d8dc144e 100644
--- a/test/stores/SpaceStore-test.ts
+++ b/test/stores/SpaceStore-test.ts
@@ -53,32 +53,6 @@ const emitPromise = (e: EventEmitter, k: string | symbol) => new Promise(r => e.
 
 const testUserId = "@test:user";
 
-let rooms = [];
-
-const mkRoom = (roomId: string) => {
-    const room = mkStubRoom(roomId);
-    room.currentState.getStateEvents.mockImplementation(mockStateEventImplementation([]));
-    rooms.push(room);
-    return room;
-};
-
-const mkSpace = (spaceId: string, children: string[] = []) => {
-    const space = mkRoom(spaceId);
-    space.isSpaceRoom.mockReturnValue(true);
-    space.currentState.getStateEvents.mockImplementation(mockStateEventImplementation(children.map(roomId =>
-        mkEvent({
-            event: true,
-            type: EventType.SpaceChild,
-            room: spaceId,
-            user: testUserId,
-            skey: roomId,
-            content: { via: [] },
-            ts: Date.now(),
-        }),
-    )));
-    return space;
-};
-
 const getValue = jest.fn();
 SettingsStore.getValue = getValue;
 
@@ -111,6 +85,32 @@ describe("SpaceStore", () => {
     const store = SpaceStore.instance;
     const client = MatrixClientPeg.get();
 
+    let rooms = [];
+
+    const mkRoom = (roomId: string) => {
+        const room = mkStubRoom(roomId, roomId, client);
+        room.currentState.getStateEvents.mockImplementation(mockStateEventImplementation([]));
+        rooms.push(room);
+        return room;
+    };
+
+    const mkSpace = (spaceId: string, children: string[] = []) => {
+        const space = mkRoom(spaceId);
+        space.isSpaceRoom.mockReturnValue(true);
+        space.currentState.getStateEvents.mockImplementation(mockStateEventImplementation(children.map(roomId =>
+            mkEvent({
+                event: true,
+                type: EventType.SpaceChild,
+                room: spaceId,
+                user: testUserId,
+                skey: roomId,
+                content: { via: [] },
+                ts: Date.now(),
+            }),
+        )));
+        return space;
+    };
+
     const viewRoom = roomId => defaultDispatcher.dispatch({ action: "view_room", room_id: roomId }, true);
 
     const run = async () => {
diff --git a/test/test-utils.js b/test/test-utils.js
index a07994af20..33001e39d1 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -220,7 +220,7 @@ export function mkMessage(opts) {
     return mkEvent(opts);
 }
 
-export function mkStubRoom(roomId = null, name) {
+export function mkStubRoom(roomId = null, name, client) {
     const stubTimeline = { getEvents: () => [] };
     return {
         roomId,
@@ -235,6 +235,7 @@ export function mkStubRoom(roomId = null, name) {
         }),
         getMembersWithMembership: jest.fn().mockReturnValue([]),
         getJoinedMembers: jest.fn().mockReturnValue([]),
+        getJoinedMemberCount: jest.fn().mockReturnValue(1),
         getMembers: jest.fn().mockReturnValue([]),
         getPendingEvents: () => [],
         getLiveTimeline: () => stubTimeline,
@@ -270,6 +271,7 @@ export function mkStubRoom(roomId = null, name) {
         getAltAliases: jest.fn().mockReturnValue([]),
         timeline: [],
         getJoinRule: jest.fn().mockReturnValue("invite"),
+        client,
     };
 }