fixing flaky steps

Author: etmurasaki

web/cypress/e2e/coo/01.coo_ivt.cy.ts

@@ -25,10 +25,9 @@ describe('IVT: Monitoring UIPlugin + Virtualization', { tags: ['@smoke', '@coo']
   it('1. Virtualization perspective - Observe Menu', () => {
     cy.log('Virtualization perspective - Observe Menu and verify all submenus');
     cy.switchPerspective('Virtualization');
-    cy.byAriaLabel('Welcome modal').should('be.visible');
     guidedTour.closeKubevirtTour();
     troubleshootingPanelPage.signalCorrelationShouldNotBeVisible();
-    cy.switchPerspective('Administrator');
+    cy.switchPerspective('Core platform', 'Administrator');
 
   });
 

web/cypress/support/commands/auth-commands.ts

@@ -7,7 +7,7 @@ export {};
 declare global {
   namespace Cypress {
     interface Chainable {
-      switchPerspective(perspective: string);
+      switchPerspective(...perspectives: string[]);
       uiLogin(provider: string, username: string, password: string, oauthurl?: string);
       uiLogout();
       cliLogin(username?, password?, hostapi?);
@@ -119,7 +119,7 @@ declare global {
     cy.validateLogin();
   });
 
-  Cypress.Commands.add('switchPerspective', (perspective: string) => {
+  Cypress.Commands.add('switchPerspective', (...perspectives: string[]) => {
     /* If side bar is collapsed then expand it
     before switching perspecting */
     cy.wait(2000);
@@ -128,8 +128,9 @@ declare global {
         cy.get('#nav-toggle').click();
       }
     });
-    nav.sidenav.switcher.changePerspectiveTo(perspective);
-    cy.validateLogin();
+    nav.sidenav.switcher.changePerspectiveTo(...perspectives);
+    cy.wait(3000);
+    guidedTour.close();
   });
 
   // To avoid influence from upstream login change

web/cypress/support/commands/utility-commands.ts

@@ -116,7 +116,7 @@ Cypress.Commands.add('waitUntilWithCustomTimeout', (
 
   Cypress.Commands.add('podImage', (pod: string, namespace: string) => {
     cy.log('Get pod image');
-    cy.switchPerspective('Core platform');
+    cy.switchPerspective('Core platform', 'Administrator');
     cy.wait(5000);
     cy.clickNavLink(['Workloads', 'Pods']);
     cy.changeNamespace(namespace);

web/cypress/support/commands/virtualization-commands.ts

@@ -218,8 +218,7 @@ const virtualizationUtils = {
           validate() {
             cy.validateLogin();
             // Additional validation for Virtualization setup
-            cy.visit('/k8s/all-namespaces/virtualization-overview');
-            cy.url().should('include', '/k8s/all-namespaces/virtualization-overview');
+            cy.switchPerspective('Virtualization');
             guidedTour.closeKubevirtTour();
 
           },

web/cypress/views/nav.ts

@@ -6,16 +6,25 @@ export const nav = {
       cy.clickNavLink(path);
     },
     switcher: {
-      changePerspectiveTo: (perspective: string) => {
+      changePerspectiveTo: (...perspectives: string[]) => {
         cy.get('body').then((body) => {
-          if (body.find('#perspective-switcher-toggle').length > 0) {
-            cy.log('Switch perspective - ' + `${perspective}`);
-            cy.byLegacyTestID('perspective-switcher-toggle').scrollIntoView().should('be.visible').click({force: true});
-            cy.byLegacyTestID('perspective-switcher-menu-option').contains(perspective).should('be.visible');
-            cy.byLegacyTestID('perspective-switcher-menu-option').contains(perspective).should('be.visible').click({force: true});
+          if (body.find('button[data-test-id="perspective-switcher-toggle"]:visible').length > 0) {
+            cy.byLegacyTestID('perspective-switcher-toggle').scrollIntoView().click({ force: true });
+
+            cy.get('[data-test-id="perspective-switcher-menu-option"]').then(($options) => {
+              const foundPerspective = perspectives.find(p => $options.text().includes(p));
+              if (foundPerspective) {
+                cy.byLegacyTestID('perspective-switcher-menu-option')
+                  .contains(foundPerspective)
+                  .click({ force: true });
+              } else {
+                cy.log('No matching perspective found');
+                cy.get('body').type('{esc}');
+              }
+            });
+
           }
         });
-
       },
       shouldHaveText: (perspective: string) => {
         cy.log('Should have text - ' + `${perspective}`);

web/cypress/views/silences-list-page.ts

@@ -88,6 +88,7 @@ export const silencesListPage = {
 
     clickAlertKebab: () => {
       cy.log('silencesListPage.rows.clickAlertKebab');
+      cy.wait(2000);
       cy.byTestID(DataTestIDs.KebabDropdownButton).should('be.visible').click();
     },