fixed navigation tests

diff --git a/src/pybind/mgr/dashboard/frontend/cypress/e2e/ui/navigation.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/cypress/e2e/ui/navigation.e2e-spec.ts
index 9c0383dfb922bd9bb83ef1afcf68dab92dc1f4da..1625dab4fb55e7ee810cecc8c9759429a957f715 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/cypress/e2e/ui/navigation.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/cypress/e2e/ui/navigation.e2e-spec.ts
@@ -9,12 +9,12 @@ describe('Shared pages', () => {
   });
 
   it('should display the vertical menu by default', () => {
-    shared.getVerticalMenu().should('not.have.class', 'cds--side-nav__item--active');
+    shared.getVerticalMenu().should('not.have.class', 'active');
   });
 
   it('should hide the vertical menu', () => {
     shared.getMenuToggler().click();
-    shared.getVerticalMenu().should('have.class', 'cds--side-nav__item--active');
+    shared.getVerticalMenu().should('have.class', 'active');
   });
 
   it('should navigate to the correct page', () => {

diff --git a/src/pybind/mgr/dashboard/frontend/cypress/e2e/ui/navigation.po.ts b/src/pybind/mgr/dashboard/frontend/cypress/e2e/ui/navigation.po.ts
index f2eefd826d8a851210a27bb683cb75b8391c64d4..89c4c7394d9ff0055e66576fe04d6243fc4f701d 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/cypress/e2e/ui/navigation.po.ts
+++ b/src/pybind/mgr/dashboard/frontend/cypress/e2e/ui/navigation.po.ts
@@ -75,7 +75,7 @@ export class NavigationPageHelper extends PageHelper {
   }
 
   getMenuToggler() {
-    return cy.get('[aria-label="toggle sidebar visibility"]');
+    return cy.get('[data-testid="main-menu-toggler"]');
   }
 
   checkNavigations(navs: any) {
@@ -85,7 +85,7 @@ export class NavigationPageHelper extends PageHelper {
     cy.intercept('/ui-api/block/rbd/status', { fixture: 'block-rbd-status.json' });
 
     navs.forEach((nav: any) => {
-      cy.get('.simplebar-content li.nav-item a').each(($link) => {
+      cy.get('cds-sidenav-item').each(($link) => {
         if ($link.text().trim() === nav.menu.trim()) {
           cy.wrap($link).click();
         }
@@ -100,9 +100,9 @@ export class NavigationPageHelper extends PageHelper {
 
   checkNavSubMenu(menu: any, submenu: any) {
     submenu.forEach((nav: any) => {
-      cy.get('.simplebar-content li.nav-item a').each(($link) => {
+      cy.get('cds-sidenav-item').each(($link) => {
         if ($link.text().trim() === menu.trim()) {
-          cy.contains(`ul.list-unstyled li a`, nav.menu).click();
+          cy.contains(`cds-sidenav-menu`, nav.menu).click();
         }
       });
     });

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html
index 2d9be03b2c03e551545c72f45086905f4f0064ba..3692e239676530e440d1bb41f0cae6c7efbea7fe 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html
@@ -13,6 +13,7 @@
             class="cd-navbar-top"
             [brand]="brandTemplate">
   <cds-hamburger [active]="showMenuSidebar"
+                 data-testid="main-menu-toggler"
                  (selected)="showMenuSidebar = !showMenuSidebar"></cds-hamburger>
   <cds-header-global>
     <cds-header-navigation>