Bug OCPBUGS-105794: Fix P-01-TC04 step definition wiring and add defensive teardown

frontend/packages/dev-console/integration-tests/support/step-definitions/common/common.ts

@@ -1,10 +1,15 @@
-import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps';
+import { Given, When, Then, After } from 'cypress-cucumber-preprocessor/steps';
 import { detailsPage } from '@console/cypress-integration-tests/views/details-page';
 import { modal } from '@console/cypress-integration-tests/views/modal';
 import { switchPerspective, devNavigationMenu, adminNavigationMenu } from '../../constants';
 import { perspective, projectNameSpace, navigateTo, app } from '../../pages';
 import { checkDeveloperPerspective } from '../../pages/functions/checkDeveloperPerspective';
 
+// Tracks whether the Developer perspective was disabled during a scenario so that
+// the After hook can re-enable it on cleanup, preventing cascade failures in
+// subsequent test files that depend on the Developer perspective being available.
+let devPerspectiveDisabled = false;
+
 Given('user has logged in as a basic user', () => {
   cy.logout();
   const idp = Cypress.expose('BRIDGE_HTPASSWD_IDP') || 'test';
@@ -21,6 +26,7 @@ Given('user is at developer perspective', () => {
 });
 
 Given('user has only admin perspective enabled', () => {
+  devPerspectiveDisabled = true;
   cy.exec(
     `oc patch console.operator.openshift.io/cluster --type='merge' -p '{"spec":{"customization":{"perspectives":[{"id":"dev","visibility":{"state":"Disabled"}}]}}}'`,
     { failOnNonZeroExit: true },
@@ -89,6 +95,34 @@ When('user is at namespace {string}', (projectName: string) => {
   projectNameSpace.selectOrCreateProject(projectName);
 });
 
+Given('user has logged in as admin user', () => {
+  cy.login();
+  perspective.switchTo(switchPerspective.Administrator);
+});
+
 When('user refreshes the page', () => {
   cy.reload();
 });
+
+// Defensive teardown: re-enable the Developer perspective after any scenario
+// that disabled it. This prevents cascade failures where a crash in the
+// enable-dev-perspective feature leaves the perspective disabled for all
+// subsequent tests (e.g. add-flow-ci.feature).
+After(() => {
+  if (devPerspectiveDisabled) {
+    devPerspectiveDisabled = false;
+    cy.exec(
+      `oc patch console.operator.openshift.io/cluster --type='merge' -p '{"spec":{"customization":{"perspectives":[{"id":"dev","visibility":{"state":"Enabled"}}]}}}'`,
+      { failOnNonZeroExit: false },
+    ).then((result) => {
+      cy.log('After hook: re-enabled Developer perspective');
+      cy.log(result.stdout);
+      if (result.stderr) {
+        cy.log(result.stderr);
+      }
+    });
+    cy.exec('oc rollout status -w deploy/console -n openshift-console', {
+      failOnNonZeroExit: false,
+    });
+  }
+});

frontend/packages/dev-console/integration-tests/support/step-definitions/customization/configure-perspectives.ts

@@ -1,13 +1,5 @@
 import { Given, Then, When } from 'cypress-cucumber-preprocessor/steps';
-import { nav } from '@console/cypress-integration-tests/views/nav';
-import { switchPerspective } from '../../constants';
-import { app, perspective } from '../../pages';
-
-Given('user has logged in as admin user', () => {
-  cy.login();
-  perspective.switchTo(switchPerspective.Administrator);
-  nav.sidenav.switcher.shouldHaveText(switchPerspective.Administrator);
-});
+import { app } from '../../pages';
 
 Given('user is at Search page in Home section', () => {
   cy.get('[data-quickstart-id="qs-nav-home"]')

frontend/packages/dev-console/integration-tests/support/step-definitions/e2e/enable-dev-perspective.ts

@@ -0,0 +1,81 @@
+import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps';
+import { switchPerspective } from '../../constants';
+import { app, perspective } from '../../pages';
+
+Given('user is at admin perspective', () => {
+  perspective.switchTo(switchPerspective.Administrator);
+});
+
+Given('user is at Search page in Home section', () => {
+  cy.get('[data-quickstart-id="qs-nav-home"]')
+    .scrollIntoView()
+    .then(($body) => {
+      if ($body.attr('aria-expanded') === 'false') {
+        cy.wrap($body).click();
+        cy.get('[data-test="nav"][href*="/search"]').click({ force: true });
+      } else {
+        cy.get('[data-test="nav"][href*="/search"]').click({ force: true });
+      }
+    });
+});
+
+When('user searches {string}', (value: string) => {
+  cy.get('[role="combobox"]').click();
+  cy.get('[aria-label="Type to filter"]').should('be.visible').type(value);
+  cy.get('[class="co-resource-item"]').then(($el) => {
+    if ($el.text().includes('operator.openshift.io')) {
+      cy.wrap($el).contains('operator.openshift.io').click();
+      cy.get('button[aria-label="Clear input value"]').should('be.visible').click();
+      // close the select so it doesn't block the items on the page
+      cy.get('body').click();
+    }
+  });
+});
+
+When('user clicks on cluster', () => {
+  cy.byTestID('cluster').should('be.visible').click({ force: true });
+});
+
+When('user clicks the {string} button in the page heading', (item: string) => {
+  cy.get(`button[data-test-action="${item}"]`).should('be.visible').click();
+  cy.get('[data-test="page-heading"] h1').should('have.text', 'Cluster configuration');
+});
+
+When(
+  'user selects {string} in the Developer under perspective section of general customisation',
+  (key: string) => {
+    cy.get('[data-test="perspectives form-group"]')
+      .eq(1)
+      .find('button')
+      .contains('Disabled')
+      .click();
+    cy.log('Perspective enabling menu to be opened');
+    cy.get('[role="listbox"]').should('be.visible');
+    cy.get('button[role="option"]').contains(key).click();
+    cy.get('[data-test="perspectives form-group"]')
+      .eq(1)
+      .find('button[class*="menu-toggle"]')
+      .should('contain.text', key);
+  },
+);
+
+When('user will see Saved alert', () => {
+  cy.byTestID('success-alert').should('be.visible');
+});
+
+Then('user refreshes the page to see developer option', () => {
+  cy.exec('oc rollout status -w deploy/console -n openshift-console', {
+    failOnNonZeroExit: true,
+  }).then((result) => {
+    cy.log(result.stderr);
+  });
+  cy.reload(true);
+  app.waitForDocumentLoad();
+});
+
+Then('user will see developer perspective in the perspective switcher', () => {
+  cy.byLegacyTestID('perspective-switcher-toggle')
+    .click({ force: true })
+    .byLegacyTestID('perspective-switcher-menu-option')
+    .contains('Developer');
+});