From ad20999ab002f4b755d5e04c63e7998c7e2e7943 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Mon, 4 Jul 2022 16:37:04 -0600 Subject: [PATCH] Update matrix-mock-request --- package.json | 2 +- test/AdminApisTest.ts | 4 +- test/IdentityClientTest.ts | 14 +- test/MatrixAuthTest.ts | 4 +- test/MatrixClientTest.ts | 62 ++--- test/SynapseAdminApisTest.ts | 14 +- test/SynchronousMatrixClientTest.ts | 6 +- test/TestUtils.ts | 6 +- test/UnstableApisTest.ts | 4 +- test/appservice/AppserviceTest.ts | 8 +- test/appservice/IntentTest.ts | 8 +- test/appservice/UnstableAppserviceApisTest.ts | 16 +- yarn.lock | 249 ++---------------- 13 files changed, 90 insertions(+), 307 deletions(-) diff --git a/package.json b/package.json index f2572b90..abafc775 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "get-port": "^5", "jest": "^28.1.0", "jsdoc": "^3.6.10", - "matrix-mock-request": "^1.2.3", + "matrix-mock-request": "^2.1.0", "simple-mock": "^0.8.0", "tmp": "^0.2.1", "ts-jest": "^28.0.3", diff --git a/test/AdminApisTest.ts b/test/AdminApisTest.ts index c58a6dfe..92559e22 100644 --- a/test/AdminApisTest.ts +++ b/test/AdminApisTest.ts @@ -1,9 +1,9 @@ -import * as MockHttpBackend from 'matrix-mock-request'; +import HttpBackend from 'matrix-mock-request'; import { AdminApis, IStorageProvider, MatrixClient, WhoisInfo } from "../src"; import { createTestClient } from "./TestUtils"; -export function createTestAdminClient(storage: IStorageProvider = null): { client: AdminApis, mxClient: MatrixClient, http: MockHttpBackend, hsUrl: string, accessToken: string } { +export function createTestAdminClient(storage: IStorageProvider = null): { client: AdminApis, mxClient: MatrixClient, http: HttpBackend, hsUrl: string, accessToken: string } { const result = createTestClient(storage); const mxClient = result.client; const client = new AdminApis(mxClient); diff --git a/test/IdentityClientTest.ts b/test/IdentityClientTest.ts index 710cd4bd..701a1b9a 100644 --- a/test/IdentityClientTest.ts +++ b/test/IdentityClientTest.ts @@ -1,10 +1,10 @@ -import * as MockHttpBackend from 'matrix-mock-request'; +import HttpBackend from 'matrix-mock-request'; import * as simple from "simple-mock"; import { IdentityClient, MatrixClient, setRequestFn, Threepid } from "../src"; import { createTestClient } from "./TestUtils"; -export async function createTestIdentityClient(): Promise<{ client: IdentityClient, mxClient: MatrixClient, http: MockHttpBackend, identityUrl: string, accessToken: string }> { +export async function createTestIdentityClient(): Promise<{ client: IdentityClient, mxClient: MatrixClient, http: HttpBackend, identityUrl: string, accessToken: string }> { const result = createTestClient(); const mxClient = result.client; @@ -517,7 +517,7 @@ describe('IdentityClient', () => { const expectedInput = { test: 1234 }; http.when("GET", "/test").respond(200, (path, content, req) => { - expect(req.opts.qs).toMatchObject(expectedInput); + expect(req.queryParams).toMatchObject(expectedInput); return {}; }); @@ -528,7 +528,7 @@ describe('IdentityClient', () => { const { client, http, accessToken } = await createTestIdentityClient(); http.when("GET", "/test").respond(200, (path, content, req) => { - expect(req.opts.headers["Authorization"]).toEqual(`Bearer ${accessToken}`); + expect(req.headers["Authorization"]).toEqual(`Bearer ${accessToken}`); return {}; }); @@ -539,7 +539,7 @@ describe('IdentityClient', () => { const { client, http } = await createTestIdentityClient(); http.when("PUT", "/test").respond(200, (path, content, req) => { - expect(req.opts.headers["Content-Type"]).toEqual("application/json"); + expect(req.headers["Content-Type"]).toEqual("application/json"); return {}; }); @@ -554,7 +554,7 @@ describe('IdentityClient', () => { Buffer.isBuffer = (i => i === fakeJson); http.when("PUT", "/test").respond(200, (path, content, req) => { - expect(req.opts.headers["Content-Type"]).toEqual(contentType); + expect(req.headers["Content-Type"]).toEqual(contentType); return {}; }); @@ -585,7 +585,7 @@ describe('IdentityClient', () => { const timeout = 10; http.when("GET", "/test").respond(200, (path, content, req) => { - expect(req.opts.timeout).toBe(timeout); + expect((req as any).opts.timeout).toBe(timeout); }); await Promise.all([client.doRequest("GET", "/test", null, null, timeout), http.flushAllExpected()]); diff --git a/test/MatrixAuthTest.ts b/test/MatrixAuthTest.ts index a1ddf721..f46fe624 100644 --- a/test/MatrixAuthTest.ts +++ b/test/MatrixAuthTest.ts @@ -1,9 +1,9 @@ -import * as MockHttpBackend from 'matrix-mock-request'; +import HttpBackend from 'matrix-mock-request'; import { MatrixAuth } from "../src"; import { createTestClient } from "./TestUtils"; -export function createTestAuth(): { auth: MatrixAuth, http: MockHttpBackend, hsUrl: string } { +export function createTestAuth(): { auth: MatrixAuth, http: HttpBackend, hsUrl: string } { const result = createTestClient(); const mxClient = result.client; diff --git a/test/MatrixClientTest.ts b/test/MatrixClientTest.ts index e5f8ba8d..8da11310 100644 --- a/test/MatrixClientTest.ts +++ b/test/MatrixClientTest.ts @@ -145,7 +145,7 @@ describe('MatrixClient', () => { // noinspection TypeScriptValidateJSTypes http.when("GET", "/test").respond(200, (path, content, req) => { - expect(req.opts.qs).toMatchObject(expectedInput); + expect(req.queryParams).toMatchObject(expectedInput); return {}; }); @@ -157,7 +157,7 @@ describe('MatrixClient', () => { // noinspection TypeScriptValidateJSTypes http.when("GET", "/test").respond(200, (path, content, req) => { - expect(req.opts.headers["Authorization"]).toEqual(`Bearer ${accessToken}`); + expect(req.headers["Authorization"]).toEqual(`Bearer ${accessToken}`); return {}; }); @@ -169,7 +169,7 @@ describe('MatrixClient', () => { // noinspection TypeScriptValidateJSTypes http.when("PUT", "/test").respond(200, (path, content, req) => { - expect(req.opts.headers["Content-Type"]).toEqual("application/json"); + expect(req.headers["Content-Type"]).toEqual("application/json"); return {}; }); @@ -185,7 +185,7 @@ describe('MatrixClient', () => { // noinspection TypeScriptValidateJSTypes http.when("PUT", "/test").respond(200, (path, content, req) => { - expect(req.opts.headers["Content-Type"]).toEqual(contentType); + expect(req.headers["Content-Type"]).toEqual(contentType); return {}; }); @@ -218,7 +218,7 @@ describe('MatrixClient', () => { // noinspection TypeScriptValidateJSTypes http.when("GET", "/test").respond(200, (path, content, req) => { - expect(req.opts.timeout).toBe(timeout); + expect((req as any).opts.timeout).toBe(timeout); }); await Promise.all([client.doRequest("GET", "/test", null, null, timeout), http.flushAllExpected()]); @@ -234,8 +234,8 @@ describe('MatrixClient', () => { // noinspection TypeScriptValidateJSTypes http.when("GET", "/test").respond(200, (path, content, req) => { - expect(req.opts.qs["user_id"]).toBe(userId); - expect(req.opts.qs["org.matrix.msc3202.device_id"]).toBe(undefined); + expect(req.queryParams["user_id"]).toBe(userId); + expect(req.queryParams["org.matrix.msc3202.device_id"]).toBe(undefined); }); await Promise.all([client.doRequest("GET", "/test"), http.flushAllExpected()]); @@ -250,8 +250,8 @@ describe('MatrixClient', () => { // noinspection TypeScriptValidateJSTypes http.when("GET", "/test").respond(200, (path, content, req) => { - expect(req.opts.qs["user_id"]).toBe(userId); - expect(req.opts.qs["org.matrix.msc3202.device_id"]).toBe(deviceId); + expect(req.queryParams["user_id"]).toBe(userId); + expect(req.queryParams["org.matrix.msc3202.device_id"]).toBe(deviceId); }); await Promise.all([client.doRequest("GET", "/test"), http.flushAllExpected()]); @@ -266,8 +266,8 @@ describe('MatrixClient', () => { // noinspection TypeScriptValidateJSTypes http.when("GET", "/test").respond(200, (path, content, req) => { - expect(req.opts.qs?.["user_id"]).toBe(undefined); - expect(req.opts.qs?.["org.matrix.msc3202.device_id"]).toBe(undefined); + expect(req.queryParams?.["user_id"]).toBe(undefined); + expect(req.queryParams?.["org.matrix.msc3202.device_id"]).toBe(undefined); }); await Promise.all([client.doRequest("GET", "/test"), http.flushAllExpected()]); @@ -1255,7 +1255,7 @@ describe('MatrixClient', () => { // noinspection TypeScriptValidateJSTypes http.when("GET", "/_matrix/client/v3/sync").respond(200, (path, content, req) => { expect(req).toBeDefined(); - expect(req.opts.qs.filter).toEqual(filterId); + expect(req.queryParams.filter).toEqual(filterId); client.stop(); return { next_batch: "1234" }; }); @@ -1293,13 +1293,13 @@ describe('MatrixClient', () => { // noinspection TypeScriptValidateJSTypes http.when("GET", "/_matrix/client/v3/sync").respond(200, (path, content, req) => { expect(req).toBeDefined(); - expect(req.opts.qs.since).toBeUndefined(); + expect(req.queryParams.since).toBeUndefined(); return { next_batch: secondToken }; }); // noinspection TypeScriptValidateJSTypes http.when("GET", "/_matrix/client/v3/sync").respond(200, (path, content, req) => { expect(req).toBeDefined(); - expect(req.opts.qs.since).toEqual(secondToken); + expect(req.queryParams.since).toEqual(secondToken); client.stop(); return { next_batch: secondToken }; }); @@ -1340,7 +1340,7 @@ describe('MatrixClient', () => { http.when("GET", "/_matrix/client/v3/sync").respond(200, (path, content, req) => { expect(req).toBeDefined(); - expect(req.opts.qs.since).toEqual(syncToken); + expect(req.queryParams.since).toEqual(syncToken); client.stop(); return { next_batch: syncToken }; @@ -1375,14 +1375,14 @@ describe('MatrixClient', () => { // noinspection TypeScriptValidateJSTypes http.when("GET", "/_matrix/client/v3/sync").respond(200, (path, content, req) => { expect(req).toBeDefined(); - expect(req.opts.qs.presence).toBeUndefined(); + expect(req.queryParams.presence).toBeUndefined(); client.syncingPresence = presence; return { next_batch: "testing" }; }); // noinspection TypeScriptValidateJSTypes http.when("GET", "/_matrix/client/v3/sync").respond(200, (path, content, req) => { expect(req).toBeDefined(); - expect(req.opts.qs.presence).toEqual(presence); + expect(req.queryParams.presence).toEqual(presence); client.stop(); return { next_batch: "testing" }; }); @@ -2736,7 +2736,7 @@ describe('MatrixClient', () => { // noinspection TypeScriptValidateJSTypes http.when("GET", "/_matrix/client/v3/rooms").respond(200, (path, content, req) => { expect(path).toEqual(`${hsUrl}/_matrix/client/v3/rooms/${encodeURIComponent(roomId)}/context/${encodeURIComponent(targetEvent.eventId)}`); - expect(req.opts.qs['limit']).toEqual(limit); + expect(req.queryParams['limit']).toEqual(limit); return { event: targetEvent, events_before: before, @@ -2893,9 +2893,9 @@ describe('MatrixClient', () => { // noinspection TypeScriptValidateJSTypes http.when("POST", "/_matrix/client/v3/join").respond(200, (path, content, req) => { expect(path).toEqual(`${hsUrl}/_matrix/client/v3/join/${encodeURIComponent(roomId)}`); - expect(req.opts.qs['server_name'].length).toEqual(serverNames.length); + expect(req.queryParams['server_name'].length).toEqual(serverNames.length); for (let i = 0; i < serverNames.length; i++) { - expect(req.opts.qs['server_name'][i]).toEqual(serverNames[i]); + expect(req.queryParams['server_name'][i]).toEqual(serverNames[i]); } return { room_id: roomId }; }); @@ -3109,7 +3109,7 @@ describe('MatrixClient', () => { // noinspection TypeScriptValidateJSTypes http.when("GET", "/_matrix/client/v3/rooms").respond(200, (path, content, req) => { expect(path).toEqual(`${hsUrl}/_matrix/client/v3/rooms/${encodeURIComponent(roomId)}/members`); - expect(req.opts.qs.at).toEqual(atToken); + expect(req.queryParams.at).toEqual(atToken); return { chunk: memberEvents }; }); @@ -3149,8 +3149,8 @@ describe('MatrixClient', () => { // noinspection TypeScriptValidateJSTypes http.when("GET", "/_matrix/client/v3/rooms").respond(200, (path, content, req) => { expect(path).toEqual(`${hsUrl}/_matrix/client/v3/rooms/${encodeURIComponent(roomId)}/members`); - expectArrayEquals(forMemberships, req.opts.qs.membership); - expectArrayEquals(forNotMemberships, req.opts.qs.not_membership); + expectArrayEquals(forMemberships, (req.queryParams as any).membership); + expectArrayEquals(forNotMemberships, (req.queryParams as any).not_membership); return { chunk: memberEvents }; }); @@ -5443,9 +5443,9 @@ describe('MatrixClient', () => { // noinspection TypeScriptValidateJSTypes http.when("POST", "/_matrix/media/v3/upload").respond(200, (path, content, req) => { expect(content).toBeDefined(); - expect(req.opts.qs.filename).toEqual(filename); - expect(req.opts.headers["Content-Type"]).toEqual(contentType); - expect(req.opts.body).toEqual(data); + expect(req.queryParams.filename).toEqual(filename); + expect(req.headers["Content-Type"]).toEqual(contentType); + expect(req.rawData).toEqual(data); return { content_uri: uri }; }); @@ -5466,9 +5466,9 @@ describe('MatrixClient', () => { // noinspection TypeScriptValidateJSTypes http.when("POST", "/_matrix/media/v3/upload").respond(200, (path, content, req) => { expect(content).toBeDefined(); - expect(req.opts.qs.filename).toEqual(filename); - expect(req.opts.headers["Content-Type"]).toEqual(contentType); - expect(req.opts.body).toEqual(data); + expect(req.queryParams.filename).toEqual(filename); + expect(req.headers["Content-Type"]).toEqual(contentType); + expect(req.rawData).toEqual(data); return { content_uri: uri }; }); @@ -5487,7 +5487,7 @@ describe('MatrixClient', () => { // noinspection TypeScriptValidateJSTypes http.when("GET", "/_matrix/media/v3/download/").respond(200, (path, _, req) => { expect(path).toContain("/_matrix/media/v3/download/" + urlPart); - expect(req.opts.encoding).toEqual(null); + expect((req as any).opts.encoding).toEqual(null); // TODO: Honestly, I have no idea how to coerce the mock library to return headers or buffers, // so this is left as a fun activity. // return { @@ -5525,7 +5525,7 @@ describe('MatrixClient', () => { http.when("POST", "/_matrix/media/v3/upload").respond(200, (path, content, req) => { expect(content).toBeDefined(); // HACK: We know the mock library will return JSON - expect(req.opts.headers["Content-Type"]).toEqual("application/json"); + expect(req.headers["Content-Type"]).toEqual("application/json"); //expect(req.opts.body).toEqual(data); // XXX: We can't verify that the content was uploaded correctly return { content_uri: uri }; }); diff --git a/test/SynapseAdminApisTest.ts b/test/SynapseAdminApisTest.ts index d48b8451..b6f9bcac 100644 --- a/test/SynapseAdminApisTest.ts +++ b/test/SynapseAdminApisTest.ts @@ -1,4 +1,4 @@ -import * as MockHttpBackend from 'matrix-mock-request'; +import HttpBackend from 'matrix-mock-request'; import { IStorageProvider, @@ -20,7 +20,7 @@ export function createTestSynapseAdminClient( ): { client: SynapseAdminApis; mxClient: MatrixClient; - http: MockHttpBackend; + http: HttpBackend; hsUrl: string; accessToken: string; } { @@ -208,7 +208,7 @@ describe('SynapseAdminApis', () => { }; http.when("GET", "/_synapse/admin/v2/users").respond(200, (path, _content, req) => { - expect(req.opts.qs).toEqual(request); + expect(req.queryParams).toEqual(request); expect(path).toEqual(`${hsUrl}/_synapse/admin/v2/users`); return response; }); @@ -255,7 +255,7 @@ describe('SynapseAdminApis', () => { http.when("GET", "/_synapse/admin/v2/users").respond(200, (path, _content, req) => { expect(path).toEqual(`${hsUrl}/_synapse/admin/v2/users`); - expect(req.opts.qs).toEqual(request); + expect(req.queryParams).toEqual(request); return { next_token: 'from-token', total: 2, @@ -269,7 +269,7 @@ describe('SynapseAdminApis', () => { http.when("GET", "/_synapse/admin/v2/users").respond(200, (path, _content, req) => { expect(path).toEqual(`${hsUrl}/_synapse/admin/v2/users`); - expect(req.opts.qs).toEqual({ ...request, from: 'from-token' }); + expect(req.queryParams).toEqual({ ...request, from: 'from-token' }); return { total: 2, users: [user2], @@ -319,7 +319,7 @@ describe('SynapseAdminApis', () => { }; http.when("GET", "/_synapse/admin/v1/rooms").respond(200, (path, _content, req) => { - expect(req.opts.qs).toEqual(request); + expect(req.queryParams).toEqual(request); expect(path).toEqual(`${hsUrl}/_synapse/admin/v1/rooms`); return response; }); @@ -358,7 +358,7 @@ describe('SynapseAdminApis', () => { const roomId = "!room:example.org"; http.when("DELETE", "/_synapse/admin/v2/rooms").respond(200, (path, _content, req) => { - expect(JSON.parse(req.opts.body)).toMatchObject({ purge: true }); + expect(JSON.parse(req.rawData)).toMatchObject({ purge: true }); expect(path).toEqual(`${hsUrl}/_synapse/admin/v2/rooms/${encodeURIComponent(roomId)}`); return {}; }); diff --git a/test/SynchronousMatrixClientTest.ts b/test/SynchronousMatrixClientTest.ts index c6cf3ea2..39256846 100644 --- a/test/SynchronousMatrixClientTest.ts +++ b/test/SynchronousMatrixClientTest.ts @@ -1,5 +1,5 @@ import * as simple from "simple-mock"; -import * as MockHttpBackend from 'matrix-mock-request'; +import HttpBackend from 'matrix-mock-request'; import { IStorageProvider, MatrixClient, setRequestFn, SynchronousMatrixClient } from "../src"; @@ -15,8 +15,8 @@ class TestSyncMatrixClient extends SynchronousMatrixClient { } } -export function createSyncTestClient(storage: IStorageProvider = null): { client: TestSyncMatrixClient, http: MockHttpBackend, hsUrl: string, accessToken: string } { - const http = new MockHttpBackend(); +export function createSyncTestClient(storage: IStorageProvider = null): { client: TestSyncMatrixClient, http: HttpBackend, hsUrl: string, accessToken: string } { + const http = new HttpBackend(); const hsUrl = "https://localhost"; const accessToken = "s3cret"; const client = new MatrixClient(hsUrl, accessToken, storage); diff --git a/test/TestUtils.ts b/test/TestUtils.ts index 98f8a15c..f62f692f 100644 --- a/test/TestUtils.ts +++ b/test/TestUtils.ts @@ -1,5 +1,5 @@ -import * as MockHttpBackend from 'matrix-mock-request'; import * as tmp from "tmp"; +import HttpBackend from "matrix-mock-request"; import { IStorageProvider, MatrixClient, RustSdkCryptoStorageProvider, setRequestFn } from "../src"; @@ -32,11 +32,11 @@ export function createTestClient( crypto = false, ): { client: MatrixClient; - http: MockHttpBackend; + http: HttpBackend; hsUrl: string; accessToken: string; } { - const http = new MockHttpBackend(); + const http = new HttpBackend(); const hsUrl = "https://localhost"; const accessToken = "s3cret"; const client = new MatrixClient(hsUrl, accessToken, storage, crypto ? new RustSdkCryptoStorageProvider(tmp.dirSync().name) : null); diff --git a/test/UnstableApisTest.ts b/test/UnstableApisTest.ts index f8a046aa..efea620d 100644 --- a/test/UnstableApisTest.ts +++ b/test/UnstableApisTest.ts @@ -1,4 +1,4 @@ -import * as MockHttpBackend from 'matrix-mock-request'; +import HttpBackend from 'matrix-mock-request'; import { GroupProfile, IStorageProvider, MatrixClient, MSC2380MediaInfo, UnstableApis } from "../src"; import { createTestClient } from "./TestUtils"; @@ -8,7 +8,7 @@ export function createTestUnstableClient( ): { client: UnstableApis; mxClient: MatrixClient; - http: MockHttpBackend; + http: HttpBackend; hsUrl: string; accessToken: string; } { diff --git a/test/appservice/AppserviceTest.ts b/test/appservice/AppserviceTest.ts index a804f6e4..fd59eafe 100644 --- a/test/appservice/AppserviceTest.ts +++ b/test/appservice/AppserviceTest.ts @@ -1,7 +1,7 @@ import * as getPort from "get-port"; import * as requestPromise from "request-promise"; import * as simple from "simple-mock"; -import * as MockHttpBackend from 'matrix-mock-request'; +import HttpBackend from 'matrix-mock-request'; import { Appservice, EventKind, Intent, IPreprocessor, setRequestFn } from "../../src"; @@ -1745,7 +1745,7 @@ describe('Appservice', () => { return null; }; - const http = new MockHttpBackend(); + const http = new HttpBackend(); setRequestFn(http.requestFn); await appservice.begin(); @@ -1829,7 +1829,7 @@ describe('Appservice', () => { return null; }; - const http = new MockHttpBackend(); + const http = new HttpBackend(); setRequestFn(http.requestFn); await appservice.begin(); @@ -2724,7 +2724,7 @@ describe('Appservice', () => { return null; }; - const http = new MockHttpBackend(); + const http = new HttpBackend(); setRequestFn(http.requestFn); http.when("PUT", "/_matrix/client/v3/directory/list/appservice").respond(200, (path, content) => { diff --git a/test/appservice/IntentTest.ts b/test/appservice/IntentTest.ts index eacf37d5..3b040054 100644 --- a/test/appservice/IntentTest.ts +++ b/test/appservice/IntentTest.ts @@ -1,5 +1,5 @@ import * as simple from "simple-mock"; -import * as MockHttpBackend from 'matrix-mock-request'; +import HttpBackend from 'matrix-mock-request'; import * as tmp from "tmp"; import { expectArrayEquals } from "../TestUtils"; @@ -139,7 +139,7 @@ describe('Intent', () => { }); it('should try to register the user when not flagged as such', async () => { - const http = new MockHttpBackend(); + const http = new HttpBackend(); setRequestFn(http.requestFn); const userId = "@someone:example.org"; @@ -178,7 +178,7 @@ describe('Intent', () => { }); it('should gracefully handle M_USER_IN_USE', async () => { - const http = new MockHttpBackend(); + const http = new HttpBackend(); setRequestFn(http.requestFn); const userId = "@someone:example.org"; @@ -218,7 +218,7 @@ describe('Intent', () => { }); it('should handle unexpected errors', async () => { - const http = new MockHttpBackend(); + const http = new HttpBackend(); setRequestFn(http.requestFn); const userId = "@someone:example.org"; diff --git a/test/appservice/UnstableAppserviceApisTest.ts b/test/appservice/UnstableAppserviceApisTest.ts index 49062296..e98b774c 100644 --- a/test/appservice/UnstableAppserviceApisTest.ts +++ b/test/appservice/UnstableAppserviceApisTest.ts @@ -1,4 +1,4 @@ -import * as MockHttpBackend from 'matrix-mock-request'; +import HttpBackend from 'matrix-mock-request'; import { IStorageProvider, MatrixClient, MSC2716BatchSendResponse, UnstableAppserviceApis } from "../../src"; import { createTestClient } from "../TestUtils"; @@ -8,7 +8,7 @@ export function createTestUnstableClient( ): { client: UnstableAppserviceApis; mxClient: MatrixClient; - http: MockHttpBackend; + http: HttpBackend; hsUrl: string; accessToken: string; } { @@ -37,9 +37,9 @@ describe('UnstableAppserviceApis', () => { next_chunk_id: "evenchunkierid", } as MSC2716BatchSendResponse; - http.when("POST", `/_matrix/client/unstable/org.matrix.msc2716/rooms/`).respond(200, (path, content, { opts }) => { + http.when("POST", `/_matrix/client/unstable/org.matrix.msc2716/rooms/`).respond(200, (path, content, req) => { expect(path).toEqual(`${hsUrl}/_matrix/client/unstable/org.matrix.msc2716/rooms/${encodeURIComponent(roomId)}/batch_send`); - expect(opts.qs).toMatchObject({ + expect(req.queryParams).toMatchObject({ prev_event: prevEventId, chunk_id: prevChunkId, }); @@ -72,11 +72,11 @@ describe('UnstableAppserviceApis', () => { }; const ts = 5000; - http.when("PUT", "/_matrix/client/v3/rooms").respond(200, (path, content, { opts }) => { + http.when("PUT", "/_matrix/client/v3/rooms").respond(200, (path, content, req) => { const idx = path.indexOf(`${hsUrl}/_matrix/client/v3/rooms/${encodeURIComponent(roomId)}/send/${encodeURIComponent(eventType)}/`); expect(idx).toBe(0); expect(content).toMatchObject(eventContent); - expect(opts.qs).toMatchObject({ ts }); + expect(req.queryParams).toMatchObject({ ts }); return { event_id: eventId }; }); @@ -100,11 +100,11 @@ describe('UnstableAppserviceApis', () => { }; const ts = 5000; - http.when("PUT", "/_matrix/client/v3/rooms").respond(200, (path, content, { opts }) => { + http.when("PUT", "/_matrix/client/v3/rooms").respond(200, (path, content, req) => { const idx = path.indexOf(`${hsUrl}/_matrix/client/v3/rooms/${encodeURIComponent(roomId)}/state/${encodeURIComponent(eventType)}/`); expect(idx).toBe(0); expect(content).toMatchObject(eventContent); - expect(opts.qs).toMatchObject({ ts }); + expect(req.queryParams).toMatchObject({ ts }); return { event_id: eventId }; }); diff --git a/yarn.lock b/yarn.lock index 533a84e9..c36d6ca6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1118,11 +1118,6 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== -available-typed-arrays@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" - integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== - aws-sign2@~0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" @@ -1624,7 +1619,7 @@ deepmerge@^4.2.2: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== -define-properties@^1.1.3, define-properties@^1.1.4, define-properties@~1.1.2: +define-properties@^1.1.3, define-properties@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1" integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA== @@ -1778,7 +1773,7 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19.5, es-abstract@^1.20.0: +es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19.5: version "1.20.1" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.1.tgz#027292cd6ef44bd12b1913b828116f54787d1814" integrity sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA== @@ -1807,20 +1802,6 @@ es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19 string.prototype.trimstart "^1.0.5" unbox-primitive "^1.0.2" -es-get-iterator@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.2.tgz#9234c54aba713486d7ebde0220864af5e2b283f7" - integrity sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.0" - has-symbols "^1.0.1" - is-arguments "^1.1.0" - is-map "^2.0.2" - is-set "^2.0.2" - is-string "^1.0.5" - isarray "^2.0.5" - es-shim-unscopables@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241" @@ -2074,19 +2055,6 @@ expect@*, expect@^28.1.0: jest-message-util "^28.1.0" jest-util "^28.1.0" -expect@^1.20.2: - version "1.20.2" - resolved "https://registry.yarnpkg.com/expect/-/expect-1.20.2.tgz#d458fe4c56004036bae3232416a3f6361f04f965" - integrity sha512-vUOB6rNLhhRgchrNzJZH72FXDgiHmmEqX07Nlb1363HyZm/GFzkNMq0X0eIygMtdc4f2okltziddtVM4D5q0Jw== - dependencies: - define-properties "~1.1.2" - has "^1.0.1" - is-equal "^1.5.1" - is-regex "^1.0.3" - object-inspect "^1.1.0" - object-keys "^1.0.9" - tmatch "^2.0.1" - express@^4.18.1: version "4.18.1" resolved "https://registry.yarnpkg.com/express/-/express-4.18.1.tgz#7797de8b9c72c857b9cd0e14a5eea80666267caf" @@ -2242,13 +2210,6 @@ flatted@^3.1.0: resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3" integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg== -for-each@^0.3.3: - version "0.3.3" - resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" - integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw== - dependencies: - is-callable "^1.1.3" - foreground-child@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-2.0.0.tgz#71b32800c9f15aa8f2f83f4a6bd9bff35d861a53" @@ -2472,7 +2433,7 @@ has-tostringtag@^1.0.0: dependencies: has-symbols "^1.0.2" -has@^1.0.1, has@^1.0.3: +has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== @@ -2619,41 +2580,19 @@ ipaddr.js@1.9.1: resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== -is-arguments@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" - integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== - dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= -is-arrow-function@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/is-arrow-function/-/is-arrow-function-2.0.3.tgz#29be2c2d8d9450852b8bbafb635ba7b8d8e87ec2" - integrity sha1-Kb4sLY2UUIUri7r7Y1unuNjofsI= - dependencies: - is-callable "^1.0.4" - -is-async-function@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-async-function/-/is-async-function-2.0.0.tgz#8e4418efd3e5d3a6ebb0164c05ef5afb69aa9646" - integrity sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA== - dependencies: - has-tostringtag "^1.0.0" - -is-bigint@^1.0.1, is-bigint@^1.0.4: +is-bigint@^1.0.1: version "1.0.4" resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== dependencies: has-bigints "^1.0.1" -is-boolean-object@^1.1.0, is-boolean-object@^1.1.2: +is-boolean-object@^1.1.0: version "1.1.2" resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== @@ -2666,7 +2605,7 @@ is-buffer@^1.1.5: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== -is-callable@^1.0.4, is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.4: +is-callable@^1.1.4, is-callable@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== @@ -2678,40 +2617,13 @@ is-core-module@^2.8.1: dependencies: has "^1.0.3" -is-date-object@^1.0.1, is-date-object@^1.0.5: +is-date-object@^1.0.1: version "1.0.5" resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== dependencies: has-tostringtag "^1.0.0" -is-equal@^1.5.1: - version "1.6.4" - resolved "https://registry.yarnpkg.com/is-equal/-/is-equal-1.6.4.tgz#9a51b9ff565637ca2452356e293e9c98a1490ea1" - integrity sha512-NiPOTBb5ahmIOYkJ7mVTvvB1bydnTzixvfO+59AjJKBpyjPBIULL3EHGxySyZijlVpewveJyhiLQThcivkkAtw== - dependencies: - es-get-iterator "^1.1.2" - functions-have-names "^1.2.2" - has "^1.0.3" - has-bigints "^1.0.1" - has-symbols "^1.0.2" - is-arrow-function "^2.0.3" - is-bigint "^1.0.4" - is-boolean-object "^1.1.2" - is-callable "^1.2.4" - is-date-object "^1.0.5" - is-generator-function "^1.0.10" - is-number-object "^1.0.6" - is-regex "^1.1.4" - is-string "^1.0.7" - is-symbol "^1.0.4" - isarray "^2.0.5" - object-inspect "^1.12.0" - object.entries "^1.1.5" - object.getprototypeof "^1.0.3" - which-boxed-primitive "^1.0.2" - which-collection "^1.0.1" - is-expression@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-expression/-/is-expression-3.0.0.tgz#39acaa6be7fd1f3471dc42c7416e61c24317ac9f" @@ -2725,13 +2637,6 @@ is-extglob@^2.1.1: resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= -is-finalizationregistry@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz#c8749b65f17c133313e661b1289b95ad3dbd62e6" - integrity sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw== - dependencies: - call-bind "^1.0.2" - is-fullwidth-code-point@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" @@ -2742,13 +2647,6 @@ is-generator-fn@^2.0.0: resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118" integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ== -is-generator-function@^1.0.10: - version "1.0.10" - resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72" - integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A== - dependencies: - has-tostringtag "^1.0.0" - is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" @@ -2756,17 +2654,12 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3: dependencies: is-extglob "^2.1.1" -is-map@^2.0.1, is-map@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127" - integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg== - is-negative-zero@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== -is-number-object@^1.0.4, is-number-object@^1.0.6: +is-number-object@^1.0.4: version "1.0.7" resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc" integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ== @@ -2796,11 +2689,6 @@ is-regex@^1.0.3, is-regex@^1.1.4: call-bind "^1.0.2" has-tostringtag "^1.0.0" -is-set@^2.0.1, is-set@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec" - integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g== - is-shared-array-buffer@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79" @@ -2820,34 +2708,18 @@ is-string@^1.0.5, is-string@^1.0.7: dependencies: has-tostringtag "^1.0.0" -is-symbol@^1.0.2, is-symbol@^1.0.3, is-symbol@^1.0.4: +is-symbol@^1.0.2, is-symbol@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== dependencies: has-symbols "^1.0.2" -is-typed-array@^1.1.9: - version "1.1.9" - resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.9.tgz#246d77d2871e7d9f5aeb1d54b9f52c71329ece67" - integrity sha512-kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A== - dependencies: - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" - es-abstract "^1.20.0" - for-each "^0.3.3" - has-tostringtag "^1.0.0" - is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= -is-weakmap@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2" - integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA== - is-weakref@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" @@ -2855,19 +2727,6 @@ is-weakref@^1.0.2: dependencies: call-bind "^1.0.2" -is-weakset@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.2.tgz#4569d67a747a1ce5a994dfd4ef6dcea76e7c0a1d" - integrity sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.1" - -isarray@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" - integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw== - isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -3597,13 +3456,12 @@ marked@^4.0.10: resolved "https://registry.yarnpkg.com/marked/-/marked-4.0.16.tgz#9ec18fc1a723032eb28666100344d9428cf7a264" integrity sha512-wahonIQ5Jnyatt2fn8KqF/nIqZM8mh3oRu2+l5EANGMhu6RFjiSG52QNE2eWzFMI94HqYSgN184NurgNG6CztA== -matrix-mock-request@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8" - integrity sha512-Tr7LDHweTW8Ql4C8XhGQFGMzuh+HmPjOcQqrHH1qfSesq0cwdPWanvdnllNjeHoAMcZ43HpMFMzFZfNW1/6HYg== +matrix-mock-request@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-2.1.0.tgz#86f5b0ef846865d0767d3a8e64f5bcd6ca94c178" + integrity sha512-Cjpl3yP6h0yu5GKG89m1XZXZlm69Kg/qHV41N/t6SrQsgcfM3Bfavqx9YrtG0UnuXGy4bBSZIe1QiWVeFPZw1A== dependencies: - bluebird "^3.5.0" - expect "^1.20.2" + expect "^28.1.0" mdurl@^1.0.1: version "1.0.1" @@ -3792,12 +3650,12 @@ object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= -object-inspect@^1.1.0, object-inspect@^1.12.0, object-inspect@^1.9.0: +object-inspect@^1.12.0, object-inspect@^1.9.0: version "1.12.2" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea" integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ== -object-keys@^1.0.9, object-keys@^1.1.1: +object-keys@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== @@ -3812,25 +3670,6 @@ object.assign@^4.1.2: has-symbols "^1.0.1" object-keys "^1.1.1" -object.entries@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861" - integrity sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.1" - -object.getprototypeof@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/object.getprototypeof/-/object.getprototypeof-1.0.3.tgz#92e0c2320ffd3990f3378c9c3489929af31a190f" - integrity sha512-EP3J0rXZA4OuvSl98wYa0hY5zHUJo2kGrp2eYDro0yCe3yrKm7xtXDgbpT+YPK2RzdtdvJtm0IfaAyXeehQR0w== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.1" - reflect.getprototypeof "^1.0.2" - object.values@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" @@ -4338,17 +4177,6 @@ rechoir@^0.6.2: dependencies: resolve "^1.1.6" -reflect.getprototypeof@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.2.tgz#dd231808828913fd2198e151eb3e213d9dddf708" - integrity sha512-C1+ANgX50UkWlntmOJ8SD1VTuk28+7X1ackBdfXzLQG5+bmriEMHvBaor9YlotCfBHo277q/YWd/JKEOzr5Dxg== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.1" - get-intrinsic "^1.1.1" - which-builtin-type "^1.1.1" - regenerator-runtime@^0.11.0: version "0.11.1" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" @@ -4827,11 +4655,6 @@ throat@^6.0.1: resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.1.tgz#d514fedad95740c12c2d7fc70ea863eb51ade375" integrity sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w== -tmatch@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/tmatch/-/tmatch-2.0.1.tgz#0c56246f33f30da1b8d3d72895abaf16660f38cf" - integrity sha1-DFYkbzPzDaG409colauvFmYPOM8= - tmp@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" @@ -5116,46 +4939,6 @@ which-boxed-primitive@^1.0.2: is-string "^1.0.5" is-symbol "^1.0.3" -which-builtin-type@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.1.2.tgz#254a34f6cd2a546e04d51d9a4ac2c65e9ed31bf4" - integrity sha512-2/+MF0XNPySHrIPlIAUB1dmQuWOPfQDR+TvwZs2tayroIA61MvZDJtkvwjv2iDg7h668jocdWsPOQwwAz5QUSg== - dependencies: - function.prototype.name "^1.1.5" - has-tostringtag "^1.0.0" - is-async-function "^2.0.0" - is-date-object "^1.0.5" - is-finalizationregistry "^1.0.2" - is-generator-function "^1.0.10" - is-regex "^1.1.4" - is-weakref "^1.0.2" - isarray "^2.0.5" - which-boxed-primitive "^1.0.2" - which-collection "^1.0.1" - which-typed-array "^1.1.7" - -which-collection@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906" - integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A== - dependencies: - is-map "^2.0.1" - is-set "^2.0.1" - is-weakmap "^2.0.1" - is-weakset "^2.0.1" - -which-typed-array@^1.1.7: - version "1.1.8" - resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.8.tgz#0cfd53401a6f334d90ed1125754a42ed663eb01f" - integrity sha512-Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw== - dependencies: - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" - es-abstract "^1.20.0" - for-each "^0.3.3" - has-tostringtag "^1.0.0" - is-typed-array "^1.1.9" - which@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"