Fix tests properly

matrix-org · Jun 3, 2021 · cc95dd2 · cc95dd2
1 parent 1af0931
commit cc95dd2
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/spec/integ/room-upgrade.spec.js b/spec/integ/room-upgrade.spec.js
@@ -51,20 +51,17 @@ describe("Room upgrades", function() {
         const store = env.ircBridge.getStore();
         const newRoomId = "!new_room:bar.com";
         env.clientMock._client(botUserId).getStateEvent.and.callFake(async (roomId, eventType, key) => {
-            if (roomId !== newRoomId) {
-                throw Error('Wrong room ID');
-            }
-            if (eventType !== 'm.room.create') {
-                throw Error('Wrong event type');
-            }
-            if (key && key !== '') {
-                throw Error('Key should be blank')
+            if (eventType === 'm.room.create') {
+                expect(roomId).toEqual(newRoomId);
+                expect(key).toEqual('');
+                return {
+                    predecessor: {
+                        room_id: roomMapping.roomId,
+                    }
+                };
             }
-            return {
-                predecessor: {
-                    room_id: roomMapping.roomId,
-                }
-            };
+            // Pass through others
+            return {};
         });
         await env.mockAppService._trigger("type:m.room.tombstone", {
             content: {
@@ -126,6 +123,9 @@ describe("Room upgrades", function() {
             });
         });
 
+        expect(
+            env.clientMock._client(botUserId).getStateEvent.calls.any(newRoomId, 'm.room.create', '')
+        ).toBeTrue();
         const oldRoom = await store.getRoom(roomMapping.roomId, roomMapping.server, roomMapping.channel);
         const newRoom = await store.getRoom(newRoomId, roomMapping.server, roomMapping.channel);
         await allLeft;