Increase test coverage

Author: AndrewFerr

spec/unit/matrix-client.spec.ts

@@ -97,7 +97,7 @@ type HttpLookup = {
     method: string;
     path: string;
     prefix?: string;
-    data?: Record<string, any>;
+    data?: Record<string, any> | Record<string, any>[];
     error?: object;
     expectBody?: Record<string, any>;
     expectQueryParams?: QueryDict;
@@ -349,7 +349,6 @@ describe("MatrixClient", function () {
         // set unstableFeatures to a defined state before each test
         unstableFeatures = {
             "org.matrix.msc3440.stable": true,
-            "org.matrix.msc4140": true,
         };
 
         makeClient();
@@ -724,50 +723,36 @@ describe("MatrixClient", function () {
             cancel_token: "ca",
         };
 
-        it("overload without threadId works", async () => {
-            httpLookups = [];
+        beforeEach(() => {
+            unstableFeatures["org.matrix.msc4140"] = true;
+        });
 
-            const timeoutFutureTxnId = client.makeTxnId();
-            httpLookups.push({
-                method: "PUT",
-                prefix: unstableMSC4140Prefix,
-                path: `/rooms/${encodeURIComponent(roomId)}/send_future/m.room.message/${timeoutFutureTxnId}`,
-                expectQueryParams: timeoutFutureOpts,
-                data: timeoutFutureResponse,
-                expectBody: content,
-            });
+        it("throws when unsupported by server", async () => {
+            unstableFeatures["org.matrix.msc4140"] = false;
+            const errorMessage = "Server does not support the Futures API";
 
-            const { future_group_id: futureGroupId } = await client._unstable_sendFuture(
+            await expect(client._unstable_sendFuture(
                 roomId,
                 timeoutFutureOpts,
                 null,
                 EventType.RoomMessage,
                 { ...content },
-                timeoutFutureTxnId,
-            );
-
-            const actionFutureTxnId = client.makeTxnId();
-            const actionFutureOpts = { future_group_id: futureGroupId };
-            httpLookups.push({
-                method: "PUT",
-                prefix: unstableMSC4140Prefix,
-                path: `/rooms/${encodeURIComponent(roomId)}/send_future/m.room.message/${actionFutureTxnId}`,
-                expectQueryParams: actionFutureOpts,
-                data: actionFutureResponse,
-                expectBody: content,
-            });
+                client.makeTxnId(),
+            )).rejects.toThrow(errorMessage);
 
-            await client._unstable_sendFuture(
+            await expect(client._unstable_sendStateFuture(
                 roomId,
-                actionFutureOpts,
-                null,
-                EventType.RoomMessage,
-                { ...content },
-                actionFutureTxnId,
-            );
+                timeoutFutureOpts,
+                EventType.RoomTopic,
+                { topic: "topic" },
+            )).rejects.toThrow(errorMessage);
+
+            await expect(client._unstable_getFutures()).rejects.toThrow(errorMessage);
+
+            await expect(client._unstable_updateFutureWithToken("token")).rejects.toThrow(errorMessage);
         });
 
-        it("overload with null threadId works", async () => {
+        it("works with null threadId", async () => {
             httpLookups = [];
 
             const timeoutFutureTxnId = client.makeTxnId();
@@ -810,7 +795,7 @@ describe("MatrixClient", function () {
             );
         });
 
-        it("overload with threadId works", async () => {
+        it("works with non-null threadId", async () => {
             httpLookups = [];
             const threadId = "$threadId:server";
             const expectBody = {
@@ -1026,6 +1011,33 @@ describe("MatrixClient", function () {
 
             await client._unstable_sendStateFuture(roomId, actionFutureOpts, EventType.RoomTopic, { ...content });
         });
+
+        it("can look up futures", async () => {
+            httpLookups = [
+                {
+                    method: "GET",
+                    prefix: unstableMSC4140Prefix,
+                    path: "/future",
+                    data: [],
+                }
+            ];
+
+            await client._unstable_getFutures();
+        });
+
+        it("can update futures with their tokens", async () => {
+            const futureToken = "token";
+            httpLookups = [
+                {
+                    method: "POST",
+                    prefix: unstableMSC4140Prefix,
+                    path: `/future/${futureToken}`,
+                    data: {},
+                }
+            ];
+
+            await client._unstable_updateFutureWithToken(futureToken);
+        });
     });
 
     it("should create (unstable) file trees", async () => {
@@ -1287,7 +1299,7 @@ describe("MatrixClient", function () {
             const filter = new Filter(client.credentials.userId);
 
             const filterId = await client.getOrCreateFilter(filterName, filter);
-            expect(filterId).toEqual(FILTER_RESPONSE.data?.filter_id);
+            expect(filterId).toEqual(!Array.isArray(FILTER_RESPONSE.data) && FILTER_RESPONSE.data?.filter_id);
         });
     });
 

spec/unit/matrixrtc/MatrixRTCSession.spec.ts

@@ -46,6 +46,7 @@ describe("MatrixRTCSession", () => {
         client = new MatrixClient({ baseUrl: "base_url" });
         client.getUserId = jest.fn().mockReturnValue("@alice:example.org");
         client.getDeviceId = jest.fn().mockReturnValue("AAAAAAA");
+        client.doesServerSupportUnstableFeature = jest.fn().mockReturnValue({ "org.matrix.msc4140": true });
     });
 
     afterEach(() => {