From: Afreen Misbah <afreen23.git@gmail.com>
Date: Fri, 14 Jun 2024 05:21:47 +0000 (+0530)
Subject: mgr/dashboard: fix service page e2e tests
X-Git-Tag: testing/wip-pdonnell-testing-20240622.145006-debug~24^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1da0a4f8cb234ef84729c24cc9a82397361e9534;p=ceph-ci.git

mgr/dashboard: fix service page e2e tests

- service page now uses defaults value for the placement count due to which mds test failing
- in test we pass "1" while "2" which is the default count for mds is already populated, making it 21 and causing unable to create mds service

Fixes: https://tracker.ceph.com/issues/66540
Signed-off-by: Afreen Misbah <afreen23.git@gmail.com>
(cherry picked from commit 5a718229dc43953f140a16342f19523a1c075863)
---

diff --git a/src/pybind/mgr/dashboard/frontend/cypress/e2e/cluster/services.po.ts b/src/pybind/mgr/dashboard/frontend/cypress/e2e/cluster/services.po.ts
index 3db483a16a2..e1a3a002548 100644
--- a/src/pybind/mgr/dashboard/frontend/cypress/e2e/cluster/services.po.ts
+++ b/src/pybind/mgr/dashboard/frontend/cypress/e2e/cluster/services.po.ts
@@ -49,7 +49,9 @@ export class ServicesPageHelper extends PageHelper {
       switch (serviceType) {
         case 'rgw':
           cy.get('#service_id').type('foo');
-          unmanaged ? cy.get('label[for=unmanaged]').click() : cy.get('#count').type(String(count));
+          unmanaged
+            ? cy.get('label[for=unmanaged]').click()
+            : cy.get('#count').clear().type(String(count));
           break;
 
         case 'ingress':
@@ -65,12 +67,16 @@ export class ServicesPageHelper extends PageHelper {
 
         case 'nfs':
           cy.get('#service_id').type('testnfs');
-          unmanaged ? cy.get('label[for=unmanaged]').click() : cy.get('#count').type(String(count));
+          unmanaged
+            ? cy.get('label[for=unmanaged]').click()
+            : cy.get('#count').clear().type(String(count));
           break;
 
         case 'smb':
           cy.get('#service_id').type('testsmb');
-          unmanaged ? cy.get('label[for=unmanaged]').click() : cy.get('#count').type(String(count));
+          unmanaged
+            ? cy.get('label[for=unmanaged]').click()
+            : cy.get('#count').clear().type(String(count));
           cy.get('#cluster_id').type('cluster_foo');
           cy.get('#config_uri').type('rados://.smb/foo/scc.toml');
           break;
@@ -96,7 +102,9 @@ export class ServicesPageHelper extends PageHelper {
 
         default:
           cy.get('#service_id').type('test');
-          unmanaged ? cy.get('label[for=unmanaged]').click() : cy.get('#count').type(String(count));
+          unmanaged
+            ? cy.get('label[for=unmanaged]').click()
+            : cy.get('#count').clear().type(String(count));
           break;
       }
       if (serviceType === 'snmp-gateway') {
diff --git a/src/pybind/mgr/dashboard/frontend/cypress/e2e/pools/pools.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/cypress/e2e/pools/pools.e2e-spec.ts
index 42f9c76d465..47260be41aa 100644
--- a/src/pybind/mgr/dashboard/frontend/cypress/e2e/pools/pools.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/cypress/e2e/pools/pools.e2e-spec.ts
@@ -67,5 +67,5 @@ describe('Pools page', () => {
     it('should delete the pool', () => {
       pools.delete(poolName);
     });
-  })
+  });
 });
diff --git a/src/pybind/mgr/dashboard/frontend/cypress/e2e/pools/pools.po.ts b/src/pybind/mgr/dashboard/frontend/cypress/e2e/pools/pools.po.ts
index 646bf93288b..0701a84a2d9 100644
--- a/src/pybind/mgr/dashboard/frontend/cypress/e2e/pools/pools.po.ts
+++ b/src/pybind/mgr/dashboard/frontend/cypress/e2e/pools/pools.po.ts
@@ -31,7 +31,7 @@ export class PoolPageHelper extends PageHelper {
     cy.get('cd-submit-button').click();
   }
 
-  edit_pool_pg(name: string, new_pg: number, wait = true, mirroring=false) {
+  edit_pool_pg(name: string, new_pg: number, wait = true, mirroring = false) {
     this.isPowerOf2(new_pg);
     this.navigateEdit(name);