Merge pull request ceph#60014 from rhcs-dashboard/cephadm-e2e-endless-fix-1

mgr/dashboard: fix cephadm dashboard e2e and a combobox issue

Reviewed-by: Afreen Misbah <[email protected]>

Author: afreen23

src/pybind/mgr/dashboard/ci/cephadm/run-cephadm-e2e-tests.sh

@@ -38,4 +38,5 @@ cypress_run () {
 
 cd ${CEPH_DEV_FOLDER}/src/pybind/mgr/dashboard/frontend
 
-cypress_run ["cypress/e2e/orchestrator/workflow/*.feature","cypress/e2e/orchestrator/workflow/*-spec.ts","cypress/e2e/orchestrator/grafana/*.feature"]
+cypress_run ["cypress/e2e/orchestrator/workflow/*.feature","cypress/e2e/orchestrator/workflow/*-spec.ts"]
+cypress_run ["cypress/e2e/orchestrator/grafana/*.feature"]

src/pybind/mgr/dashboard/frontend/cypress.config.ts

@@ -1,4 +1,5 @@
 import { defineConfig } from 'cypress';
+import fs from 'fs'
 
 export default defineConfig({
   video: true,
@@ -37,6 +38,21 @@ export default defineConfig({
     // We've imported your old cypress plugins here.
     // You may want to clean this up later by importing these.
     setupNodeEvents(on, config) {
+      on(
+        'after:spec',
+        (_: Cypress.Spec, results: CypressCommandLine.RunResult) => {
+          if (results && results.video) {
+            // Do we have failures for any retry attempts?
+            const failures = results.tests.some((test) =>
+              test.attempts.some((attempt) => attempt.state === 'failed')
+            )
+            if (!failures) {
+              // delete the video if the spec passed and no tests retried
+              fs.unlinkSync(results.video)
+            }
+          }
+        }
+      )
       return require('./cypress/plugins/index.js')(on, config);
     },
     baseUrl: 'https://localhost:4200/',

src/pybind/mgr/dashboard/frontend/cypress/e2e/block/images.e2e-spec.ts

@@ -18,7 +18,7 @@ describe('Images page', () => {
   after(() => {
     // Deletes images test pool
     pools.navigateTo();
-    pools.delete(poolName, null, null, true);
+    pools.delete(poolName, null, null, true, false, false, true);
     pools.navigateTo();
     pools.existTableCell(poolName, false);
   });
@@ -58,7 +58,7 @@ describe('Images page', () => {
     });
 
     it('should delete image', () => {
-      images.delete(newImageName, null, null, true);
+      images.delete(newImageName, null, null, true, false, false, true);
     });
   });
 

src/pybind/mgr/dashboard/frontend/cypress/e2e/block/mirroring.e2e-spec.ts

@@ -112,7 +112,7 @@ describe('Mirroring page', () => {
 
     afterEach(() => {
       pools.navigateTo();
-      pools.delete(poolName, null, null, true);
+      pools.delete(poolName, null, null, true, false, false, true);
     });
   });
 });

src/pybind/mgr/dashboard/frontend/cypress/e2e/cluster/hosts.po.ts

@@ -21,7 +21,7 @@ export class HostsPageHelper extends PageHelper {
 
   add(hostname: string, exist?: boolean, maintenance?: boolean, labels: string[] = []) {
     cy.get(`${this.pages.add.id}`).within(() => {
-      cy.get('#hostname').type(hostname);
+      cy.get('#hostname').type(hostname, { force: true });
       if (maintenance) {
         cy.get('label[for=maintenance]').click();
       }
@@ -35,6 +35,7 @@ export class HostsPageHelper extends PageHelper {
     }
 
     cy.get('cd-submit-button').click();
+    cy.get('cds-modal').should('not.exist');
     // back to host list
     cy.get(`${this.pages.index.id}`);
   }
@@ -64,7 +65,7 @@ export class HostsPageHelper extends PageHelper {
   }
 
   remove(hostname: string) {
-    super.delete(hostname, this.columnIndex.hostname, 'hosts', true, false, true);
+    super.delete(hostname, this.columnIndex.hostname, 'hosts', true, false, true, true);
   }
 
   // Add or remove labels on a host, then verify labels in the table

src/pybind/mgr/dashboard/frontend/cypress/e2e/cluster/logs.e2e-spec.ts

@@ -54,7 +54,7 @@ describe('Logs page', () => {
 
     it('should delete pool and check audit logs reacted', () => {
       pools.navigateTo();
-      pools.delete(poolname, null, null, true);
+      pools.delete(poolname, null, null, true, false, false, true);
       logs.checkAuditForPoolFunction(poolname, 'delete', hour, minute);
     });
   });

src/pybind/mgr/dashboard/frontend/cypress/e2e/cluster/osds.po.ts

@@ -50,9 +50,8 @@ export class OSDsPageHelper extends PageHelper {
 
   @PageHelper.restrictTo(pages.index.url)
   checkStatus(id: number, status: string[]) {
-    this.searchTable(`id:${id}`);
+    this.searchTable(id.toString());
     cy.wait(5 * 1000);
-    this.expectTableCount('found', 1);
     cy.get(`[cdstabledata]:nth-child(${this.columnIndex.status}) .badge`).should(($ele) => {
       const allStatus = $ele.toArray().map((v) => v.innerText);
       for (const s of status) {

src/pybind/mgr/dashboard/frontend/cypress/e2e/common/create-cluster/create-cluster.feature.po.ts

@@ -2,8 +2,8 @@ import { Given, Then } from 'cypress-cucumber-preprocessor/steps';
 
 Given('I am on the {string} section', (page: string) => {
   cy.get('cd-wizard').within(() => {
-    cy.get('.nav-link').should('contain.text', page).first().click();
-    cy.get('.nav-link.active').should('contain.text', page);
+    cy.get('button').should('have.attr', 'title', page).first().click();
+    cy.get('.cds--assistive-text').should('contain.text', 'Current');
   });
 });
 

src/pybind/mgr/dashboard/frontend/cypress/e2e/common/forms-helper.feature.po.ts

@@ -42,16 +42,17 @@ And('select options {string}', (labels: string) => {
 
 And('{string} option {string}', (action: string, labels: string) => {
   if (labels) {
+    cy.get('cds-modal').find('input[id=labels]').click();
     if (action === 'add') {
-      cy.get('cd-modal').find('.select-menu-edit').click();
       for (const label of labels.split(', ')) {
-        cy.get('.popover-body input').type(`${label}{enter}`);
+        cy.get('input[id=labels]').clear().type(`${label}`);
+
+        cy.get('cds-dropdown-list').find('li').should('have.attr', 'title', label).click();
       }
     } else {
       for (const label of labels.split(', ')) {
-        cy.contains('cd-modal .badge', new RegExp(`^${label}$`))
-          .find('.badge-remove')
-          .click();
+        cy.get('input[id=labels]').clear().type(`${label}`);
+        cy.get('cds-dropdown-list').find('li').should('have.attr', 'title', label).click();
       }
     }
   }
@@ -73,6 +74,10 @@ Then('I check the tick box in carbon modal', () => {
   cy.get('cds-modal input#confirmation_input').click({ force: true });
 });
 
+Then('I confirm the resource {string}', (name: string) => {
+  cy.get('cds-modal input#resource_name').type(name);
+});
+
 And('I confirm to {string}', (action: string) => {
   cy.contains('cd-modal button', action).click();
   cy.get('cd-modal').should('not.exist');
@@ -84,7 +89,7 @@ And('I confirm to {string} on carbon modal', (action: string) => {
 });
 
 Then('I should see an error in {string} field', (field: string) => {
-  cy.get('cd-modal').within(() => {
+  cy.get('cds-modal').within(() => {
     cy.get(`input[id=${field}]`).should('have.class', 'ng-invalid');
   });
 });

src/pybind/mgr/dashboard/frontend/cypress/e2e/filesystems/filesystems.e2e-spec.feature

@@ -26,6 +26,6 @@ Feature: CephFS Management
         And I select a row "test_cephfs"
         And I click on "Remove" button from the table actions
         Then I should see the carbon modal
-        And I check the tick box in carbon modal
+        And I confirm the resource "test_cephfs"
         And I click on "Remove File System" button
         Then I should not see a row with "test_cephfs"