Remove install cypress test for OSSMC (#364)

* Remove install cypress test for OSSMC * Remove install tag from cypress:run in package.json * Fix issue in workloads cypress test * Replace dropdown class in workload cypress test
kiali · Sep 9, 2024 · fbbb568 · fbbb568
1 parent 8f15404
commit fbbb568
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 150 deletions.
diff --git a/hack/manage-ossmc.sh b/hack/manage-ossmc.sh
diff --git a/plugin/cypress/integration/common/ossmc_scripts.ts b/plugin/cypress/integration/common/ossmc_scripts.ts
diff --git a/plugin/cypress/integration/common/workloads_deployments.ts b/plugin/cypress/integration/common/workloads_deployments.ts
@@ -20,20 +20,25 @@ When('cypress intercept hooks for workloads are registered', () => {
   // placeholder for future implementation (intercepting API calls for graphs etc)
 });
 
-When('user navigates to the {string} deployment details page', (deployment: string) => {
-  cy.get('button[class$="c-nav__link"]')
-    .contains('Workloads')
-    .click()
-    .then(() => {
-      cy.get('a[class$="c-nav__link"]')
-        .contains('Deployments')
-        .click()
-        .then(() => {
-          cy.get('input[data-test-id="item-filter"]').type(deployment);
-          cy.get(`[data-test-id="${deployment}"]`).click();
-        });
-    });
-});
+When(
+  'user navigates to the {string} deployment details page in the namespace {string}',
+  (deployment: string, namespace: string) => {
+    cy.get('button[class$="c-nav__link"]')
+      .contains('Workloads')
+      .click()
+      .then(() => {
+        cy.get('a[class$="c-nav__link"]')
+          .contains('Deployments')
+          .click()
+          .then(() => {
+            cy.contains('span[class$="c-menu-toggle__text"]', 'Project:').click();
+            cy.contains('span[class$="c-menu__item-text"]', namespace).click();
+            cy.get('input[data-test-id="item-filter"]').type(deployment);
+            cy.get(`[data-test-id="${deployment}"]`).click();
+          });
+      });
+  }
+);
 
 When('user clicks tab with {string} button', (tabName: string) => {
   cy.get('button').contains(tabName).click();
@@ -52,5 +57,5 @@ When('{string} container is selected', (container: string) => {
 });
 
 Then('user sees {string} dropdown', (dropdownText: string) => {
-  cy.get('span[class$="c-dropdown__toggle-text"]').contains(dropdownText).should('be.visible');
+  cy.get('span[class$="c-menu-toggle__text"]').contains(dropdownText).should('be.visible');
 });
diff --git a/plugin/cypress/integration/featureFiles/install_ossmc.feature b/plugin/cypress/integration/featureFiles/install_ossmc.feature
diff --git a/plugin/cypress/integration/featureFiles/uninstall_ossmc.feature b/plugin/cypress/integration/featureFiles/uninstall_ossmc.feature
diff --git a/plugin/cypress/integration/featureFiles/workloads_deployments.feature b/plugin/cypress/integration/featureFiles/workloads_deployments.feature
@@ -8,7 +8,7 @@ Feature: Kiali workloads integration with OCP Console
     Background:
         Given user is logged as administrator in OCP Console
         And cypress intercept hooks for workloads are registered
-        And user navigates to the "kiali" deployment details page
+        And user navigates to the "kiali" deployment details page in the namespace "istio-system"
         And user clicks on Service Mesh tab in horizontal nav
 
     Scenario: Verify that content of the Overview tab is correct

diff --git a/plugin/package.json b/plugin/package.json
@@ -13,8 +13,8 @@
     "start": "sh -ac '. ./.env.development; yarn ts-node node_modules/.bin/webpack serve'",
     "start-console": "./start-console.sh",
     "cypress": "cypress open",
-    "cypress:run": "cypress run $REPORTER -e TAGS=\"@install\" && cypress run $REPORTER -e TAGS=\"not @install and not @uninstall\" && cypress run $REPORTER -e TAGS=\"@uninstall\"",
-    "cypress:run:junit": "REPORTER='--reporter cypress-multi-reporters --reporter-options configFile=cypress/reporter-config.json' npm run cypress:run ",
+    "cypress:run": "cypress run",
+    "cypress:run:junit": "cypress run --reporter cypress-multi-reporters --reporter-options configFile=cypress/reporter-config.json",
     "cypress:delete:reports": "rm cypress/results/* || true",
     "cypress:combine:reports": "jrm cypress/results/combined-report.xml \"cypress/results/*.xml\"",
     "i18n": "yarn i18n:kiali && yarn i18n:openshift",