Simplify testing for admin perspective

Author: rhamilto

frontend/integration-tests/test-cypress.sh

@@ -87,11 +87,12 @@ if [ -n "${nightly-}" ] && [ -z "${pkg-}" ]; then
 fi
 
 if [ -n "${headless-}" ] && [ -z "${pkg-}" ]; then
+  # DO NOT MERGE.  UPDATED FOR TESTING IN CI.
+  yarn run test-cypress-helm-headless
   yarn run test-cypress-console-headless
   yarn run test-cypress-dev-console-headless
   yarn run test-cypress-olm-headless
   yarn run test-cypress-webterminal-headless
-  yarn run test-cypress-helm-headless
   yarn run test-cypress-knative-headless
   yarn run test-cypress-topology-headless
   # yarn run test-cypress-shipwright-headless

frontend/packages/dev-console/integration-tests/support/commands/app.ts

@@ -9,7 +9,6 @@ declare global {
   namespace Cypress {
     interface Chainable {
       alertTitleShouldContain(title: string): Chainable<Element>;
-      clickNavLink(path: string[]): Chainable<Element>;
       selectByDropDownText(selector: string, dropdownText: string): Chainable<Element>;
       selectByAutoCompleteDropDownText(selector: string, dropdownText: string): Chainable<Element>;
       verifyDropdownselected(selector: string): Chainable<Element>;
@@ -31,15 +30,6 @@ Cypress.Commands.add('alertTitleShouldContain', (alertTitle: string) => {
   cy.byLegacyTestID('modal-title').should('contain.text', alertTitle);
 });
 
-Cypress.Commands.add('clickNavLink', (path: string[]) => {
-  cy.get(`[data-test="nav"]`) // this assumes all top level menu items are expandable
-    .contains(path[0])
-    .click(); // open top, expandable menu
-  // eslint-disable-next-line cypress/no-unnecessary-waiting
-  cy.wait(500); // wait for animation
-  cy.get('#page-sidebar').contains(path[1]).click();
-});
-
 Cypress.Commands.add('selectByDropDownText', (selector: string, dropdownText: string) => {
   cy.get(selector).click();
   cy.get('li').contains(dropdownText).click({ force: true });

frontend/packages/helm-plugin/integration-tests/features/helm-release.feature

@@ -5,7 +5,8 @@ Feature: Helm Release
 
         @pre-condition
         Scenario: Create or Select the project namespace
-            Given user has created or selected namespace "aut-ci-helm"
+            Given user is at the Helm Release tab in admin perspective
+             And user has created or selected namespace "aut-ci-helm"
 
 
         Scenario: Open the Helm tab on the navigation bar when helm charts are absent: HR-05-TC01
@@ -49,7 +50,7 @@ Feature: Helm Release
               And user is able to see the status and status icon of Revision history page
 
         Scenario: Context menu options of helm release:  HR-01-TC01
-            Given user is at the Topology page in admin view
+            Given user is at the Topology page
              When user right clicks on the helm release "nodejs-release" to open the context menu
              Then user is able to see the context menu with actions Upgrade and Delete Helm Release
 
@@ -83,7 +84,7 @@ Feature: Helm Release
 
 
         Scenario: Perform Upgrade action on Helm Release through Context Menu: HR-08-TC04
-            Given user is at the Topology page in admin view
+            Given user is at the Topology page
              When user right clicks on the helm release "nodejs-release" to open the context menu
               And user clicks on the "Upgrade" action
               And user upgrades the chart Version
@@ -101,7 +102,7 @@ Feature: Helm Release
 
 
         Scenario: Perform Rollback action on Helm Release through Context Menu: HR-08-TC03
-            Given user is at the Topology page in admin view
+            Given user is at the Topology page
               And user is on the topology sidebar of the helm release "nodejs-release"
              When user clicks on the Actions drop down menu
               And user clicks on the "Rollback" action
@@ -111,7 +112,7 @@ Feature: Helm Release
 
 
         Scenario: Delete Helm Release through Context Menu: HR-01-TC03
-            Given user is at the Topology page in admin view
+            Given user is at the Topology page
              When user right clicks on the helm release "nodejs-release" to open the context menu
               And user clicks on the "Delete Helm Release" action
               And user enters the release name "nodejs-release"

frontend/packages/helm-plugin/integration-tests/support/commands/hooks.ts

@@ -1,9 +1,7 @@
+import { app } from '@console/dev-console/integration-tests/support/pages';
+
 before(() => {
-  const bridgePasswordIDP: string = Cypress.expose('BRIDGE_HTPASSWD_IDP') || 'test';
-  const bridgePasswordUsername: string = Cypress.expose('BRIDGE_HTPASSWD_USERNAME') || 'test';
-  cy.env(['BRIDGE_HTPASSWD_PASSWORD']).then(({ BRIDGE_HTPASSWD_PASSWORD }) => {
-    cy.login(bridgePasswordIDP, bridgePasswordUsername, BRIDGE_HTPASSWD_PASSWORD || 'test');
-  });
+  cy.login();
   cy.document().its('readyState').should('eq', 'complete');
   cy.window().then((win: any) => {
     win.SERVER_FLAGS.userSettingsLocation = 'localstorage';
@@ -13,8 +11,7 @@ before(() => {
 });
 
 beforeEach(() => {
-  cy.initAdmin();
-  cy.byLegacyTestID('topology-header').should('exist').click({ force: true });
+  app.waitForLoad();
 });
 
 after(() => {

frontend/packages/helm-plugin/integration-tests/support/step-definitions/common/common.ts

@@ -40,12 +40,6 @@ Given('user is at the Topology page', () => {
   topologyPage.verifyTopologyPage();
 });
 
-Given('user is at the Topology page in admin view', () => {
-  cy.byLegacyTestID('topology-header').should('exist').click({ force: true });
-  app.waitForLoad();
-  topologyPage.verifyTopologyPage();
-});
-
 When('user enters Git Repo url as {string}', (gitUrl: string) => {
   gitPage.enterGitUrl(gitUrl);
   gitPage.verifyValidatedMessage(gitUrl);

frontend/packages/integration-tests/support/index.ts

@@ -50,19 +50,6 @@ Cypress.Commands.add('visitAndWait', (url, options, selector = '#content') => {
   waitForElementToExist(selector);
 });
 
-Cypress.Commands.add('clickNavLink', (path: string[]) => {
-  cy.get('#page-sidebar')
-    .contains(path[0])
-    .then(($navItem) => {
-      if ($navItem.attr('aria-expanded') !== 'true') {
-        cy.wrap($navItem).click();
-      }
-    });
-  if (path.length === 2) {
-    cy.get('#page-sidebar').contains(path[1]).click();
-  }
-});
-
 before(() => {
   cy.task('readFileIfExists', 'cypress-a11y-report.json').then((a11yReportOrNull: string) => {
     if (a11yReportOrNull !== null) {