Merge pull request ceph#64680 from afreen23/cypress-suppress

mgr/dashboard: cypress tests do not fail on failures 

Reviewed-by: Naman Munet <[email protected]>

Author: afreen23

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

@@ -60,7 +60,7 @@ describe('Mirroring page', () => {
           cy.get('#password').type('admin');
           cy.get('[type=submit]').click();
 
-          cy.get('input[name=name]').clear().type(name);
+          cy.get('[data-testid="pool-name"]').clear().type(name);
           cy.get(`select[name=poolType]`).select('replicated');
           cy.get(`select[name=poolType] option:checked`).contains('replicated');
           cy.get('.float-start.me-2.select-menu-edit').click();

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

@@ -88,7 +88,7 @@ And('I should see row {string} of the expanded row to have a usage bar', (row: s
   cy.get('[data-testid="datatable-row-detail"]').within(() => {
     cy.get('.cds--search-input').first().clear().type(row);
     cy.contains(`[cdstablerow] [cdstabledata]`, row).should('exist');
-    cy.get('[cdstablerow] [cdstabledata] cd-usage-bar .progress').should('exist');
+    cy.get('[cdstablerow] [cdstabledata] cd-usage-bar').should('exist');
   });
 });
 

src/pybind/mgr/dashboard/frontend/cypress/e2e/orchestrator/workflow/09-services.e2e-spec.ts

@@ -98,7 +98,6 @@ describe('Services page', () => {
     cy.get('cd-service-details').within(() => {
       services.checkServiceStatus('snmp-gateway');
     });
-    services.clickServiceTab('snmp-gateway', 'Daemons');
 
     services.deleteService('snmp-gateway');
   });
@@ -112,7 +111,6 @@ describe('Services page', () => {
     cy.get('cd-service-details').within(() => {
       services.checkServiceStatus('snmp-gateway');
     });
-    services.clickServiceTab('snmp-gateway', 'Daemons');
 
     services.deleteService('snmp-gateway');
   });

src/pybind/mgr/dashboard/frontend/cypress/e2e/pools/pools.po.ts

@@ -15,18 +15,18 @@ export class PoolPageHelper extends PageHelper {
 
   @PageHelper.restrictTo(pages.create.url)
   create(name: string, placement_groups: number, apps: string[], mirroring = false) {
-    cy.get('input[name=name]').clear().type(name);
+    cy.get('[data-testid="pool-name"]').clear().type(name);
 
     this.isPowerOf2(placement_groups);
 
     this.selectOption('poolType', 'replicated');
 
     this.expectSelectOption('pgAutoscaleMode', 'on');
     this.selectOption('pgAutoscaleMode', 'off'); // To show pgNum field
-    cy.get('input[name=pgNum]').clear().type(`${placement_groups}`);
+    cy.get('[data-testid="pgNum"]').clear().type(`${placement_groups}`);
     this.setApplications(apps);
     if (mirroring) {
-      cy.get('#rbdMirroring').check({ force: true });
+      cy.get('[data-testid="rbd-mirroring-check"]').check({ force: true });
     }
     cy.get('cd-submit-button').click();
   }
@@ -36,10 +36,10 @@ export class PoolPageHelper extends PageHelper {
     this.navigateEdit(name);
 
     if (mirroring) {
-      cy.get('#rbdMirroring').should('be.checked');
+      cy.get('[data-testid="rbd-mirroring-check"]').should('be.checked');
     }
 
-    cy.get('input[name=pgNum]').clear().type(`${new_pg}`);
+    cy.get('[data-testid="pgNum"]').clear().type(`${new_pg}`);
     cy.get('cd-submit-button').click();
     const str = `${new_pg} active+clean`;
     this.getTableRow(name);

src/pybind/mgr/dashboard/frontend/cypress/support/e2e.ts

@@ -22,5 +22,5 @@ Cypress.on('fail', (err: Error) => {
   if (err.message.includes('xhr') && err.message.includes('canceled')) {
     return false; // Ignore canceled XHR requests
   }
-  return true;
+  throw err;
 });

src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.html

@@ -15,7 +15,8 @@
                  for="name"
                  i18n>Name</label>
           <div class="cd-col-form-input">
-            <input id="name"
+            <input data-testid="pool-name"
+                   id="name"
                    type="text"
                    class="form-control"
                    placeholder="Name..."
@@ -87,6 +88,7 @@
             <div class="cd-col-form-input">
               <input class="form-control"
                      id="pgNum"
+                     data-testid="pgNum"
                      formControlName="pgNum"
                      min="1"
                      type="number"
@@ -201,6 +203,7 @@
             <div class="custom-control custom-checkbox">
               <input class="custom-control-input"
                      id="rbdMirroring"
+                     data-testid="rbd-mirroring-check"
                      type="checkbox"
                      formControlName="rbdMirroring">
               <label class="custom-control-label"