X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7776b799eed223b9318443c1e319e01957a8fb45..3332d2f522adba7f57590f95eef88f68e90ff82c:/cypress/integration/login.spec.js

diff --git a/cypress/integration/login.spec.js b/cypress/integration/login.spec.js
index 25c8cd4b8a..2c539e4902 100644
--- a/cypress/integration/login.spec.js
+++ b/cypress/integration/login.spec.js
@@ -28,7 +28,7 @@ describe('Login tests', function() {
                 inactiveUser = this.inactiveUser;
             }
         );
-        randomUser.username = `randomuser${Math.floor(Math.random() * Math.floor(999999))}`;
+        randomUser.username = `randomuser${Math.floor(Math.random() * 999999)}`;
         randomUser.password = {
             crypt: 'zpAReoZzPnwmQ',
             clear: 'topsecret',
@@ -79,22 +79,34 @@ describe('Login tests', function() {
     })
 
     it('logs out when token no longer valid', function() {
+        cy.createProject({
+            owningUser: activeUser,
+            projectName: `Test Project ${Math.floor(Math.random() * 999999)}`,
+            addToFavorites: false
+        }).as('testProject1');
         // Log in
         cy.visit(`/token/?api_token=${activeUser.token}`);
         cy.url().should('contain', '/projects/');
         cy.get('div#root').should('contain', 'Arvados Workbench (zzzzz)');
         cy.get('div#root').should('not.contain', 'Your account is inactive');
+        cy.waitForDom();
+
         // Invalidate own token.
         const tokenUuid = activeUser.token.split('/')[1];
         cy.doRequest('PUT', `/arvados/v1/api_client_authorizations/${tokenUuid}`, {
             id: tokenUuid,
             api_client_authorization: JSON.stringify({
-                api_token: `randomToken${Math.floor(Math.random() * Math.floor(999999))}`
+                api_token: `randomToken${Math.floor(Math.random() * 999999)}`
             })
         }, null, activeUser.token, true);
         // Should log the user out.
-        cy.visit('/');
-        cy.get('div#root').should('contain', 'Please log in');
+
+        cy.getAll('@testProject1').then(([testProject1]) => {
+            cy.get('main').contains(testProject1.name).click();
+            cy.get('div#root').should('contain', 'Please log in');
+            // Should retain last visited url when auth is invalidated
+            cy.url().should('contain', `/projects/${testProject1.uuid}`);
+        })
     })
 
     it('logs in successfully with valid admin token', function() {
@@ -131,4 +143,4 @@ describe('Login tests', function() {
         cy.get('button[title="Account Management"]').click();
         cy.get('ul[role=menu] > li[role=menuitem]').contains(randomUser.username);
     })
-})
\ No newline at end of file
+})