From d8dd0d8e5b1a6d373ff2fa870680235be03886d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C5=ABdolfs=20O=C5=A1i=C5=86=C5=A1?= Date: Fri, 6 Jan 2023 14:48:31 +0100 Subject: [PATCH] Fix flaky landingPage visual spec MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes sure that the stubs are always loaded before the app. We assume that previously the load order was not deterministic due to the dynamic import. Signed-off-by: Rūdolfs Ošiņš --- src/global.d.ts | 2 +- src/index.ts | 10 +++++++++- src/lib/e2eTestStubs.ts | 8 -------- 3 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 src/lib/e2eTestStubs.ts diff --git a/src/global.d.ts b/src/global.d.ts index 67d3d6d48..0bf43940d 100644 --- a/src/global.d.ts +++ b/src/global.d.ts @@ -18,7 +18,7 @@ declare global { // src/config.ts APP_CONFIG: Config; // eslint-disable-next-line @typescript-eslint/ban-types - initializeTestStubs: Function; + initializeTestStubs?: Function; e2eTestStubs: { FakeTimers: FakeTimers; }; diff --git a/src/index.ts b/src/index.ts index b61b6cdc7..1970ce564 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,4 +1,12 @@ -if (window.PLAYWRIGHT) import("@app/lib/e2eTestStubs"); +import * as FakeTimers from "@sinonjs/fake-timers"; + +if (window.PLAYWRIGHT && window.initializeTestStubs !== undefined) { + window.e2eTestStubs = { + FakeTimers: FakeTimers, + }; + window.initializeTestStubs(); +} + import App from "@app/App.svelte"; const app = new App({ diff --git a/src/lib/e2eTestStubs.ts b/src/lib/e2eTestStubs.ts deleted file mode 100644 index abc060225..000000000 --- a/src/lib/e2eTestStubs.ts +++ /dev/null @@ -1,8 +0,0 @@ -import * as FakeTimers from "@sinonjs/fake-timers"; - -if (typeof window.initializeTestStubs === "function") { - window.e2eTestStubs = { - FakeTimers: FakeTimers, - }; - window.initializeTestStubs(); -}