From d0a745d5e915e25736e0bb1743ad06d2382ce47d Mon Sep 17 00:00:00 2001
From: Izaac Zavaleta <izaac.zavaleta@suse.com>
Date: Tue, 28 Jul 2026 18:01:29 -0700
Subject: [PATCH] Fix flaky login landing page tests

After login the app fetches user preferences before evaluating the
after-login-route redirect. A transient failure of that fetch (e.g. a
401 while the session token propagates right after login) is silently
swallowed by the app, which then falls back to the home page
terminally, failing the URL assertion.

Reproduced locally by replying 401 to the first GET /v1/userpreferences
after login, which produced the exact CI failure signature.

Wait for the post-login redirect chain to settle, and if it landed on
the home page:
- for the regular landing flow, re-visit the root so a full app
  bootstrap fetches preferences again and re-runs the redirect
- for the auth redirect flow, retry the whole timed-out flow once,
  since authRedirect only lives in the store

Fixes rancher/qa-tasks#2455
Fixes rancher/qa-tasks#2456
---
 .../tests/pages/user-menu/preferences.spec.ts | 40 +++++++++++++++----
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/cypress/e2e/tests/pages/user-menu/preferences.spec.ts b/cypress/e2e/tests/pages/user-menu/preferences.spec.ts
index ccdad524d36..e8424986645 100644
--- a/cypress/e2e/tests/pages/user-menu/preferences.spec.ts
+++ b/cypress/e2e/tests/pages/user-menu/preferences.spec.ts
@@ -8,6 +8,7 @@ import ProductNavPo from '@/cypress/e2e/po/side-bars/product-side-nav.po';
 import { HeaderPo } from '@/cypress/e2e/po/components/header.po';
 import ResourceYamlEditorPagePo from '@/cypress/e2e/po/pages/explorer/yaml-editor.po';
 import { CLUSTER_REPOS_BASE_URL } from '@/cypress/support/utils/api-endpoints';
+import { MEDIUM_TIMEOUT_OPT } from '@/cypress/support/utils/timeouts';
 // import ClusterManagerListPagePo from '@/cypress/e2e/po/pages/cluster-manager/cluster-manager-list.po';
 // import TooltipPo from '@/cypress/e2e/po/components/tooltip.po'; // Used in the below commented test
 
@@ -467,15 +468,30 @@ describe('User can update their preferences', () => {
 
     // Verify that an auth redirect works (a user visits a page while not authorized and will be redirect to that page after loggin in, only active when "Take me to the area I last visited" is selected)
     if (key.index === '1') {
-      userMenu.clickMenuItem('Log Out');
-      cy.url().should('contain', 'auth/login?logged-out');
-
       const redirectUrl = '/c/local/explorer/node';
 
-      cy.visit(redirectUrl);
-      cy.url().should('contain', 'auth/login?timed-out');
-
-      cy.login(undefined, undefined, false, true);
+      const attemptAuthRedirect = () => {
+        userMenu.clickMenuItem('Log Out');
+        cy.url().should('contain', 'auth/login?logged-out');
+
+        cy.visit(redirectUrl);
+        cy.url().should('contain', 'auth/login?timed-out');
+
+        cy.login(undefined, undefined, false, true);
+        cy.url().should('not.contain', 'auth/login');
+      };
+
+      attemptAuthRedirect();
+      // Wait for the redirect chain to settle on either the expected page or the home page.
+      // A transient failure fetching preferences after login lands the user on the home page
+      // instead - retry the flow once to recover (authRedirect only lives in the store, so
+      // the whole timed-out flow needs to run again)
+      cy.location('pathname', MEDIUM_TIMEOUT_OPT).should('match', new RegExp(`(/home|${ redirectUrl })`));
+      cy.location('pathname').then((pathname) => {
+        if (pathname.endsWith('/home')) {
+          attemptAuthRedirect();
+        }
+      });
       cy.url().should('contain', redirectUrl);
       prefPage.goTo();
       prefPage.landingPageRadioBtn().checkVisible();
@@ -485,6 +501,16 @@ describe('User can update their preferences', () => {
     userMenu.clickMenuItem('Log Out');
     cy.url().should('contain', 'auth/login?logged-out');
     cy.login(undefined, undefined, false);
+    // Wait for the redirect chain to settle on either the expected landing page or the home
+    // page. A transient failure fetching preferences after login lands the user on the home
+    // page instead - re-navigating to the root re-runs a full app bootstrap which fetches the
+    // preferences again and re-runs the landing page redirect.
+    cy.location('pathname', MEDIUM_TIMEOUT_OPT).should('match', new RegExp(`(/home|${ key.page })`));
+    cy.location('pathname').then((pathname) => {
+      if (key.page !== '/home' && pathname.endsWith('/home')) {
+        cy.visit('/');
+      }
+    });
     cy.url().should('contain', key.page);
   }