Add non-optional client to Room instances

spec/unit/relations.spec.ts

@@ -18,10 +18,19 @@ import { EventTimelineSet } from "../../src/models/event-timeline-set";
 import { MatrixEvent, MatrixEventEvent } from "../../src/models/event";
 import { Room } from "../../src/models/room";
 import { Relations } from "../../src/models/relations";
+import { MatrixClient } from "../../src";
+import { TestClient } from "../TestClient";
 
 describe("Relations", function() {
+    let client: MatrixClient;
+    beforeEach(() => {
+        client = (new TestClient(
+            "@alice:example.com", "alicedevice",
+        )).client;
+    })
+
     it("should deduplicate annotations", function() {
-        const room = new Room("room123", null, null);
+        const room = new Room("room123", client, null);
         const relations = new Relations("m.annotation", "m.reaction", room);
 
         // Create an instance of an annotation
@@ -98,7 +107,7 @@ describe("Relations", function() {
 
         // Add the target event first, then the relation event
         {
-            const room = new Room("room123", null, null);
+            const room = new Room("room123", client, null);
             const relationsCreated = new Promise(resolve => {
                 targetEvent.once(MatrixEventEvent.RelationsCreated, resolve);
             });
@@ -112,7 +121,7 @@ describe("Relations", function() {
 
         // Add the relation event first, then the target event
         {
-            const room = new Room("room123", null, null);
+            const room = new Room("room123", client, null);
             const relationsCreated = new Promise(resolve => {
                 targetEvent.once(MatrixEventEvent.RelationsCreated, resolve);
             });
@@ -126,7 +135,7 @@ describe("Relations", function() {
     });
 
     it("should re-use Relations between all timeline sets in a room", async () => {
-        const room = new Room("room123", null, null);
+        const room = new Room("room123", client, null);
         const timelineSet1 = new EventTimelineSet(room);
         const timelineSet2 = new EventTimelineSet(room);
         expect(room.relations).toBe(timelineSet1.relations);
@@ -135,7 +144,7 @@ describe("Relations", function() {
 
     it("should ignore m.replace for state events", async () => {
         const userId = "@bob:example.com";
-        const room = new Room("room123", null, userId);
+        const room = new Room("room123", client, userId);
         const relations = new Relations("m.replace", "m.room.topic", room);
 
         // Create an instance of a state event with rel_type m.replace

spec/unit/room.spec.ts

@@ -1552,7 +1552,10 @@ describe("Room", function() {
         });
 
         it("should remove cancelled events from the timeline", function() {
-            const room = new Room(roomId, null, userA);
+            const client = (new TestClient(
+                "@alice:example.com", "alicedevice",
+            )).client;
+            const room = new Room(roomId, client, userA);
             const eventA = utils.mkMessage({
                 room: roomId, user: userA, event: true,
             });