From 57d71ccd0fcba6a9e0f06e97dbca076c46ec9fe1 Mon Sep 17 00:00:00 2001 From: Kerry Date: Mon, 14 Mar 2022 14:55:11 +0100 Subject: [PATCH] Move test-utils into a directory (#2236) * move test-utils.js into directory Signed-off-by: Kerry Archibald * fix imports Signed-off-by: Kerry Archibald --- spec/TestClient.js | 2 +- spec/browserify/sync-browserify.spec.js | 2 +- spec/integ/devicelist-integ-spec.js | 2 +- spec/integ/matrix-client-crypto.spec.js | 2 +- spec/integ/matrix-client-event-emitter.spec.js | 2 +- spec/integ/matrix-client-event-timeline.spec.js | 2 +- spec/integ/matrix-client-methods.spec.js | 2 +- spec/integ/matrix-client-opts.spec.js | 2 +- spec/integ/matrix-client-room-timeline.spec.js | 2 +- spec/integ/matrix-client-syncing.spec.js | 2 +- spec/integ/megolm-integ.spec.js | 2 +- spec/{ => test-utils}/test-utils.js | 6 +++--- spec/unit/crypto/algorithms/megolm.spec.js | 2 +- spec/unit/crypto/backup.spec.js | 2 +- spec/unit/crypto/cross-signing.spec.js | 2 +- spec/unit/event-timeline.spec.js | 2 +- spec/unit/filter-component.spec.ts | 2 +- spec/unit/matrix-client.spec.ts | 2 +- spec/unit/pushprocessor.spec.js | 2 +- spec/unit/room-member.spec.js | 2 +- spec/unit/room-state.spec.js | 2 +- spec/unit/room.spec.ts | 2 +- spec/unit/scheduler.spec.js | 2 +- spec/unit/timeline-window.spec.js | 2 +- spec/unit/user.spec.js | 2 +- 25 files changed, 27 insertions(+), 27 deletions(-) rename spec/{ => test-utils}/test-utils.js (98%) diff --git a/spec/TestClient.js b/spec/TestClient.js index 1644826a3..7b2474c15 100644 --- a/spec/TestClient.js +++ b/spec/TestClient.js @@ -24,7 +24,7 @@ import MockHttpBackend from 'matrix-mock-request'; import { LocalStorageCryptoStore } from '../src/crypto/store/localStorage-crypto-store'; import { logger } from '../src/logger'; import { WebStorageSessionStore } from "../src/store/session/webstorage"; -import { syncPromise } from "./test-utils"; +import { syncPromise } from "./test-utils/test-utils"; import { createClient } from "../src/matrix"; import { MockStorageApi } from "./MockStorageApi"; diff --git a/spec/browserify/sync-browserify.spec.js b/spec/browserify/sync-browserify.spec.js index c9daa7e85..fd4a0dc9b 100644 --- a/spec/browserify/sync-browserify.spec.js +++ b/spec/browserify/sync-browserify.spec.js @@ -17,7 +17,7 @@ limitations under the License. // load XmlHttpRequest mock import "./setupTests"; import "../../dist/browser-matrix"; // uses browser-matrix instead of the src -import * as utils from "../test-utils"; +import * as utils from "../test-utils/test-utils"; import { TestClient } from "../TestClient"; const USER_ID = "@user:test.server"; diff --git a/spec/integ/devicelist-integ-spec.js b/spec/integ/devicelist-integ-spec.js index 2ca459119..12f7a5a43 100644 --- a/spec/integ/devicelist-integ-spec.js +++ b/spec/integ/devicelist-integ-spec.js @@ -17,7 +17,7 @@ limitations under the License. */ import { TestClient } from '../TestClient'; -import * as testUtils from '../test-utils'; +import * as testUtils from '../test-utils/test-utils'; import { logger } from '../../src/logger'; const ROOM_ID = "!room:id"; diff --git a/spec/integ/matrix-client-crypto.spec.js b/spec/integ/matrix-client-crypto.spec.js index 1782fe6e7..954b62a76 100644 --- a/spec/integ/matrix-client-crypto.spec.js +++ b/spec/integ/matrix-client-crypto.spec.js @@ -29,7 +29,7 @@ limitations under the License. import '../olm-loader'; import { logger } from '../../src/logger'; -import * as testUtils from "../test-utils"; +import * as testUtils from "../test-utils/test-utils"; import { TestClient } from "../TestClient"; import { CRYPTO_ENABLED } from "../../src/client"; diff --git a/spec/integ/matrix-client-event-emitter.spec.js b/spec/integ/matrix-client-event-emitter.spec.js index 551fb9e21..bb3c873b3 100644 --- a/spec/integ/matrix-client-event-emitter.spec.js +++ b/spec/integ/matrix-client-event-emitter.spec.js @@ -1,4 +1,4 @@ -import * as utils from "../test-utils"; +import * as utils from "../test-utils/test-utils"; import { TestClient } from "../TestClient"; describe("MatrixClient events", function() { diff --git a/spec/integ/matrix-client-event-timeline.spec.js b/spec/integ/matrix-client-event-timeline.spec.js index 043000bb4..6499dad18 100644 --- a/spec/integ/matrix-client-event-timeline.spec.js +++ b/spec/integ/matrix-client-event-timeline.spec.js @@ -1,4 +1,4 @@ -import * as utils from "../test-utils"; +import * as utils from "../test-utils/test-utils"; import { EventTimeline } from "../../src/matrix"; import { logger } from "../../src/logger"; import { TestClient } from "../TestClient"; diff --git a/spec/integ/matrix-client-methods.spec.js b/spec/integ/matrix-client-methods.spec.js index 07833c7f2..bdb36e1e9 100644 --- a/spec/integ/matrix-client-methods.spec.js +++ b/spec/integ/matrix-client-methods.spec.js @@ -1,4 +1,4 @@ -import * as utils from "../test-utils"; +import * as utils from "../test-utils/test-utils"; import { CRYPTO_ENABLED } from "../../src/client"; import { MatrixEvent } from "../../src/models/event"; import { Filter, MemoryStore, Room } from "../../src/matrix"; diff --git a/spec/integ/matrix-client-opts.spec.js b/spec/integ/matrix-client-opts.spec.js index d7c92d56d..81c4ba6ab 100644 --- a/spec/integ/matrix-client-opts.spec.js +++ b/spec/integ/matrix-client-opts.spec.js @@ -1,6 +1,6 @@ import HttpBackend from "matrix-mock-request"; -import * as utils from "../test-utils"; +import * as utils from "../test-utils/test-utils"; import { MatrixClient } from "../../src/matrix"; import { MatrixScheduler } from "../../src/scheduler"; import { MemoryStore } from "../../src/store/memory"; diff --git a/spec/integ/matrix-client-room-timeline.spec.js b/spec/integ/matrix-client-room-timeline.spec.js index 519731d27..edb38175b 100644 --- a/spec/integ/matrix-client-room-timeline.spec.js +++ b/spec/integ/matrix-client-room-timeline.spec.js @@ -1,4 +1,4 @@ -import * as utils from "../test-utils"; +import * as utils from "../test-utils/test-utils"; import { EventStatus } from "../../src/models/event"; import { TestClient } from "../TestClient"; diff --git a/spec/integ/matrix-client-syncing.spec.js b/spec/integ/matrix-client-syncing.spec.js index ba736c9e3..adeef9dda 100644 --- a/spec/integ/matrix-client-syncing.spec.js +++ b/spec/integ/matrix-client-syncing.spec.js @@ -1,6 +1,6 @@ import { MatrixEvent } from "../../src/models/event"; import { EventTimeline } from "../../src/models/event-timeline"; -import * as utils from "../test-utils"; +import * as utils from "../test-utils/test-utils"; import { TestClient } from "../TestClient"; describe("MatrixClient syncing", function() { diff --git a/spec/integ/megolm-integ.spec.js b/spec/integ/megolm-integ.spec.js index 4c60f26fc..35374f9ef 100644 --- a/spec/integ/megolm-integ.spec.js +++ b/spec/integ/megolm-integ.spec.js @@ -17,7 +17,7 @@ limitations under the License. import anotherjson from "another-json"; -import * as testUtils from "../test-utils"; +import * as testUtils from "../test-utils/test-utils"; import { TestClient } from "../TestClient"; import { logger } from "../../src/logger"; diff --git a/spec/test-utils.js b/spec/test-utils/test-utils.js similarity index 98% rename from spec/test-utils.js rename to spec/test-utils/test-utils.js index 5b995a377..df137ba6f 100644 --- a/spec/test-utils.js +++ b/spec/test-utils/test-utils.js @@ -1,8 +1,8 @@ // load olm before the sdk if possible -import './olm-loader'; +import '../olm-loader'; -import { logger } from '../src/logger'; -import { MatrixEvent } from "../src/models/event"; +import { logger } from '../../src/logger'; +import { MatrixEvent } from "../../src/models/event"; /** * Return a promise that is resolved when the client next emits a diff --git a/spec/unit/crypto/algorithms/megolm.spec.js b/spec/unit/crypto/algorithms/megolm.spec.js index c63031f65..dd846403f 100644 --- a/spec/unit/crypto/algorithms/megolm.spec.js +++ b/spec/unit/crypto/algorithms/megolm.spec.js @@ -2,7 +2,7 @@ import '../../../olm-loader'; import * as algorithms from "../../../../src/crypto/algorithms"; import { MemoryCryptoStore } from "../../../../src/crypto/store/memory-crypto-store"; import { MockStorageApi } from "../../../MockStorageApi"; -import * as testUtils from "../../../test-utils"; +import * as testUtils from "../../../test-utils/test-utils"; import { OlmDevice } from "../../../../src/crypto/OlmDevice"; import { Crypto } from "../../../../src/crypto"; import { logger } from "../../../../src/logger"; diff --git a/spec/unit/crypto/backup.spec.js b/spec/unit/crypto/backup.spec.js index bd12be1ad..b75bd26c5 100644 --- a/spec/unit/crypto/backup.spec.js +++ b/spec/unit/crypto/backup.spec.js @@ -24,7 +24,7 @@ import * as algorithms from "../../../src/crypto/algorithms"; import { WebStorageSessionStore } from "../../../src/store/session/webstorage"; import { MemoryCryptoStore } from "../../../src/crypto/store/memory-crypto-store"; import { MockStorageApi } from "../../MockStorageApi"; -import * as testUtils from "../../test-utils"; +import * as testUtils from "../../test-utils/test-utils"; import { OlmDevice } from "../../../src/crypto/OlmDevice"; import { Crypto } from "../../../src/crypto"; import { resetCrossSigningKeys } from "./crypto-utils"; diff --git a/spec/unit/crypto/cross-signing.spec.js b/spec/unit/crypto/cross-signing.spec.js index dc46152a0..691c1612f 100644 --- a/spec/unit/crypto/cross-signing.spec.js +++ b/spec/unit/crypto/cross-signing.spec.js @@ -20,7 +20,7 @@ import anotherjson from 'another-json'; import * as olmlib from "../../../src/crypto/olmlib"; import { TestClient } from '../../TestClient'; -import { HttpResponse, setHttpResponses } from '../../test-utils'; +import { HttpResponse, setHttpResponses } from '../../test-utils/test-utils'; import { resetCrossSigningKeys } from "./crypto-utils"; import { MatrixError } from '../../../src/http-api'; import { logger } from '../../../src/logger'; diff --git a/spec/unit/event-timeline.spec.js b/spec/unit/event-timeline.spec.js index f537f39eb..c9311d0e3 100644 --- a/spec/unit/event-timeline.spec.js +++ b/spec/unit/event-timeline.spec.js @@ -1,4 +1,4 @@ -import * as utils from "../test-utils"; +import * as utils from "../test-utils/test-utils"; import { EventTimeline } from "../../src/models/event-timeline"; import { RoomState } from "../../src/models/room-state"; diff --git a/spec/unit/filter-component.spec.ts b/spec/unit/filter-component.spec.ts index 996baf86a..6773556e4 100644 --- a/spec/unit/filter-component.spec.ts +++ b/spec/unit/filter-component.spec.ts @@ -2,7 +2,7 @@ import { RelationType, } from "../../src"; import { FilterComponent } from "../../src/filter-component"; -import { mkEvent } from '../test-utils'; +import { mkEvent } from '../test-utils/test-utils'; describe("Filter Component", function() { describe("types", function() { diff --git a/spec/unit/matrix-client.spec.ts b/spec/unit/matrix-client.spec.ts index 8aa98764a..3f19af975 100644 --- a/spec/unit/matrix-client.spec.ts +++ b/spec/unit/matrix-client.spec.ts @@ -13,7 +13,7 @@ import { import { MEGOLM_ALGORITHM } from "../../src/crypto/olmlib"; import { EventStatus, MatrixEvent } from "../../src/models/event"; import { Preset } from "../../src/@types/partials"; -import * as testUtils from "../test-utils"; +import * as testUtils from "../test-utils/test-utils"; jest.useFakeTimers(); diff --git a/spec/unit/pushprocessor.spec.js b/spec/unit/pushprocessor.spec.js index 68480f5c7..85fadcf78 100644 --- a/spec/unit/pushprocessor.spec.js +++ b/spec/unit/pushprocessor.spec.js @@ -1,4 +1,4 @@ -import * as utils from "../test-utils"; +import * as utils from "../test-utils/test-utils"; import { PushProcessor } from "../../src/pushprocessor"; describe('NotificationService', function() { diff --git a/spec/unit/room-member.spec.js b/spec/unit/room-member.spec.js index 7449c6a04..89e98692e 100644 --- a/spec/unit/room-member.spec.js +++ b/spec/unit/room-member.spec.js @@ -1,4 +1,4 @@ -import * as utils from "../test-utils"; +import * as utils from "../test-utils/test-utils"; import { RoomMember } from "../../src/models/room-member"; describe("RoomMember", function() { diff --git a/spec/unit/room-state.spec.js b/spec/unit/room-state.spec.js index 3abc3b28a..109aecae4 100644 --- a/spec/unit/room-state.spec.js +++ b/spec/unit/room-state.spec.js @@ -1,4 +1,4 @@ -import * as utils from "../test-utils"; +import * as utils from "../test-utils/test-utils"; import { RoomState } from "../../src/models/room-state"; describe("RoomState", function() { diff --git a/spec/unit/room.spec.ts b/spec/unit/room.spec.ts index 68b17becc..dbb5f33d5 100644 --- a/spec/unit/room.spec.ts +++ b/spec/unit/room.spec.ts @@ -19,7 +19,7 @@ limitations under the License. * @module client */ -import * as utils from "../test-utils"; +import * as utils from "../test-utils/test-utils"; import { DuplicateStrategy, EventStatus, MatrixEvent, PendingEventOrdering, RoomEvent } from "../../src"; import { EventTimeline } from "../../src/models/event-timeline"; import { Room } from "../../src/models/room"; diff --git a/spec/unit/scheduler.spec.js b/spec/unit/scheduler.spec.js index daa752ac8..eb54fd5a6 100644 --- a/spec/unit/scheduler.spec.js +++ b/spec/unit/scheduler.spec.js @@ -4,7 +4,7 @@ import { defer } from '../../src/utils'; import { MatrixError } from "../../src/http-api"; import { MatrixScheduler } from "../../src/scheduler"; -import * as utils from "../test-utils"; +import * as utils from "../test-utils/test-utils"; jest.useFakeTimers(); diff --git a/spec/unit/timeline-window.spec.js b/spec/unit/timeline-window.spec.js index 2a8be36d6..c9466412c 100644 --- a/spec/unit/timeline-window.spec.js +++ b/spec/unit/timeline-window.spec.js @@ -1,6 +1,6 @@ import { EventTimeline } from "../../src/models/event-timeline"; import { TimelineIndex, TimelineWindow } from "../../src/timeline-window"; -import * as utils from "../test-utils"; +import * as utils from "../test-utils/test-utils"; const ROOM_ID = "roomId"; const USER_ID = "userId"; diff --git a/spec/unit/user.spec.js b/spec/unit/user.spec.js index caf83db87..babe6e4d7 100644 --- a/spec/unit/user.spec.js +++ b/spec/unit/user.spec.js @@ -1,5 +1,5 @@ import { User } from "../../src/models/user"; -import * as utils from "../test-utils"; +import * as utils from "../test-utils/test-utils"; describe("User", function() { const userId = "@alice:bar";