Splitted "user has created or selected namespace" command as regular user requires additional steps

Signed-off-by: Oleksii Korniienko <[email protected]>

Author: olkornii

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

@@ -1,12 +1,7 @@
 import { Given, When, Then, And } from 'cypress-cucumber-preprocessor/steps';
 import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour';
 import { switchPerspective } from '@console/dev-console/integration-tests/support/constants';
-import { devNavigationMenuPO } from '@console/dev-console/integration-tests/support/pageObjects';
-import { adminNavigationMenuPO } from '@console/dev-console/integration-tests/support/pageObjects';
-import {
-  perspective,
-  projectNameSpace,
-} from '@console/dev-console/integration-tests/support/pages';
+import { perspective } from '@console/dev-console/integration-tests/support/pages';
 import { checkTerminalIcon } from '@console/dev-console/integration-tests/support/pages/functions/checkTerminalIcon';
 import { webTerminalPage } from '@console/webterminal-plugin/integration-tests/support/step-definitions/pages/web-terminal/webTerminal-page';
 
@@ -85,14 +80,6 @@ And('user has logged in as basic user', () => {
 //   perspective.switchTo(switchPerspective.Developer);
 // });
 
-// Given('user is at administrator perspective', () => {
-//   perspective.switchTo(switchPerspective.Administrator);
-// });
-
-Given('user has created or selected namespace {string}', (projectName: string) => {
-  Cypress.env('NAMESPACE', projectName);
-  // move to workload/topology page as "Project" page does not contain dropdown menu in regular user perspective.
-  cy.get(adminNavigationMenuPO.workloads.main).click();
-  cy.get(devNavigationMenuPO.topology).click();
-  projectNameSpace.selectOrCreateProject(`${projectName}`);
+Given('user is at administrator perspective', () => {
+  perspective.switchTo(switchPerspective.Administrator);
 });

frontend/packages/webterminal-plugin/integration-tests/support/step-definitions/web-terminal/web-teminal-basic.ts

@@ -1,5 +1,12 @@
 import { When, Then, And, Given } from 'cypress-cucumber-preprocessor/steps';
-import { installWebterminalOperatorUsingCLI } from '@console/dev-console/integration-tests/support/pages';
+import {
+  adminNavigationMenuPO,
+  devNavigationMenuPO,
+} from '@console/dev-console/integration-tests/support/pageObjects';
+import {
+  installWebterminalOperatorUsingCLI,
+  projectNameSpace,
+} from '@console/dev-console/integration-tests/support/pages';
 import { webTerminalPage } from '@console/webterminal-plugin/integration-tests/support/step-definitions/pages/web-terminal/webTerminal-page';
 
 Given('user with basic rights has installed Web Terminal operator', () => {
@@ -17,7 +24,7 @@ Then('user will see the terminal window opened in new tab', () => {
 });
 
 And('user does nothing with displayed terminal window 1 minutes', () => {
-  const terminalIdlingTimeout: number = Number(Cypress.env('TERMINAL_IDLING_TIMEOUT')) || 60000;
+  const terminalIdlingTimeout: number = Number(Cypress.env('TERMINAL_IDLING_TIMEOUT')) || 180000; // [workaround] changed to 180 seconds due to https://issues.redhat.com/browse/WTO-334
   cy.wait(terminalIdlingTimeout);
   webTerminalPage.verifyInnactivityMessage(terminalIdlingTimeout);
 });
@@ -28,3 +35,11 @@ Then(
     webTerminalPage.verifyRestartTerminalButton();
   },
 );
+
+Given('user has created or selected namespace {string}', (projectName: string) => {
+  Cypress.env('NAMESPACE', projectName);
+  cy.get(adminNavigationMenuPO.workloads.main).click();
+  cy.get(devNavigationMenuPO.topology).click();
+  projectNameSpace.selectOrCreateProject(`${projectName}`);
+  // cy.get(devNavigationMenuPO.project).click();
+});

frontend/packages/webterminal-plugin/integration-tests/support/step-definitions/web-terminal/web-terminal-adminuser.ts

@@ -128,3 +128,9 @@ Then('user will see the terminal instance for namespace {string}', (nameSpace: s
   // Disabling following line due to terminal loading issue from backend at the first load
   // devWorkspacePage.verifyDevWsResourceStatus(devWorkspaceStatuses.running);
 });
+
+Given('user has created or selected namespace {string}', (projectName: string) => {
+  Cypress.env('NAMESPACE', projectName);
+  projectNameSpace.selectOrCreateProject(`${projectName}`);
+  // cy.get(devNavigationMenuPO.project).click();
+});