Re-arrange folder structure for tests, put unit and e2e under root test folder

36 files changed, 34 insertions, 35 deletions

diff --git a/.gitignore b/.gitignore
index 5c3d49528b..170e4589b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,8 +6,8 @@
 /gui/scripts/ne_50m_admin_1_states_provinces_lines/
 /gui/scripts/out/
 /gui/src/main/management_interface/
-/gui/e2e/screenshots/
-/gui/e2e/test-results/
+/gui/test/e2e/screenshots/
+/gui/test-results/
 /build/
 /dist
 .idea/
diff --git a/gui/package.json b/gui/package.json
index a42b51216e..6549c24085 100644
--- a/gui/package.json
+++ b/gui/package.json
@@ -100,7 +100,7 @@
     "e2e:no-build": "xvfb-maybe -- playwright test",
     "e2e:update-snapshots": "npm run e2e:no-build -- --update-snapshots",
     "develop": "gulp develop",
-    "test": "cross-env NODE_ENV=test electron-mocha --renderer --reporter spec --require ts-node/register --require \"test/setup/renderer.ts\" \"test/**/*.{ts,tsx}\"",
+    "test": "cross-env NODE_ENV=test electron-mocha --renderer --reporter spec --require ts-node/register --require \"test/unit/setup/renderer.ts\" \"test/unit/**/*.{ts,tsx}\"",
     "update-translations": "node scripts/extract-translations",
     "pack:mac": "gulp pack-mac",
     "pack:win": "gulp pack-win",
diff --git a/gui/playwright.config.ts b/gui/playwright.config.ts
index 013f34b202..025675c831 100644
--- a/gui/playwright.config.ts
+++ b/gui/playwright.config.ts
@@ -1,6 +1,6 @@
 import { PlaywrightTestConfig } from '@playwright/test';
 const config: PlaywrightTestConfig = {
-  testDir: './e2e',
+  testDir: './test/e2e',
   maxFailures: 2,
   timeout: 60000,
   expect: {
diff --git a/gui/tasks/distribution.js b/gui/tasks/distribution.js
index d3cc4549fe..d7e901d2f0 100644
--- a/gui/tasks/distribution.js
+++ b/gui/tasks/distribution.js
@@ -50,7 +50,7 @@ const config = {
     'build/src/renderer/bundle.js',
     'build/src/renderer/preloadBundle.js',
     '!**/*.tsbuildinfo',
-    '!e2e/',
+    '!test/e2e/',
     '!playwright.config.ts',
     'node_modules/',
     '!node_modules/grpc-tools',
diff --git a/gui/e2e/main.spec.ts b/gui/test/e2e/main.spec.ts
index 85f69f9cf6..85f69f9cf6 100644
--- a/gui/e2e/main.spec.ts
+++ b/gui/test/e2e/main.spec.ts
diff --git a/gui/e2e/settings.spec.ts b/gui/test/e2e/settings.spec.ts
index 6e6aef1d4b..6e6aef1d4b 100644
--- a/gui/e2e/settings.spec.ts
+++ b/gui/test/e2e/settings.spec.ts
diff --git a/gui/e2e/setup/main.ts b/gui/test/e2e/setup/main.ts
index 090cef9695..f65169ee44 100644
--- a/gui/e2e/setup/main.ts
+++ b/gui/test/e2e/setup/main.ts
@@ -1,20 +1,20 @@
 import { app, BrowserWindow } from 'electron';
 import * as path from 'path';
 
-import { getDefaultSettings } from '../../src/main/default-settings';
-import { changeIpcWebContents, IpcMainEventChannel } from '../../src/main/ipc-event-channel';
-import { loadTranslations } from '../../src/main/load-translations';
+import { getDefaultSettings } from '../../../src/main/default-settings';
+import { changeIpcWebContents, IpcMainEventChannel } from '../../../src/main/ipc-event-channel';
+import { loadTranslations } from '../../../src/main/load-translations';
 import {
   DeviceState,
   IAccountData,
   IAppVersionInfo,
   ILocation,
   IRelayList,
-} from '../../src/shared/daemon-rpc-types';
-import { messages, relayLocations } from '../../src/shared/gettext';
-import { IGuiSettingsState } from '../../src/shared/gui-settings-state';
-import { ITranslations, MacOsScrollbarVisibility } from '../../src/shared/ipc-schema';
-import { ICurrentAppVersionInfo } from '../../src/shared/ipc-types';
+} from '../../../src/shared/daemon-rpc-types';
+import { messages, relayLocations } from '../../../src/shared/gettext';
+import { IGuiSettingsState } from '../../../src/shared/gui-settings-state';
+import { ITranslations, MacOsScrollbarVisibility } from '../../../src/shared/ipc-schema';
+import { ICurrentAppVersionInfo } from '../../../src/shared/ipc-types';
 
 const DEBUG = false;
 
@@ -119,7 +119,7 @@ class ApplicationMain {
       show: DEBUG,
       frame: true,
       webPreferences: {
-        preload: path.join(__dirname, '../../src/renderer/preloadBundle.js'),
+        preload: path.join(__dirname, '../../../src/renderer/preloadBundle.js'),
         nodeIntegration: false,
         nodeIntegrationInWorker: false,
         nodeIntegrationInSubFrames: false,
@@ -135,7 +135,7 @@ class ApplicationMain {
     this.registerIpcListeners();
 
     // @ts-ignore
-    const filePath = path.resolve(path.join(__dirname, '../../src/renderer/index.html'));
+    const filePath = path.resolve(path.join(__dirname, '../../../src/renderer/index.html'));
     await window.loadFile(filePath);
 
     if (DEBUG) {
diff --git a/gui/e2e/tunnel-state.spec.ts b/gui/test/e2e/tunnel-state.spec.ts
index 452f0a2265..d139feb196 100644
--- a/gui/e2e/tunnel-state.spec.ts
+++ b/gui/test/e2e/tunnel-state.spec.ts
@@ -1,8 +1,8 @@
 import { expect, test } from '@playwright/test';
 import { Page } from 'playwright';
 
-import { colors } from '../src/config.json';
-import { ILocation, ITunnelEndpoint, TunnelState } from '../src/shared/daemon-rpc-types';
+import { colors } from '../../src/config.json';
+import { ILocation, ITunnelEndpoint, TunnelState } from '../../src/shared/daemon-rpc-types';
 import {
   getBackgroundColor,
   getColor,
diff --git a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-connected-tunnel-state-1-darwin.png b/gui/test/e2e/tunnel-state.spec.ts-snapshots/App-should-show-connected-tunnel-state-1-darwin.png
index 09b7a5604e..09b7a5604e 100644
--- a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-connected-tunnel-state-1-darwin.png
+++ b/gui/test/e2e/tunnel-state.spec.ts-snapshots/App-should-show-connected-tunnel-state-1-darwin.png
diff --git a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-connected-tunnel-state-1-linux.png b/gui/test/e2e/tunnel-state.spec.ts-snapshots/App-should-show-connected-tunnel-state-1-linux.png
index 11709e339c..11709e339c 100644
--- a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-connected-tunnel-state-1-linux.png
+++ b/gui/test/e2e/tunnel-state.spec.ts-snapshots/App-should-show-connected-tunnel-state-1-linux.png
diff --git a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-connected-tunnel-state-1-win32.png b/gui/test/e2e/tunnel-state.spec.ts-snapshots/App-should-show-connected-tunnel-state-1-win32.png
index 0e4898e420..0e4898e420 100644
--- a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-connected-tunnel-state-1-win32.png
+++ b/gui/test/e2e/tunnel-state.spec.ts-snapshots/App-should-show-connected-tunnel-state-1-win32.png
diff --git a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-connecting-tunnel-state-1-darwin.png b/gui/test/e2e/tunnel-state.spec.ts-snapshots/App-should-show-connecting-tunnel-state-1-darwin.png
index cb9a733fe4..cb9a733fe4 100644
--- a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-connecting-tunnel-state-1-darwin.png
+++ b/gui/test/e2e/tunnel-state.spec.ts-snapshots/App-should-show-connecting-tunnel-state-1-darwin.png
diff --git a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-connecting-tunnel-state-1-linux.png b/gui/test/e2e/tunnel-state.spec.ts-snapshots/App-should-show-connecting-tunnel-state-1-linux.png
index c10b10b8b0..c10b10b8b0 100644
--- a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-connecting-tunnel-state-1-linux.png
+++ b/gui/test/e2e/tunnel-state.spec.ts-snapshots/App-should-show-connecting-tunnel-state-1-linux.png
diff --git a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-connecting-tunnel-state-1-win32.png b/gui/test/e2e/tunnel-state.spec.ts-snapshots/App-should-show-connecting-tunnel-state-1-win32.png
index 19c3955b20..19c3955b20 100644
--- a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-connecting-tunnel-state-1-win32.png
+++ b/gui/test/e2e/tunnel-state.spec.ts-snapshots/App-should-show-connecting-tunnel-state-1-win32.png
diff --git a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-disconnected-tunnel-state-1-darwin.png b/gui/test/e2e/tunnel-state.spec.ts-snapshots/App-should-show-disconnected-tunnel-state-1-darwin.png
index b0a6d95aa4..b0a6d95aa4 100644
--- a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-disconnected-tunnel-state-1-darwin.png
+++ b/gui/test/e2e/tunnel-state.spec.ts-snapshots/App-should-show-disconnected-tunnel-state-1-darwin.png
diff --git a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-disconnected-tunnel-state-1-linux.png b/gui/test/e2e/tunnel-state.spec.ts-snapshots/App-should-show-disconnected-tunnel-state-1-linux.png
index e80ffa3e20..e80ffa3e20 100644
--- a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-disconnected-tunnel-state-1-linux.png
+++ b/gui/test/e2e/tunnel-state.spec.ts-snapshots/App-should-show-disconnected-tunnel-state-1-linux.png
diff --git a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-disconnecting-tunnel-state-1-darwin.png b/gui/test/e2e/tunnel-state.spec.ts-snapshots/App-should-show-disconnecting-tunnel-state-1-darwin.png
index b0a2ebd893..b0a2ebd893 100644
--- a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-disconnecting-tunnel-state-1-darwin.png
+++ b/gui/test/e2e/tunnel-state.spec.ts-snapshots/App-should-show-disconnecting-tunnel-state-1-darwin.png
diff --git a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-disconnecting-tunnel-state-1-linux.png b/gui/test/e2e/tunnel-state.spec.ts-snapshots/App-should-show-disconnecting-tunnel-state-1-linux.png
index 148a07054b..148a07054b 100644
--- a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-disconnecting-tunnel-state-1-linux.png
+++ b/gui/test/e2e/tunnel-state.spec.ts-snapshots/App-should-show-disconnecting-tunnel-state-1-linux.png
diff --git a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-disconnecting-tunnel-state-1-win32.png b/gui/test/e2e/tunnel-state.spec.ts-snapshots/App-should-show-disconnecting-tunnel-state-1-win32.png
index fcbc4ab9db..fcbc4ab9db 100644
--- a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-disconnecting-tunnel-state-1-win32.png
+++ b/gui/test/e2e/tunnel-state.spec.ts-snapshots/App-should-show-disconnecting-tunnel-state-1-win32.png
diff --git a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-error-tunnel-state-1-darwin.png b/gui/test/e2e/tunnel-state.spec.ts-snapshots/App-should-show-error-tunnel-state-1-darwin.png
index f669e7dd2a..f669e7dd2a 100644
--- a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-error-tunnel-state-1-darwin.png
+++ b/gui/test/e2e/tunnel-state.spec.ts-snapshots/App-should-show-error-tunnel-state-1-darwin.png
diff --git a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-error-tunnel-state-1-linux.png b/gui/test/e2e/tunnel-state.spec.ts-snapshots/App-should-show-error-tunnel-state-1-linux.png
index 1404c54e3a..1404c54e3a 100644
--- a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-error-tunnel-state-1-linux.png
+++ b/gui/test/e2e/tunnel-state.spec.ts-snapshots/App-should-show-error-tunnel-state-1-linux.png
diff --git a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-error-tunnel-state-1-win32.png b/gui/test/e2e/tunnel-state.spec.ts-snapshots/App-should-show-error-tunnel-state-1-win32.png
index f35b19c32f..f35b19c32f 100644
--- a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-error-tunnel-state-1-win32.png
+++ b/gui/test/e2e/tunnel-state.spec.ts-snapshots/App-should-show-error-tunnel-state-1-win32.png
diff --git a/gui/e2e/utils.ts b/gui/test/e2e/utils.ts
index e3fd856caf..165d6b76de 100644
--- a/gui/e2e/utils.ts
+++ b/gui/test/e2e/utils.ts
@@ -12,7 +12,7 @@ const startApp = async (): Promise<StartAppResponse> => {
   process.env.CI = 'e2e';
 
   electronApp = await electron.launch({
-    args: ['build/e2e/setup/main.js'],
+    args: ['build/test/e2e/setup/main.js'],
   });
 
   const appWindow = await electronApp.firstWindow();
diff --git a/gui/test/account-data-cache.spec.ts b/gui/test/unit/account-data-cache.spec.ts
index 6ed10c6908..68595b5586 100644
--- a/gui/test/account-data-cache.spec.ts
+++ b/gui/test/unit/account-data-cache.spec.ts
@@ -1,5 +1,5 @@
-import AccountDataCache from '../src/main/account-data-cache';
-import { IAccountData } from '../src/shared/daemon-rpc-types';
+import AccountDataCache from '../../src/main/account-data-cache';
+import { IAccountData } from '../../src/shared/daemon-rpc-types';
 import sinon from 'sinon';
 import { expect, spy } from 'chai';
 
diff --git a/gui/test/auth-failure.spec.ts b/gui/test/unit/auth-failure.spec.ts
index 9f0072c499..61aa3bce61 100644
--- a/gui/test/auth-failure.spec.ts
+++ b/gui/test/unit/auth-failure.spec.ts
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { it, describe } from 'mocha';
-import { parseAuthFailure, AuthFailureKind } from '../src/shared/auth-failure';
+import { parseAuthFailure, AuthFailureKind } from '../../src/shared/auth-failure';
 
 describe('auth_failed parsing', () => {
   it('invalid line parsing works', () => {
diff --git a/gui/test/date-helper.spec.ts b/gui/test/unit/date-helper.spec.ts
index 5ae9c5d496..f86112a9a7 100644
--- a/gui/test/date-helper.spec.ts
+++ b/gui/test/unit/date-helper.spec.ts
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { it, describe } from 'mocha';
-import * as date from '../src/shared/date-helper';
+import * as date from '../../src/shared/date-helper';
 
 describe('Date helper', () => {
   it('should modify minutes', () => {
diff --git a/gui/test/history.spec.ts b/gui/test/unit/history.spec.ts
index 74f9ea2974..caec918724 100644
--- a/gui/test/history.spec.ts
+++ b/gui/test/unit/history.spec.ts
@@ -1,7 +1,7 @@
 import { expect, spy } from 'chai';
 import { it, describe, beforeEach } from 'mocha';
-import History from '../src/renderer/lib/history';
-import { RoutePath } from '../src/renderer/lib/routes';
+import History from '../../src/renderer/lib/history';
+import { RoutePath } from '../../src/renderer/lib/routes';
 
 const BASE_PATH = RoutePath.launch;
 const FIRST_PATH = RoutePath.main;
diff --git a/gui/test/ip.spec.ts b/gui/test/unit/ip.spec.ts
index 3a86c5891c..10b93bc890 100644
--- a/gui/test/ip.spec.ts
+++ b/gui/test/unit/ip.spec.ts
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { it, describe } from 'mocha';
-import * as ip from '../src/renderer/lib/ip';
+import * as ip from '../../src/renderer/lib/ip';
 
 const validIpv4Addresses = [
   '127.0.0.1',
diff --git a/gui/test/keyframe-animation.spec.ts b/gui/test/unit/keyframe-animation.spec.ts
index e3d6e417b0..59b5c2d6f7 100644
--- a/gui/test/keyframe-animation.spec.ts
+++ b/gui/test/unit/keyframe-animation.spec.ts
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { it, describe } from 'mocha';
-import KeyframeAnimation from '../src/main/keyframe-animation';
+import KeyframeAnimation from '../../src/main/keyframe-animation';
 
 describe('lib/keyframe-animation', function () {
   this.timeout(1000);
diff --git a/gui/test/list-diff.spec.ts b/gui/test/unit/list-diff.spec.ts
index bca3e72d84..9357579072 100644
--- a/gui/test/list-diff.spec.ts
+++ b/gui/test/unit/list-diff.spec.ts
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { it, describe } from 'mocha';
-import { calculateItemList, RowDisplayData } from '../src/renderer/components/List';
+import { calculateItemList, RowDisplayData } from '../../src/renderer/components/List';
 
 const prevItems: Array<RowDisplayData<undefined>> = [
   { key: 'a', data: undefined, removing: false },
diff --git a/gui/test/logging.spec.ts b/gui/test/unit/logging.spec.ts
index 92f1a92e1f..d107a23d3b 100644
--- a/gui/test/logging.spec.ts
+++ b/gui/test/unit/logging.spec.ts
@@ -3,9 +3,9 @@ import fs from 'fs';
 import sinon from 'sinon';
 import { it, describe, before, beforeEach, after } from 'mocha';
 import path from 'path';
-import { Logger } from '../src/shared/logging';
-import { backupLogFile, rotateOrDeleteFile } from '../src/main/logging';
-import { LogLevel } from '../src/shared/logging-types';
+import { Logger } from '../../src/shared/logging';
+import { backupLogFile, rotateOrDeleteFile } from '../../src/main/logging';
+import { LogLevel } from '../../src/shared/logging-types';
 
 const aPath = path.normalize('log-directory/a.log');
 const oldAPath = path.normalize('log-directory/a.old.log');
diff --git a/gui/test/relay-settings-builder.spec.ts b/gui/test/unit/relay-settings-builder.spec.ts
index f669d43d2b..87a3fd5dae 100644
--- a/gui/test/relay-settings-builder.spec.ts
+++ b/gui/test/unit/relay-settings-builder.spec.ts
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { it, describe } from 'mocha';
-import RelaySettingsBuilder from '../src/shared/relay-settings-builder';
+import RelaySettingsBuilder from '../../src/shared/relay-settings-builder';
 
 describe('Relay settings builder', () => {
   it('should set location to any', () => {
diff --git a/gui/test/setup/changelog.spec.ts b/gui/test/unit/setup/changelog.spec.ts
index 249c26e1db..912a8a3397 100644
--- a/gui/test/setup/changelog.spec.ts
+++ b/gui/test/unit/setup/changelog.spec.ts
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { after, it, describe } from 'mocha';
-import { parseChangelog } from '../../src/main/changelog';
+import { parseChangelog } from '../../../src/main/changelog';
 
 // It should be handled the same no matter if the platforms are split with a space or not.
 const changelogItems = [
diff --git a/gui/test/setup/renderer.ts b/gui/test/unit/setup/renderer.ts
index 65644e28d9..65644e28d9 100644
--- a/gui/test/setup/renderer.ts
+++ b/gui/test/unit/setup/renderer.ts
diff --git a/gui/test/tunnel-state.spec.ts b/gui/test/unit/tunnel-state.spec.ts
index 5720acda1d..8db57aea73 100644
--- a/gui/test/tunnel-state.spec.ts
+++ b/gui/test/unit/tunnel-state.spec.ts
@@ -1,8 +1,8 @@
 import { expect, spy } from 'chai';
 import { it, describe } from 'mocha';
 import sinon from 'sinon';
-import TunnelStateHandler from '../src/main/tunnel-state';
-import { TunnelState } from '../src/shared/daemon-rpc-types';
+import TunnelStateHandler from '../../src/main/tunnel-state';
+import { TunnelState } from '../../src/shared/daemon-rpc-types';
 
 const connected: TunnelState = { state: 'connected' } as TunnelState;
 const connecting: TunnelState = { state: 'connecting' } as TunnelState;
diff --git a/gui/tsconfig.json b/gui/tsconfig.json
index bf00a93d7d..8887dcbfe6 100644
--- a/gui/tsconfig.json
+++ b/gui/tsconfig.json
@@ -30,7 +30,6 @@
     "src/**/*.ts",
     "src/**/*.tsx",
     "playwright.config.ts",
-    "e2e/**/*.ts",
     "scripts/**/*.ts",
     "test/**/*.ts",
     "assets/geo/*.json"