From fe8d757e135dc26a22077ab73ba1540ae5eb9ca6 Mon Sep 17 00:00:00 2001 From: Nizamudeen A Date: Thu, 12 Jan 2023 11:24:56 +0530 Subject: [PATCH] mgr/dashboard: cephadm dashboard e2e fixes Fixes: https://tracker.ceph.com/issues/58406 Signed-off-by: Nizamudeen A --- .../workflow/09-services.e2e-spec.ts | 24 ++++++++++++++----- .../workflow/10-nfs-exports.e2e-spec.ts | 2 +- .../cypress/integration/page-helper.po.ts | 2 +- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/pybind/mgr/dashboard/frontend/cypress/integration/orchestrator/workflow/09-services.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/cypress/integration/orchestrator/workflow/09-services.e2e-spec.ts index ba24f7d1c6c..6b497a9a0a1 100644 --- a/src/pybind/mgr/dashboard/frontend/cypress/integration/orchestrator/workflow/09-services.e2e-spec.ts +++ b/src/pybind/mgr/dashboard/frontend/cypress/integration/orchestrator/workflow/09-services.e2e-spec.ts @@ -31,14 +31,18 @@ describe('Services page', () => { services.checkServiceStatus(mdsDaemonName); services.daemonAction('mds', 'stop'); - services.checkServiceStatus(mdsDaemonName, 'stopped'); + cy.get('cd-service-details').within(() => { + services.checkServiceStatus(mdsDaemonName, 'stopped'); + }); }); it('should restart a daemon', () => { services.checkExist(mdsDaemonName, true); services.clickServiceTab(mdsDaemonName, 'Details'); services.daemonAction('mds', 'restart'); - services.checkServiceStatus(mdsDaemonName, 'running'); + cy.get('cd-service-details').within(() => { + services.checkServiceStatus(mdsDaemonName, 'running'); + }); }); it('should redeploy a daemon', () => { @@ -46,9 +50,13 @@ describe('Services page', () => { services.clickServiceTab(mdsDaemonName, 'Details'); services.daemonAction('mds', 'stop'); - services.checkServiceStatus(mdsDaemonName, 'stopped'); + cy.get('cd-service-details').within(() => { + services.checkServiceStatus(mdsDaemonName, 'stopped'); + }); services.daemonAction('mds', 'redeploy'); - services.checkServiceStatus(mdsDaemonName, 'running'); + cy.get('cd-service-details').within(() => { + services.checkServiceStatus(mdsDaemonName, 'running'); + }); }); it('should start a daemon', () => { @@ -56,9 +64,13 @@ describe('Services page', () => { services.clickServiceTab(mdsDaemonName, 'Details'); services.daemonAction('mds', 'stop'); - services.checkServiceStatus(mdsDaemonName, 'stopped'); + cy.get('cd-service-details').within(() => { + services.checkServiceStatus(mdsDaemonName, 'stopped'); + }); services.daemonAction('mds', 'start'); - services.checkServiceStatus(mdsDaemonName, 'running'); + cy.get('cd-service-details').within(() => { + services.checkServiceStatus(mdsDaemonName, 'running'); + }); }); it('should delete an mds service', () => { diff --git a/src/pybind/mgr/dashboard/frontend/cypress/integration/orchestrator/workflow/10-nfs-exports.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/cypress/integration/orchestrator/workflow/10-nfs-exports.e2e-spec.ts index f4b5499f08b..a32d6b5bb99 100644 --- a/src/pybind/mgr/dashboard/frontend/cypress/integration/orchestrator/workflow/10-nfs-exports.e2e-spec.ts +++ b/src/pybind/mgr/dashboard/frontend/cypress/integration/orchestrator/workflow/10-nfs-exports.e2e-spec.ts @@ -36,7 +36,7 @@ describe('nfsExport page', () => { services.addService('nfs'); services.checkExist('nfs.testnfs', true); - services.getExpandCollapseElement().click(); + services.clickServiceTab('nfs.testnfs', 'Details'); services.checkServiceStatus('nfs'); }); diff --git a/src/pybind/mgr/dashboard/frontend/cypress/integration/page-helper.po.ts b/src/pybind/mgr/dashboard/frontend/cypress/integration/page-helper.po.ts index 8b9104ed387..e4bbd3f3421 100644 --- a/src/pybind/mgr/dashboard/frontend/cypress/integration/page-helper.po.ts +++ b/src/pybind/mgr/dashboard/frontend/cypress/integration/page-helper.po.ts @@ -261,7 +261,7 @@ export abstract class PageHelper { this.waitDataTableToLoad(); this.setPageSize('10'); - cy.get('cd-table .search input').first().clear().type(text); + cy.get('[aria-label=search]').first().clear({ force: true }).type(text); } clearTableSearchInput() { -- 2.39.5