Share mock relay list between select location tests and e2e setup

4 files changed, 6 insertions, 101 deletions

diff --git a/desktop/packages/mullvad-vpn/test/e2e/mocked/select-location/mock-data.ts b/desktop/packages/mullvad-vpn/test/e2e/mock-data.ts
index f5fbdc3512..efbac88f83 100644
--- a/desktop/packages/mullvad-vpn/test/e2e/mocked/select-location/mock-data.ts
+++ b/desktop/packages/mullvad-vpn/test/e2e/mock-data.ts
@@ -1,4 +1,4 @@
-import { IRelayList } from '../../../../src/shared/daemon-rpc-types';
+import { IRelayList } from '../../src/shared/daemon-rpc-types';
 
 const relayList: IRelayList = {
   countries: [
diff --git a/desktop/packages/mullvad-vpn/test/e2e/mocked/select-location/helpers.ts b/desktop/packages/mullvad-vpn/test/e2e/mocked/select-location/helpers.ts
index 308bf95ad8..ccfa8289f2 100644
--- a/desktop/packages/mullvad-vpn/test/e2e/mocked/select-location/helpers.ts
+++ b/desktop/packages/mullvad-vpn/test/e2e/mocked/select-location/helpers.ts
@@ -6,9 +6,7 @@ import {
   IRelayListCity,
   IRelayListCountry,
   IRelayListHostname,
-  IRelayListWithEndpointData,
   ISettings,
-  IWireguardEndpointData,
   Ownership,
 } from '../../../../src/shared/daemon-rpc-types';
 import { RoutePath } from '../../../../src/shared/routes';
@@ -171,18 +169,6 @@ export const createHelpers = (page: Page, routes: RoutesObjectModel, utils: Mock
     return settings;
   };
 
-  const updateMockRelays = async (relayList: IRelayList) => {
-    const wireguardEndpointData: IWireguardEndpointData = {
-      portRanges: [],
-      udp2tcpPorts: [],
-    };
-
-    await utils.sendMockIpcResponse<IRelayListWithEndpointData>({
-      channel: 'relays-',
-      response: { relayList, wireguardEndpointData },
-    });
-  };
-
   return {
     areAllCheckboxesChecked,
     expandLocatedRelays,
@@ -195,7 +181,6 @@ export const createHelpers = (page: Page, routes: RoutesObjectModel, utils: Mock
     resetView,
     updateMockRelayFilter,
     updateMockSettings,
-    updateMockRelays,
     updateEntryLocation,
   };
 };
diff --git a/desktop/packages/mullvad-vpn/test/e2e/mocked/select-location/select-location.spec.ts b/desktop/packages/mullvad-vpn/test/e2e/mocked/select-location/select-location.spec.ts
index 38aa4a3b2e..2c0a413522 100644
--- a/desktop/packages/mullvad-vpn/test/e2e/mocked/select-location/select-location.spec.ts
+++ b/desktop/packages/mullvad-vpn/test/e2e/mocked/select-location/select-location.spec.ts
@@ -5,16 +5,17 @@ import { getDefaultSettings } from '../../../../src/main/default-settings';
 import { colorTokens } from '../../../../src/renderer/lib/foundations';
 import { ISettings, ObfuscationType, Ownership } from '../../../../src/shared/daemon-rpc-types';
 import { RoutePath } from '../../../../src/shared/routes';
+import { mockData } from '../../mock-data';
 import { RoutesObjectModel } from '../../route-object-models';
 import { MockedTestUtils, startMockedApp } from '../mocked-utils';
 import { createHelpers, SelectLocationHelpers } from './helpers';
-import { mockData } from './mock-data';
+
+const { relayList } = mockData;
 
 let page: Page;
 let util: MockedTestUtils;
 let routes: RoutesObjectModel;
 let helpers: SelectLocationHelpers;
-const { relayList } = mockData;
 
 test.describe('Select location', () => {
   test.beforeAll(async () => {
@@ -22,8 +23,6 @@ test.describe('Select location', () => {
     routes = new RoutesObjectModel(page, util);
     helpers = createHelpers(page, routes, util);
 
-    await helpers.updateMockRelays(relayList);
-
     await util.waitForRoute(RoutePath.main);
   });
 
diff --git a/desktop/packages/mullvad-vpn/test/e2e/setup/main.ts b/desktop/packages/mullvad-vpn/test/e2e/setup/main.ts
index cb1a6801c7..de46f5e578 100644
--- a/desktop/packages/mullvad-vpn/test/e2e/setup/main.ts
+++ b/desktop/packages/mullvad-vpn/test/e2e/setup/main.ts
@@ -9,13 +9,13 @@ import {
   IAccountData,
   IAppVersionInfo,
   ILocation,
-  IRelayList,
   IWireguardEndpointData,
 } 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';
+import { mockData } from '../mock-data';
 
 const DEBUG = false;
 
@@ -74,85 +74,6 @@ class ApplicationMain {
     mullvadExitIp: false,
   };
 
-  private relayList: IRelayList = {
-    countries: [
-      {
-        name: 'Sweden',
-        code: 'se',
-        cities: [
-          {
-            name: 'Gothenburg',
-            code: 'got',
-            latitude: 58,
-            longitude: 12,
-            relays: [
-              {
-                hostname: 'mullvad-wireguard-1',
-                provider: 'mullvad',
-                ipv4AddrIn: '10.0.0.1',
-                includeInCountry: true,
-                active: true,
-                weight: 0,
-                owned: true,
-                endpointType: 'wireguard',
-                daita: true,
-              },
-              {
-                hostname: 'mullvad-wireguard-23',
-                provider: 'mullvad',
-                ipv4AddrIn: '10.0.0.2',
-                includeInCountry: true,
-                active: true,
-                weight: 0,
-                owned: true,
-                endpointType: 'wireguard',
-                daita: true,
-              },
-              {
-                hostname: 'another-provider-wireguard-1',
-                provider: 'another-provider',
-                ipv4AddrIn: '10.0.0.3',
-                includeInCountry: true,
-                active: true,
-                weight: 0,
-                owned: false,
-                endpointType: 'wireguard',
-                daita: true,
-              },
-              {
-                hostname: 'mullvad-wireguard-quic-1',
-                provider: 'mullvad',
-                ipv4AddrIn: '10.0.0.4',
-                includeInCountry: true,
-                active: true,
-                weight: 0,
-                owned: true,
-                endpointType: 'wireguard',
-                daita: true,
-                quic: {
-                  addrIn: [],
-                  domain: '',
-                  token: '',
-                },
-              },
-              {
-                hostname: 'mullvad-openvpn-1',
-                provider: 'mullvad',
-                ipv4AddrIn: '10.0.0.2',
-                includeInCountry: true,
-                active: true,
-                weight: 0,
-                owned: true,
-                endpointType: 'openvpn',
-                daita: true,
-              },
-            ],
-          },
-        ],
-      },
-    ],
-  };
-
   private wireguardEndpointData: IWireguardEndpointData = {
     portRanges: [],
     udp2tcpPorts: [],
@@ -209,7 +130,7 @@ class ApplicationMain {
       isPerformingPostUpgrade: false,
       deviceState: this.deviceState,
       relayList: {
-        relayList: this.relayList,
+        relayList: mockData.relayList,
         wireguardEndpointData: this.wireguardEndpointData,
       },
       currentVersion: this.currentVersion,