Multiple changes

- flaky main fixes
  - expand fake-cluster intercepts and make use of them
  - improve accessing of cluster `Edit Config` action
- other
  - move action menu stuff from sortable table to action menu po
  - refactor edit fake cluster test to use common code

Author: richard-cox

cypress/e2e/blueprints/nav/fake-cluster.ts

@@ -2528,7 +2528,7 @@ export function generateFakeClusterDataAndIntercepts({
   cy.intercept({
     method:   'GET',
     pathname: '/v1/provisioning.cattle.io.clusters',
-    query:    { pagesize: '*' }
+    query:    { pagesize: '100000' }
   }, (req) => {
     req.continue((res) => {
       const localIndex = res.body.data.findIndex((item: any) => item.id.includes('/local'));
@@ -2552,25 +2552,40 @@ export function generateFakeClusterDataAndIntercepts({
     });
   }).as('provCluster');
 
+  const update = (clusters: any[]) => {
+    const localIndex = clusters.findIndex((item: any) => item.id.includes('local'));
+
+    if (localIndex >= 0) {
+      const localCluster = clusters[localIndex];
+
+      localCluster.spec.description = longClusterDescription;
+    }
+
+    clusters.push(fakeNavClusterData.mgmtClusterObj);
+  };
+
   // add extra cluster to the nav list to test https://github.com/rancher/dashboard/issues/10452
   cy.intercept({
     method:   'GET',
     pathname: '/v1/management.cattle.io.clusters',
-    query:    { pagesize: '*' }
+    query:    { pagesize: '10' }
   }, (req) => {
     req.continue((res) => {
-      const localIndex = res.body.data.findIndex((item: any) => item.id.includes('local'));
-
-      if (localIndex >= 0) {
-        const localCluster = res.body.data[localIndex];
-
-        localCluster.spec.description = longClusterDescription;
-      }
+      update(res.body.data);
+      res.send(res.body);
+    });
+  }).as('mgmtClustersSideNav');
 
-      res.body.data.push(fakeNavClusterData.mgmtClusterObj);
+  cy.intercept({
+    method:   'GET',
+    pathname: '/v1/management.cattle.io.clusters',
+    query:    { pagesize: '100' }
+  }, (req) => {
+    req.continue((res) => {
+      update(res.body.data);
       res.send(res.body);
     });
-  }).as('mgmtClusters');
+  }).as('mgmtClustersLists');
 
   cy.intercept('GET', `/v1/management.cattle.io.clusters/${ fakeNavClusterData.mgmtClusterObj.id }?*`, (req) => {
     req.reply({

cypress/e2e/po/components/action-menu-shell.po.ts

@@ -9,8 +9,24 @@ export default class ActionMenuPo extends ComponentPo {
     return this.self().find('[dropdown-menu-item]').eq(index).click();
   }
 
+  checkNoActionsAvailable(present = true) {
+    if (present) {
+      return this.self().should('contain', 'No actions available');
+    } else {
+      return this.self().should('not.contain', 'No actions available');
+    }
+  }
+
+  atLeastOneActiveMenuItem() {
+    return this.self().find('[dropdown-menu-item]:not([disabled])').should('exist');
+  }
+
   getMenuItem(name: string) {
-    return this.self().get('[dropdown-menu-item]').contains(name);
+    return this.self().contains('[dropdown-menu-item]', name);
+  }
+
+  waitForMenuItem(name: string) {
+    return this.getMenuItem(name).should('be.visible');
   }
 
   menuItemNames() {

cypress/e2e/po/components/loading.po.ts

@@ -1,5 +1,7 @@
 import ComponentPo from '@/cypress/e2e/po/components/component.po';
 
 export default class LoadingPo extends ComponentPo {
-
+  constructor(selector = '.loading-indicator') {
+    super(selector);
+  }
 }

cypress/e2e/po/components/sortable-table.po.ts

@@ -191,7 +191,7 @@ export default class SortableTablePo extends ComponentPo {
 
   rowActionMenu() {
     // Get the visible dropdown menu - this ensures we only interact with a menu that's actually open
-    return new ActionMenuPo(cy.get('[dropdown-menu-collection]:visible'));
+    return new ActionMenuPo('[dropdown-menu-collection]:visible');
   }
 
   noRowsShouldNotExist() {
@@ -244,9 +244,9 @@ export default class SortableTablePo extends ComponentPo {
 
     // Wait for the dropdown to finish loading (not show "No actions available")
     if (!skipNoActionAvailableCheck) {
-      actionMenu.self().should('not.contain', 'No actions available');
+      actionMenu.checkNoActionsAvailable(false);
       // Ensure at least one non-disabled menu item is present
-      actionMenu.self().find('[dropdown-menu-item]:not([disabled])').should('exist');
+      actionMenu.atLeastOneActiveMenuItem();
     }
 
     return actionMenu;

cypress/e2e/po/pages/cluster-manager/cluster-manager-list.po.ts

@@ -112,7 +112,9 @@ export default class ClusterManagerListPagePo extends BaseListPagePo {
   }
 
   editCluster(name: string) {
-    this.sortableTable().rowActionMenuOpen(name).getMenuItem('Edit Config').click();
+    const rowMenu = this.sortableTable().rowActionMenuOpen(name);
+
+    return rowMenu.waitForMenuItem('Edit Config').click();
   }
 
   /**

cypress/e2e/tests/pages/manager/edit-fake-cluster.spec.ts

@@ -1,15 +1,18 @@
 import ClusterManagerListPagePo from '@/cypress/e2e/po/pages/cluster-manager/cluster-manager-list.po';
 import ClusterManagerEditGenericPagePo from '@/cypress/e2e/po/edit/provisioning.cattle.io.cluster/edit/cluster-edit-generic.po';
-import BurgerMenuPo from '@/cypress/e2e/po/side-bars/burger-side-menu.po';
 import HomePagePo from '@/cypress/e2e/po/pages/home.po';
 import { RANCHER_PAGE_EXCEPTIONS, catchTargetPageException } from '@/cypress/support/utils/exception-utils';
 import { CURRENT_RANCHER_VERSION } from '@shell/config/version.js';
-import PagePo from '@/cypress/e2e/po/pages/page.po';
-
 import { generateFakeClusterDataAndIntercepts } from '@/cypress/e2e/blueprints/nav/fake-cluster';
+import LoadingPo from '@/cypress/e2e/po/components/loading.po';
+
 const fakeProvClusterId = 'some-fake-cluster-id';
 const fakeMgmtClusterId = 'some-fake-mgmt-id';
 
+const clusterList = new ClusterManagerListPagePo('_');
+const loadingPo = new LoadingPo();
+const editCluster = new ClusterManagerEditGenericPagePo('_', fakeProvClusterId);
+
 describe('Cluster Edit', { tags: ['@manager', '@adminUser'] }, () => {
   describe('Cluster Edit (Fake DO cluster)', () => {
     beforeEach(() => {
@@ -18,31 +21,25 @@ describe('Cluster Edit', { tags: ['@manager', '@adminUser'] }, () => {
       });
 
       cy.login();
-    });
 
-    it('Clearing a registry auth item on the UI (Cluster Edit Config) should retain its authentication ID', () => {
       HomePagePo.goTo();
-      const burgerMenu = new BurgerMenuPo();
-
-      BurgerMenuPo.toggle();
-      const clusterManagementNavItem = burgerMenu.links().contains(`Cluster Management`);
 
-      clusterManagementNavItem.should('exist');
-      clusterManagementNavItem.click();
-      const clusterList = new ClusterManagerListPagePo('_');
+      cy.wait('@mgmtClustersSideNav');
+      cy.wait('@mgmtClustersLists');
+      cy.wait('@provClusters');
 
+      clusterList.navToMenuEntry('Cluster Management');
       clusterList.waitForPage();
-      cy.intercept({
-        method:   'GET',
-        pathname: '/v1/provisioning.cattle.io.clusters',
-        query:    { pagesize: '100000' }
-      }).as('waitForDropDownInfo'); // Wait for request which will populate the drop down
 
-      cy.wait('@waitForDropDownInfo');
+      cy.wait('@mgmtClustersLists');
+      cy.wait('@provClusters');
+
       clusterList.editCluster(fakeProvClusterId);
 
-      const editCluster = new ClusterManagerEditGenericPagePo('_', fakeProvClusterId);
+      editCluster.waitForPage();
+    });
 
+    it('Clearing a registry auth item on the UI (Cluster Edit Config) should retain its authentication ID', () => {
       editCluster.clickTab('#registry');
       editCluster.registryAuthenticationItems().closeArrayListItem(0);
 
@@ -53,17 +50,10 @@ describe('Cluster Edit', { tags: ['@manager', '@adminUser'] }, () => {
 
     // testing https://github.com/rancher/dashboard/issues/10192
     it('"documentation" link in editing a cluster should open in a new tab', () => {
-      HomePagePo.goTo();
-
       catchTargetPageException(RANCHER_PAGE_EXCEPTIONS);
 
-      const page = new PagePo('');
-      const clusterList = new ClusterManagerListPagePo('_');
-
-      page.navToMenuEntry('Cluster Management');
-      clusterList.waitForPage();
-
-      clusterList.list().actionMenu(fakeProvClusterId).getMenuItem('Edit Config').click();
+      // Don't click until the loading indicator isn't there....
+      loadingPo.checkNotExists();
 
       // since in Cypress we cannot assert directly a link on a new tab
       // next best thing is to assert that the link has _blank