diff options
| author | Tobias Järvelöv <tobias.jarvelov@mullvad.net> | 2025-10-06 10:00:55 +0200 |
|---|---|---|
| committer | Tobias Järvelöv <tobias.jarvelov@mullvad.net> | 2025-10-06 10:00:55 +0200 |
| commit | 430e860b6e267f767c06edba0e7a2e4ef793cc4e (patch) | |
| tree | 6a40b6b262722028926fb8977580db906f65f0f1 | |
| parent | 99339a094e07808eb07faa075e104ec639f3de92 (diff) | |
| parent | 51cc7120f4d6d6b6859b69a096bf5cb1d417e025 (diff) | |
| download | mullvadvpn-430e860b6e267f767c06edba0e7a2e4ef793cc4e.tar.xz mullvadvpn-430e860b6e267f767c06edba0e7a2e4ef793cc4e.zip | |
Merge branch 'speed-up-tests'
| -rw-r--r-- | desktop/packages/mullvad-vpn/test/e2e/mocked/mocked-utils.ts | 2 | ||||
| -rw-r--r-- | desktop/packages/mullvad-vpn/test/e2e/setup/main.ts | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/desktop/packages/mullvad-vpn/test/e2e/mocked/mocked-utils.ts b/desktop/packages/mullvad-vpn/test/e2e/mocked/mocked-utils.ts index cec0359a1f..14ee96e925 100644 --- a/desktop/packages/mullvad-vpn/test/e2e/mocked/mocked-utils.ts +++ b/desktop/packages/mullvad-vpn/test/e2e/mocked/mocked-utils.ts @@ -8,7 +8,7 @@ import { startApp, TestUtils } from '../utils'; // This option can be removed in the future when/if we're able to tun the tests with the sandbox // enabled in GitHub actions (frontend.yml). const noSandbox = process.env.NO_SANDBOX === '1'; -const showWindow = process.env.SHOW_WINDOW === '1'; +const showWindow = process.env.TEST_SHOW_WINDOW === '1'; interface StartMockedAppResponse extends Awaited<ReturnType<typeof startApp>> { util: MockedTestUtils; diff --git a/desktop/packages/mullvad-vpn/test/e2e/setup/main.ts b/desktop/packages/mullvad-vpn/test/e2e/setup/main.ts index 37bc6cdb6f..3b99f2043e 100644 --- a/desktop/packages/mullvad-vpn/test/e2e/setup/main.ts +++ b/desktop/packages/mullvad-vpn/test/e2e/setup/main.ts @@ -18,6 +18,8 @@ import { ICurrentAppVersionInfo } from '../../../src/shared/ipc-types'; import { mockData } from '../mock-data'; const DEBUG = false; +const TEST_SHOW_WINDOW = process.env.TEST_SHOW_WINDOW === '1'; +const CI_E2E = process.env.CI === 'e2e'; class ApplicationMain { private guiSettings: IGuiSettingsState = { @@ -97,6 +99,7 @@ class ApplicationMain { show: DEBUG, frame: true, webPreferences: { + offscreen: CI_E2E && !TEST_SHOW_WINDOW, preload: path.join(__dirname, 'preload.js'), nodeIntegration: false, nodeIntegrationInWorker: false, |