Fix login tests

mullvad · Sep 4, 2023 · 8e0d0df · 8e0d0df
1 parent 1ee8748
commit 8e0d0df
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/gui/src/renderer/app.tsx b/gui/src/renderer/app.tsx
@@ -923,7 +923,10 @@ export default class AppRenderer {
       const prevPath = this.history.location.pathname as RoutePath;
       const nextPath = expired ? RoutePath.expired : RoutePath.timeAdded;
       const transition = this.getNavigationTransition(prevPath, nextPath);
-      this.history.replaceRoot(nextPath, { transition });
+
+      if (!this.loginScheduler.isRunning) {
+        this.history.replaceRoot(nextPath, { transition });
+      }
     }
   }
 

diff --git 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');