Update e2e to use the navigation bar (#347)

trento-project · Apr 13, 2022 · ae54b26 · ae54b26
1 parent a075f67
commit ae54b26
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 8 deletions.
diff --git a/assets/js/components/Layout/Layout.jsx b/assets/js/components/Layout/Layout.jsx
@@ -82,7 +82,7 @@ const Layout = () => {
                     return (
                       <Link
                         key={index}
-                        className={`w-full text-gray-800 dark:text-white flex items-center pl-6 p-2 my-2 transition-colors duration-200 justify-start ${
+                        className={`tn-menu-item w-full text-gray-800 dark:text-white flex items-center pl-6 p-2 my-2 transition-colors duration-200 justify-start ${
                           isCurrentRoute(item.href)
                             ? 'border-l-4 border-jungle-green-500'
                             : 'hover:border-l-4 hover:border-jungle-green-500'

diff --git a/test/e2e/cypress/integration/about.js b/test/e2e/cypress/integration/about.js
@@ -2,7 +2,7 @@ describe("User account page", () => {
   before(() => {
     cy.loadScenario("healthy-27-node-SAP-cluster");
     cy.login();
-    cy.visit("/about");
+    cy.navigateToItem('About');
     cy.url().should("include", "/about");
   });
 

diff --git a/test/e2e/cypress/integration/clusters_overview.js b/test/e2e/cypress/integration/clusters_overview.js
@@ -3,16 +3,17 @@ import {
     allClusterIds,
     clusterIdByName,
   } from '../fixtures/clusters-overview/available_clusters';
-  
+
   context('Clusters Overview', () => {
     const availableClusters = allClusterNames();
     const availableClustersId = allClusterIds();
     before(() => {
       cy.loadScenario('healthy-27-node-SAP-cluster');
       cy.login();
-      cy.visit('/clusters');
+      cy.navigateToItem('Clusters');
+      cy.url().should("include", "/clusters");
     });
-  
+
     describe('Registered Clusters should be available in the overview', () => {
       it('should show all of the registered clusters', () => {
         cy.get('.tn-clustername')
@@ -34,4 +35,3 @@ import {
       });
     });
   });
-
diff --git a/test/e2e/cypress/integration/dashboard.js b/test/e2e/cypress/integration/dashboard.js
@@ -6,7 +6,7 @@ describe("Dashboard page", () => {
     cy.loadScenario("healthy-27-node-SAP-cluster");
     cy.task("startAgentHeartbeat", agents());
     cy.login();
-    cy.visit("/");
+    cy.navigateToItem('Dashboard');
     cy.url().should("include", "/");
   });
 

diff --git a/test/e2e/cypress/integration/hosts_overview.js b/test/e2e/cypress/integration/hosts_overview.js
@@ -10,7 +10,7 @@ context("Hosts Overview", () => {
     cy.task("startAgentHeartbeat", agents());
     cy.login();
 
-    cy.visit("/hosts");
+    cy.navigateToItem('Hosts');
     cy.url().should("include", "/hosts");
   });
 

diff --git a/test/e2e/cypress/support/commands.js b/test/e2e/cypress/support/commands.js
@@ -24,6 +24,8 @@
 // -- This will overwrite an existing command --
 // Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
 
+const initializeOpenSidebar = () => cy.setCookie('sidebar-collapsed', 'false');
+
 Cypress.Commands.add("login", () => {
   const [username, password] = [
     Cypress.env("login_user"),
@@ -48,3 +50,9 @@ Cypress.Commands.add("loadScenario", (scenario) => {
     `cd ${projectRoot} && ${photofinishBinary} run --url "http://${webAPIHost}:${webAPIPort}/api/collect" ${scenario}`
   );
 });
+
+Cypress.Commands.add('navigateToItem', (item) => {
+  initializeOpenSidebar();
+  const items = Array.isArray(item) ? item : [item];
+  items.forEach((it) => cy.get('.tn-menu-item').contains(it).click());
+});