Refactor relations pagination mocking for tests

matrix-org · Dec 12, 2022 · 37042df · 37042df
1 parent f78b0d3
commit 37042df
Showing 1 changed file with 16 additions and 38 deletions.
diff --git a/spec/integ/matrix-client-event-timeline.spec.ts b/spec/integ/matrix-client-event-timeline.spec.ts
@@ -30,7 +30,7 @@ import {
     RoomEvent,
 } from "../../src/matrix";
 import { logger } from "../../src/logger";
-import { encodeUri } from "../../src/utils";
+import { encodeParams, encodeUri, QueryDict, replaceParam } from "../../src/utils";
 import { TestClient } from "../TestClient";
 import { FeatureSupport, Thread, THREAD_RELATION_TYPE } from "../../src/models/thread";
 import { emitPromise } from "../test-utils/test-utils";
@@ -47,6 +47,18 @@ const withoutRoomId = (e: Partial<IEvent>): Partial<IEvent> => {
     return copy;
 };
 
+/**
+ * Our httpBackend only allows matching calls if we have the exact same query, in the exact same order
+ * This method allows building queries with the exact same parameter order as the fetchRelations method in client
+ * @param params query parameters
+ */
+const buildRelationPaginationQuery = (params: QueryDict): string => {
+    if (Thread.hasServerSideFwdPaginationSupport === FeatureSupport.Experimental) {
+        params = replaceParam("dir", "org.matrix.msc3715.dir", params);
+    }
+    return "?" + encodeParams(params).toString();
+};
+
 const USER_MEMBERSHIP_EVENT = utils.mkMembership({
     room: roomId,
     mship: "join",
@@ -644,7 +656,7 @@ describe("MatrixClient event timelines", function () {
                         encodeURIComponent(THREAD_ROOT.event_id!) +
                         "/" +
                         encodeURIComponent(THREAD_RELATION_TYPE.name) +
-                        "?dir=b&limit=1",
+                        buildRelationPaginationQuery({ dir: Direction.Backward, limit: 1 }),
                 )
                 .respond(200, function () {
                     return {
@@ -1652,24 +1664,6 @@ describe("MatrixClient event timelines", function () {
             const thread = room.getThread(THREAD_ROOT.event_id!)!;
             const timelineSet = thread.timelineSet;
 
-            const buildParams = (direction: Direction, token: string): string => {
-                if (Thread.hasServerSideFwdPaginationSupport === FeatureSupport.Experimental) {
-                    return `?from=${token}&org.matrix.msc3715.dir=${direction}`;
-                } else {
-                    return `?dir=${direction}&from=${token}`;
-                }
-            };
-
-            httpBackend
-                .when("GET", "/rooms/!foo%3Abar/context/" + encodeURIComponent(THREAD_ROOT.event_id!))
-                .respond(200, {
-                    start: "start_token",
-                    events_before: [],
-                    event: THREAD_ROOT,
-                    events_after: [],
-                    state: [],
-                    end: "end_token",
-                });
             httpBackend
                 .when("GET", "/rooms/!foo%3Abar/event/" + encodeURIComponent(THREAD_ROOT.event_id!))
                 .respond(200, function () {
@@ -1692,27 +1686,11 @@ describe("MatrixClient event timelines", function () {
                         encodeURIComponent(THREAD_ROOT.event_id!) +
                         "/" +
                         encodeURIComponent(THREAD_RELATION_TYPE.name) +
-                        buildParams(Direction.Backward, "start_token"),
-                )
-                .respond(200, function () {
-                    return {
-                        original_event: THREAD_ROOT,
-                        chunk: [],
-                    };
-                });
-            httpBackend
-                .when(
-                    "GET",
-                    "/_matrix/client/v1/rooms/!foo%3Abar/relations/" +
-                        encodeURIComponent(THREAD_ROOT.event_id!) +
-                        "/" +
-                        encodeURIComponent(THREAD_RELATION_TYPE.name) +
-                        buildParams(Direction.Forward, "end_token"),
+                        buildRelationPaginationQuery({ dir: Direction.Backward, limit: 1 }),
                 )
                 .respond(200, function () {
                     return {
-                        original_event: THREAD_ROOT,
-                        chunk: [THREAD_REPLY],
+                        chunk: [THREAD_ROOT],
                     };
                 });
             const timeline = await flushHttp(client.getEventTimeline(timelineSet, THREAD_ROOT.event_id!));