Merge pull request #1675 from alfonsomthd/cypress-testisolation

Cypress: enable Test Isolation

.gitignore

@@ -4,6 +4,7 @@ dist
 .eslintcache
 coverage
 cypress/cypress-a11y-report.json
+cypress/downloads
 gui-test-screenshots
 plugins/**/package.json
 plugins/**/dist

cypress/cypress.config.ts

@@ -1,13 +1,13 @@
 import { defineConfig } from 'cypress';
+import { SECOND } from './consts';
 import * as setupNodeEvents from './plugin.js';
 
 export default defineConfig({
-  defaultCommandTimeout: 30000,
+  defaultCommandTimeout: 30 * SECOND,
   e2e: {
     setupNodeEvents,
     specPattern: 'cypress/tests/**/*.ts',
     supportFile: 'cypress/support.ts',
-    testIsolation: false,
   },
   fixturesFolder: false,
   reporter: 'node_modules/cypress-multi-reporters',

cypress/support.ts

@@ -4,18 +4,26 @@ import {
   STORAGE_SYSTEM_NAME,
   OCS_SC_STATE,
   ODF_OPERATOR_NAME,
+  SECOND,
+  MINUTE,
 } from './consts';
 import './support/selectors';
 import './support/login';
 
-before(() => {
-  // Disable Cypress's default behavior of logging all XMLHttpRequests and fetches.
+const disableIrrelevantLogging = () => {
+  // Disable the default behavior of logging all XMLHttpRequests and fetches.
   cy.intercept({ resourceType: /xhr|fetch/ }, { log: false });
+};
+
+before(() => {
+  disableIrrelevantLogging(); // Required as 'before' actions precede 'beforeEach' actions.
 });
 
 beforeEach(() => {
-  // Disable Cypress's default behavior of logging all XMLHttpRequests and fetches.
-  cy.intercept({ resourceType: /xhr|fetch/ }, { log: false });
+  disableIrrelevantLogging();
+  cy.login();
+  cy.visit('/');
+  cy.install();
 });
 
 declare global {
@@ -49,7 +57,7 @@ Cypress.Commands.add('install', () => {
       cy.byTestID('item-create').click();
 
       // Wait for the StorageSystem page to load.
-      cy.contains('Create StorageSystem', { timeout: 10 * 1000 }).should(
+      cy.contains('Create StorageSystem', { timeout: 15 * SECOND }).should(
         'be.visible'
       );
       cy.get('button').contains('Next').click();
@@ -67,7 +75,7 @@ Cypress.Commands.add('install', () => {
         .as('Create StorageSystem Button');
       cy.get('@Create StorageSystem Button').click();
       // Wait for the storage system to be created.
-      cy.get('@Create StorageSystem Button', { timeout: 10 * 1000 }).should(
+      cy.get('@Create StorageSystem Button', { timeout: 10 * SECOND }).should(
         'not.exist'
       );
 
@@ -76,11 +84,12 @@ Cypress.Commands.add('install', () => {
       cy.byLegacyTestID('horizontal-link-Storage Systems').click();
       cy.byLegacyTestID('item-filter').type(STORAGE_SYSTEM_NAME);
       cy.get('a').contains(STORAGE_SYSTEM_NAME);
-      cy.get('td[id="status"]', { timeout: 5 * 60000 }).contains('Available', {
-        timeout: 5 * 60000,
+      cy.get('td[id="status"]', { timeout: 5 * MINUTE }).contains('Available', {
+        timeout: 5 * MINUTE,
       });
       // Verify that the OCS SC is in READY state.
-      cy.exec(OCS_SC_STATE, { timeout: 25 * 60000 });
+      cy.exec(OCS_SC_STATE, { timeout: 25 * MINUTE });
+      cy.visit('/');
     } else {
       cy.log(
         ' ocs-storagecluster-storagesystem is present, proceeding without installation.'

cypress/support/login.ts

@@ -57,24 +57,3 @@ Cypress.Commands.add(
     );
   }
 );
-
-Cypress.Commands.add('logout', () => {
-  // Check if auth is disabled (for a local development environment).
-  cy.window().then((win: any) => {
-    if (win.SERVER_FLAGS?.authDisabled) {
-      cy.task(
-        'log',
-        '  skipping logout, console is running with auth disabled'
-      );
-      return;
-    }
-    cy.task('log', '  Logging out');
-    cy.byTestID('user-dropdown').click();
-    cy.byTestID('log-out').should('be.visible');
-    cy.byTestID('log-out').click({ force: true }); // eslint-disable-line cypress/no-force
-    // Logout is flaky and fails the CI (in "after" step), even if all other test case ("it" blocks) passes.
-    // Login executes "cy.clearCookie('openshift-session-token')" as a fallback, which will auto logout the user.
-    // Therefore, commenting out the next line from this file as it is not needed.
-    // cy.byLegacyTestID('login').should('be.visible');
-  });
-});

cypress/support/pages/app.ts

@@ -33,7 +33,7 @@ export const projectNameSpace = {
     // cy.testA11y('Create Project modal');
     cy.byTestID('dropdown-text-filter').clear();
     cy.byTestID('dropdown-text-filter').should('be.empty');
-    cy.byTestID('dropdown-text-filter').type(projectName);
+    cy.byTestID('dropdown-text-filter').type(projectName, { delay: 0 });
     cy.byTestID('dropdown-text-filter').should('have.value', projectName);
     cy.get('[data-test-id="namespace-bar-dropdown"] span')
       .first()

cypress/tests/active-health-checks.spec.ts

@@ -51,21 +51,11 @@ const isStorageClusterHealthy = () => {
 };
 
 describe('Test Popover behaviour for different active health check cases.', () => {
-  before(() => {
-    cy.login();
-    cy.visit('/');
-    cy.install();
+  beforeEach(() => {
     ODFCommon.visitStorageDashboard();
     cy.byLegacyTestID('horizontal-link-Storage Systems').first().click();
     listPage.searchInList(STORAGE_SYSTEM_NAME);
     cy.byTestRows('resource-row').contains(STORAGE_SYSTEM_NAME).click();
-  });
-
-  after(() => {
-    cy.logout();
-  });
-
-  beforeEach(() => {
     isStorageClusterHealthy();
   });
 

cypress/tests/add-capacity.spec.ts

@@ -27,21 +27,7 @@ const ROOK_CONF_PATH =
   '/var/lib/rook/openshift-storage/openshift-storage.config';
 
 describe('OCS Operator Expansion of Storage Class Test', () => {
-  before(() => {
-    cy.login();
-    cy.visit('/');
-    cy.install();
-  });
-
-  beforeEach(() => {
-    cy.visit('/');
-  });
-
-  after(() => {
-    cy.logout();
-  });
-
-  it.only('Add additional capacity to Storage Cluster', () => {
+  it('Add additional capacity to Storage Cluster', () => {
     const initialState = {
       storageCluster: null,
       cephCluster: null,

cypress/tests/bucket-class.spec.ts

@@ -23,9 +23,6 @@ describe('Tests creation of Standard Bucket Class', () => {
     BucketClassType.STANDARD
   );
   before(() => {
-    cy.login();
-    cy.visit('/');
-    cy.install();
     config.setup();
   });
 
@@ -40,7 +37,6 @@ describe('Tests creation of Standard Bucket Class', () => {
 
   after(() => {
     config.cleanup();
-    cy.logout();
   });
 
   it('Create a 1 Tier(Spread) Bucket Class', () => {
@@ -70,9 +66,6 @@ describe('Tests creation of Namespace Bucket Class', () => {
     BucketClassType.NAMESPACE
   );
   before(() => {
-    cy.login();
-    cy.visit('/');
-    cy.install();
     config.setup();
   });
 
@@ -87,7 +80,6 @@ describe('Tests creation of Namespace Bucket Class', () => {
 
   after(() => {
     config.cleanup();
-    cy.logout();
   });
 
   it('Create a Single Namespace Bucket Class', () => {
@@ -109,12 +101,6 @@ describe('Tests creation of Namespace Bucket Class', () => {
 describe('Tests form validations on Bucket Class', () => {
   const nameFieldTestId: string = 'bucket-class-name';
 
-  before(() => {
-    cy.login();
-    cy.visit('/');
-    cy.install();
-  });
-
   beforeEach(() => {
     visitBucketClassPage();
   });

cypress/tests/create-backing-store.spec.ts

@@ -9,16 +9,6 @@ import {
 } from '../views/store';
 
 describe('Tests creation of Backing Stores', () => {
-  before(() => {
-    cy.login();
-    cy.visit('/');
-    cy.install();
-  });
-
-  after(() => {
-    cy.logout();
-  });
-
   afterEach(() => {
     cy.exec(`oc delete backingstore test-bucket -n openshift-storage`);
   });
@@ -39,12 +29,6 @@ describe('Tests creation of Backing Stores', () => {
 describe('Tests form validations on Backing Stores', () => {
   const nameFieldTestId: string = `${StoreType.BackingStore}-name`;
 
-  before(() => {
-    cy.login();
-    cy.visit('/');
-    cy.install();
-  });
-
   beforeEach(() => {
     commonFlows.navigateToObjectStorage();
     cy.byTestID('horizontal-link-Backing Store').first().click();

cypress/tests/expand-pvc.spec.ts

@@ -1,16 +1,6 @@
 import { pvc } from '../views/pvc';
 
 describe('Tests Expansion of a PVC', () => {
-  before(() => {
-    cy.login();
-    cy.visit('/');
-    cy.install();
-  });
-
-  after(() => {
-    cy.logout();
-  });
-
   beforeEach(() => {
     cy.clickNavLink(['Storage', 'PersistentVolumeClaims']);
   });

cypress/tests/kms-encryption-sc.spec.ts

@@ -15,9 +15,6 @@ describe('Test Ceph pool creation', () => {
 
   before(() => {
     configureVault();
-    cy.login();
-    cy.visit('/');
-    cy.install();
   });
 
   after(() => {

cypress/tests/list-page.spec.ts

@@ -13,15 +13,6 @@ const checkKebabMenuItem = (itemText: string) => {
 };
 
 describe('Tests storage system list page', () => {
-  before(() => {
-    cy.login();
-    cy.visit('/');
-    cy.install();
-  });
-  after(() => {
-    cy.logout();
-  });
-
   beforeEach(() => {
     ODFCommon.visitStorageDashboard();
   });

cypress/tests/multiple-storageclass-selection.spec.ts

@@ -24,9 +24,6 @@ describe('Add capacity using multiple storage classes', () => {
   };
 
   before(() => {
-    cy.login();
-    cy.visit('/');
-    cy.install();
     cy.exec(`echo '${JSON.stringify(testEbsSC)}' | kubectl apply -f -`);
     cy.exec(
       `echo '${JSON.stringify(testNoProvisionerSC)}' | kubectl apply -f -`
@@ -43,11 +40,11 @@ describe('Add capacity using multiple storage classes', () => {
         );
       });
     });
-    cy.clickNavLink(['Storage', 'Data Foundation']);
-    cy.byLegacyTestID('horizontal-link-Storage Systems').click();
   });
 
   beforeEach(() => {
+    cy.clickNavLink(['Storage', 'Data Foundation']);
+    cy.byLegacyTestID('horizontal-link-Storage Systems').click();
     fetchStorageClusterJson().then((res) => {
       const json: K8sResourceKind = JSON.parse(res.stdout);
       beforeCapacityAddition.deviceSets = json.spec.storageDeviceSets;
@@ -72,7 +69,6 @@ describe('Add capacity using multiple storage classes', () => {
         );
       });
     });
-    cy.logout();
   });
 
   it('Add capacity with a new storage class having EBS as provisioner', () => {

cypress/tests/namespace-store.spec.ts

@@ -10,16 +10,6 @@ import {
 } from '../views/store';
 
 describe('Tests creation of Namespace Stores', () => {
-  before(() => {
-    cy.login();
-    cy.visit('/');
-    cy.install();
-  });
-
-  after(() => {
-    cy.logout();
-  });
-
   afterEach(() => {
     cy.byTestID('kebab-button').click();
     cy.log('Deleting namespace store');
@@ -72,14 +62,7 @@ describe('Tests creation of Namespace Stores', () => {
 describe('Tests form validations on Namespace Stores', () => {
   const nameFieldTestId: string = `${StoreType.NamespaceStore}-name`;
 
-  before(() => {
-    cy.login();
-    cy.visit('/');
-    cy.install();
-  });
-
   beforeEach(() => {
-    cy.visit('/');
     commonFlows.navigateToObjectStorage();
     cy.byTestID('horizontal-link-Namespace Store').first().click();
     cy.byTestID('item-create').click();