diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2023-09-05 13:41:08 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2023-09-05 13:41:08 +0200 |
| commit | 0f19cb8c6dfd311ed25930107af3255c86620836 (patch) | |
| tree | e17f7072e34c154f993bace09439b399c08f601d | |
| parent | e4be108a972b56381a51443b59312fefef1cbfbe (diff) | |
| parent | d6d208558312cbfcff028f7a3b5b926d9c0bc627 (diff) | |
| download | mullvadvpn-0f19cb8c6dfd311ed25930107af3255c86620836.tar.xz mullvadvpn-0f19cb8c6dfd311ed25930107af3255c86620836.zip | |
Merge branch 'fix-login-tests'
| -rw-r--r-- | gui/src/renderer/app.tsx | 4 | ||||
| -rw-r--r-- | gui/test/e2e/installed/state-dependent/login.spec.ts | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/gui/src/renderer/app.tsx b/gui/src/renderer/app.tsx index 79163af67b..ccb06f33e3 100644 --- a/gui/src/renderer/app.tsx +++ b/gui/src/renderer/app.tsx @@ -910,7 +910,9 @@ export default class AppRenderer { expiry !== undefined && expiry !== previousExpiry && ((state.account.status.expiredState === undefined && expired) || - (state.account.status.expiredState === 'expired' && !expired)) + (state.account.status.expiredState === 'expired' && !expired)) && + // If the login navigation is already scheduled no navigation is needed + !this.loginScheduler.isRunning ) { const prevPath = this.history.location.pathname as RoutePath; const nextPath = expired ? RoutePath.expired : RoutePath.timeAdded; diff --git a/gui/test/e2e/installed/state-dependent/login.spec.ts b/gui/test/e2e/installed/state-dependent/login.spec.ts index 203ad2367f..45444715bb 100644 --- a/gui/test/e2e/installed/state-dependent/login.spec.ts +++ b/gui/test/e2e/installed/state-dependent/login.spec.ts @@ -54,7 +54,7 @@ test('App should create account', async () => { await expect(title).toHaveText('Account created'); await expect(subtitle).toHaveText('Logged in'); - expect(await util.waitForNavigation()).toEqual(RoutePath.main); + expect(await util.waitForNavigation()).toEqual(RoutePath.expired); const outOfTimeTitle = page.getByTestId('title'); await expect(outOfTimeTitle).toHaveText('Congrats!'); @@ -121,7 +121,7 @@ test('App should log in to expired account', async () => { await expect(title).toHaveText('Logged in'); await expect(subtitle).toHaveText('Valid account number'); - expect(await util.waitForNavigation()).toEqual(RoutePath.main); + expect(await util.waitForNavigation()).toEqual(RoutePath.expired); const outOfTimeTitle = page.getByTestId('title'); await expect(outOfTimeTitle).toHaveText('Out of time'); |