import quincy beta 17.1.0

[ceph.git] / ceph / src / pybind / mgr / dashboard / frontend / cypress / integration / ui / navigation.po.ts

diff --git a/ceph/src/pybind/mgr/dashboard/frontend/cypress/integration/ui/navigation.po.ts b/ceph/src/pybind/mgr/dashboard/frontend/cypress/integration/ui/navigation.po.ts
index c9cd336729414f88d1fb121952cc9bd5be7e234c..a3673284cdfb3282250f16435fee2424696a099d 100644 (file)
--- a/ceph/src/pybind/mgr/dashboard/frontend/cypress/integration/ui/navigation.po.ts
+++ b/ceph/src/pybind/mgr/dashboard/frontend/cypress/integration/ui/navigation.po.ts
@@ -44,18 +44,17 @@ export class NavigationPageHelper extends PageHelper {
   ];
 
   getVerticalMenu() {
-    return cy.get('ul.cd-navbar-primary');
+    return cy.get('nav[id=sidebar]');
   }
 
   getMenuToggler() {
-    return cy.get('cd-navigation > div.cd-navbar-top button.btn.btn-link');
+    return cy.get('[aria-label="toggle sidebar visibility"]');
   }
 
   checkNavigations(navs: any) {
     // The nfs-ganesha and RGW status requests are mocked to ensure that this method runs in time
-    cy.server();
-    cy.route('/api/nfs-ganesha/status', 'fixture:nfs-ganesha-status');
-    cy.route('/api/rgw/status', 'fixture:rgw-status');
+    cy.intercept('/api/nfs-ganesha/status', { fixture: 'nfs-ganesha-status.json' });
+    cy.intercept('/api/rgw/status', { fixture: 'rgw-status.json' });
 
     navs.forEach((nav: any) => {
       cy.contains('.simplebar-content li.nav-item a', nav.menu).click();