Group tunnel state tests together

1 files changed, 88 insertions, 86 deletions

diff --git a/desktop/packages/mullvad-vpn/test/e2e/installed/state-dependent/tunnel-state.spec.ts b/desktop/packages/mullvad-vpn/test/e2e/installed/state-dependent/tunnel-state.spec.ts
index 44ca808734..dc7008deaf 100644
--- a/desktop/packages/mullvad-vpn/test/e2e/installed/state-dependent/tunnel-state.spec.ts
+++ b/desktop/packages/mullvad-vpn/test/e2e/installed/state-dependent/tunnel-state.spec.ts
@@ -19,114 +19,116 @@ const exec = promisify(execAsync);
 let page: Page;
 let util: TestUtils;
 
-test.beforeAll(async () => {
-  ({ page, util } = await startInstalledApp());
-  await util.waitForRoute(RoutePath.main);
-});
+test.describe('Tunnel state and settings', () => {
+  test.beforeAll(async () => {
+    ({ page, util } = await startInstalledApp());
+    await util.waitForRoute(RoutePath.main);
+  });
 
-test.afterAll(async () => {
-  await page.close();
-});
+  test.afterAll(async () => {
+    await page.close();
+  });
 
-test('App should show disconnected tunnel state', async () => {
-  await expectDisconnected(page);
-});
+  test('App should show disconnected tunnel state', async () => {
+    await expectDisconnected(page);
+  });
 
-test('App should connect', async () => {
-  await page.getByText('Connect', { exact: true }).click();
-  await expectConnected(page);
+  test('App should connect', async () => {
+    await page.getByText('Connect', { exact: true }).click();
+    await expectConnected(page);
 
-  const relay = page.getByTestId('hostname-line');
-  const inIp = page.getByTestId('in-ip');
-  // If IPv6 is enabled, there will be two "Out" IPs, one for IPv4 and one for IPv6
-  // Selecting the first resolves to the IPv4 address regardless of the IP setting
-  const outIp = page.locator(':text("Out") + div > span').first();
+    const relay = page.getByTestId('hostname-line');
+    const inIp = page.getByTestId('in-ip');
+    // If IPv6 is enabled, there will be two "Out" IPs, one for IPv4 and one for IPv6
+    // Selecting the first resolves to the IPv4 address regardless of the IP setting
+    const outIp = page.locator(':text("Out") + div > span').first();
 
-  await expect(relay).toHaveText(process.env.HOSTNAME!);
-  await expect(inIp).not.toBeVisible();
-  await relay.click();
+    await expect(relay).toHaveText(process.env.HOSTNAME!);
+    await expect(inIp).not.toBeVisible();
+    await relay.click();
 
-  await expect(inIp).toBeVisible();
-  expect(await inIp.textContent()).toMatch(new RegExp(`^${process.env.IN_IP!}`));
+    await expect(inIp).toBeVisible();
+    expect(await inIp.textContent()).toMatch(new RegExp(`^${process.env.IN_IP!}`));
 
-  await expect(outIp).toBeVisible();
+    await expect(outIp).toBeVisible();
 
-  const ipResponse = await fetch(`${process.env.CONNECTION_CHECK_URL!}/ip`);
-  const ip = await ipResponse.text();
+    const ipResponse = await fetch(`${process.env.CONNECTION_CHECK_URL!}/ip`);
+    const ip = await ipResponse.text();
 
-  expect(await outIp.textContent()).toBe(ip.trim());
-});
+    expect(await outIp.textContent()).toBe(ip.trim());
+  });
 
-test('App should show correct WireGuard port', async () => {
-  const inData = page.getByTestId('in-ip');
+  test('App should show correct WireGuard port', async () => {
+    const inData = page.getByTestId('in-ip');
 
-  await expect(inData).toContainText(new RegExp(':[0-9]+'));
+    await expect(inData).toContainText(new RegExp(':[0-9]+'));
 
-  await exec('mullvad obfuscation set mode off');
-  await exec('mullvad relay set tunnel wireguard --port=53');
-  await expectConnected(page);
-  await page.getByTestId('connection-panel-chevron').click();
-  await expect(inData).toContainText(new RegExp(':53'));
+    await exec('mullvad obfuscation set mode off');
+    await exec('mullvad relay set tunnel wireguard --port=53');
+    await expectConnected(page);
+    await page.getByTestId('connection-panel-chevron').click();
+    await expect(inData).toContainText(new RegExp(':53'));
 
-  await exec('mullvad relay set tunnel wireguard --port=51820');
-  await expectConnected(page);
-  await page.getByTestId('connection-panel-chevron').click();
-  await expect(inData).toContainText(new RegExp(':51820'));
+    await exec('mullvad relay set tunnel wireguard --port=51820');
+    await expectConnected(page);
+    await page.getByTestId('connection-panel-chevron').click();
+    await expect(inData).toContainText(new RegExp(':51820'));
 
-  await exec('mullvad relay set tunnel wireguard --port=any');
-  await exec('mullvad obfuscation set mode auto');
-});
+    await exec('mullvad relay set tunnel wireguard --port=any');
+    await exec('mullvad obfuscation set mode auto');
+  });
 
-test('App should show correct WireGuard transport protocol', async () => {
-  const inData = page.getByTestId('in-ip');
+  test('App should show correct WireGuard transport protocol', async () => {
+    const inData = page.getByTestId('in-ip');
 
-  await exec('mullvad obfuscation set mode udp2tcp');
-  await expectConnected(page);
-  await page.getByTestId('connection-panel-chevron').click();
-  await expect(inData).toContainText(new RegExp('TCP'));
+    await exec('mullvad obfuscation set mode udp2tcp');
+    await expectConnected(page);
+    await page.getByTestId('connection-panel-chevron').click();
+    await expect(inData).toContainText(new RegExp('TCP'));
 
-  await exec('mullvad obfuscation set mode off');
-  await expectConnected(page);
-  await page.getByTestId('connection-panel-chevron').click();
-  await expect(inData).toContainText(new RegExp('UDP$'));
-});
+    await exec('mullvad obfuscation set mode off');
+    await expectConnected(page);
+    await page.getByTestId('connection-panel-chevron').click();
+    await expect(inData).toContainText(new RegExp('UDP$'));
+  });
 
-test('App should connect with Shadowsocks', async () => {
-  await exec('mullvad obfuscation set mode shadowsocks');
-  await expectConnected(page);
-  await exec('mullvad obfuscation set mode off');
-  await expectConnected(page);
-});
+  test('App should connect with Shadowsocks', async () => {
+    await exec('mullvad obfuscation set mode shadowsocks');
+    await expectConnected(page);
+    await exec('mullvad obfuscation set mode off');
+    await expectConnected(page);
+  });
 
-test('App should enter blocked state', async () => {
-  await exec('mullvad debug block-connection');
-  await expectError(page);
+  test('App should enter blocked state', async () => {
+    await exec('mullvad debug block-connection');
+    await expectError(page);
 
-  await exec(`mullvad relay set location ${process.env.HOSTNAME}`);
-  await expectConnected(page);
-});
+    await exec(`mullvad relay set location ${process.env.HOSTNAME}`);
+    await expectConnected(page);
+  });
 
-test('App should show multihop', async () => {
-  await exec('mullvad relay set tunnel wireguard --use-multihop=on');
-  await expectConnected(page);
-  const relay = page.getByTestId('hostname-line');
-  await expect(relay).toHaveText(
-    new RegExp('^' + escapeRegExp(`${process.env.HOSTNAME} via`), 'i'),
-  );
-  await exec('mullvad relay set tunnel wireguard --use-multihop=off');
-  await page.getByText('Disconnect').click();
-});
+  test('App should show multihop', async () => {
+    await exec('mullvad relay set tunnel wireguard --use-multihop=on');
+    await expectConnected(page);
+    const relay = page.getByTestId('hostname-line');
+    await expect(relay).toHaveText(
+      new RegExp('^' + escapeRegExp(`${process.env.HOSTNAME} via`), 'i'),
+    );
+    await exec('mullvad relay set tunnel wireguard --use-multihop=off');
+    await page.getByText('Disconnect').click();
+  });
 
-test('App should disconnect', async () => {
-  await page.getByText('Disconnect').click();
-  await expectDisconnected(page);
-});
+  test('App should disconnect', async () => {
+    await page.getByText('Disconnect').click();
+    await expectDisconnected(page);
+  });
 
-test('App should become connected when other frontend connects', async () => {
-  await expectDisconnected(page);
-  await exec('mullvad connect');
-  await expectConnected(page);
+  test('App should become connected when other frontend connects', async () => {
+    await expectDisconnected(page);
+    await exec('mullvad connect');
+    await expectConnected(page);
 
-  await exec('mullvad disconnect');
-  await expectDisconnected(page);
+    await exec('mullvad disconnect');
+    await expectDisconnected(page);
+  });
 });