@eclipse-che/che-e2e 7.74.0-dev-1d09cb7 → 7.74.0-dev-aace77a

package/specs/factory/RefusedOAuthFactory.spec.ts

@@ -1,5 +1,5 @@
-/*********************************************************************
- * Copyright (c) 2021 Red Hat, Inc.
+/** *******************************************************************
+ * copyright (c) 2021 Red Hat, Inc.
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -11,20 +11,20 @@
 import 'reflect-metadata';
 import { e2eContainer } from '../../configs/inversify.config';
 import {
-    ActivityBar,
-    ContextMenu,
-    EditorView,
-    error,
-    InputBox,
-    Locators,
-    ModalDialog,
-    NewScmView,
-    SideBarView,
-    SingleScmProvider,
-    TextEditor,
-    ViewControl,
-    ViewItem,
-    ViewSection
+	ActivityBar,
+	ContextMenu,
+	EditorView,
+	error,
+	InputBox,
+	Locators,
+	ModalDialog,
+	NewScmView,
+	SideBarView,
+	SingleScmProvider,
+	TextEditor,
+	ViewControl,
+	ViewItem,
+	ViewSection
 } from 'monaco-page-objects';
 import { expect } from 'chai';
 import { registerRunningWorkspace } from '../MochaHooks';
@@ -37,226 +37,238 @@ import { DriverHelper } from '../../utils/DriverHelper';
 import { OauthPage } from '../../pageobjects/git-providers/OauthPage';
 import { StringUtil } from '../../utils/StringUtil';
 import { Logger } from '../../utils/Logger';
-import { TimeoutConstants } from '../../constants/TimeoutConstants';
+import { TIMEOUT_CONSTANTS } from '../../constants/TIMEOUT_CONSTANTS';
 import { LoginTests } from '../../tests-library/LoginTests';
-import { OAuthConstants } from '../../constants/OAuthConstants';
-import { BaseTestConstants } from '../../constants/BaseTestConstants';
-import { FactoryTestConstants, GitProviderType } from '../../constants/FactoryTestConstants';
+import { OAUTH_CONSTANTS } from '../../constants/OAUTH_CONSTANTS';
+import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
+import { FACTORY_TEST_CONSTANTS, GitProviderType } from '../../constants/FACTORY_TEST_CONSTANTS';
 import WebDriverError = error.WebDriverError;
 
-const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
-const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
-const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
-const webCheCodeLocators: Locators = new CheCodeLocatorLoader().webCheCodeLocators;
-const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
-const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
+suite(
+	`Create a workspace via launching a factory from the ${FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_PROVIDER} repository and deny the access`,
+	function (): void {
+		const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
+		const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
+		const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
+		const webCheCodeLocators: Locators = new CheCodeLocatorLoader().webCheCodeLocators;
+		const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
+		const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
+		const oauthPage: OauthPage = e2eContainer.get(CLASSES.OauthPage);
 
-suite(`Create a workspace via launching a factory from the ${FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER} repository and deny the access`, async function(): Promise<void> {
-  const oauthPage: OauthPage = new OauthPage(driverHelper);
+		let projectSection: ViewSection;
+		let scmProvider: SingleScmProvider;
+		let scmContextMenu: ContextMenu;
 
-  let projectSection: ViewSection;
-  let scmProvider: SingleScmProvider;
-  let rest: SingleScmProvider[];
-  let scmContextMenu: ContextMenu;
+		// test specific data
+		const timeToRefresh: number = 1500;
+		const changesToCommit: string = new Date().getTime().toString();
+		const fileToChange: string = 'Date.txt';
+		const commitChangesButtonLabel: string = `Commit Changes on "${FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_REPO_BRANCH}"`;
+		const refreshButtonLabel: string = 'Refresh';
+		const pushItemLabel: string = 'Push';
+		const label: string = BASE_TEST_CONSTANTS.TS_SELENIUM_PROJECT_ROOT_FILE_NAME;
+		let testRepoProjectName: string;
+		const isPrivateRepo: string = FACTORY_TEST_CONSTANTS.TS_SELENIUM_IS_PRIVATE_FACTORY_GIT_REPO ? 'private' : 'public';
 
-  // test specific data
-  const timeToRefresh: number = 1500;
-  const changesToCommit: string = (new Date()).getTime().toString();
-  const fileToChange: string = 'Date.txt';
-  const commitChangesButtonLabel: string = `Commit Changes on "${FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_REPO_BRANCH}"`;
-  const refreshButtonLabel: string = 'Refresh';
-  const pushItemLabel: string = 'Push';
-  const label: string = BaseTestConstants.TS_SELENIUM_PROJECT_ROOT_FILE_NAME;
-  let testRepoProjectName: string;
-  const isPrivateRepo: string = FactoryTestConstants.TS_SELENIUM_IS_PRIVATE_FACTORY_GIT_REPO ? 'private' : 'public';
+		loginTests.loginIntoChe();
 
-  loginTests.loginIntoChe();
+		test(`Navigate to the ${isPrivateRepo} repository factory URL`, async function (): Promise<void> {
+			await browserTabsUtil.navigateTo(FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_URL());
+		});
 
-  test(`Navigate to the ${isPrivateRepo} repository factory URL`, async function(): Promise<void> {
-    await browserTabsUtil.navigateTo(FactoryTestConstants.TS_SELENIUM_FACTORY_URL());
-  });
+		if (OAUTH_CONSTANTS.TS_SELENIUM_GIT_PROVIDER_OAUTH) {
+			test(`Authorize with a ${FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_PROVIDER} OAuth and deny access`, async function (): Promise<void> {
+				await oauthPage.login();
+				await oauthPage.waitOauthPage();
+				await oauthPage.denyAccess();
+			});
+		}
 
-  if (OAuthConstants.TS_SELENIUM_GIT_PROVIDER_OAUTH) {
-    test(`Authorize with a ${FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER} OAuth and deny access`, async function(): Promise<void> {
-      await oauthPage.login();
-      await oauthPage.waitOauthPage();
-      await oauthPage.denyAccess();
-    });
-  }
+		test('Obtain workspace name from workspace loader page', async function (): Promise<void> {
+			await workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
+		});
 
-  test('Obtain workspace name from workspace loader page', async function(): Promise<void> {
-    await workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
-  });
+		test('The workspace starts with access deny flag in the url', async function (): Promise<void> {
+			expect(await driverHelper.getDriver().getCurrentUrl()).contains('&error_code=access_denied');
+		});
 
-  test('The workspace starts with access deny flag in the url', async function(): Promise<void> {
-    expect(await driverHelper.getDriver().getCurrentUrl()).contains('&error_code=access_denied');
-  });
+		test('Registering the running workspace', function (): void {
+			registerRunningWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+		});
 
-  test('Registering the running workspace', async function(): Promise<void> {
-    registerRunningWorkspace(WorkspaceHandlingTests.getWorkspaceName());
-  });
+		test('Wait the workspace readiness', async function (): Promise<void> {
+			await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
+		});
 
-  test('Wait the workspace readiness', async function(): Promise<void> {
-    await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
-  });
+		test('Check if a project folder has been created', async function (): Promise<void> {
+			testRepoProjectName = StringUtil.getProjectNameFromGitUrl(FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_REPO_URL);
+			Logger.debug(`new SideBarView().getContent().getSection: get ${testRepoProjectName}`);
+			projectSection = await new SideBarView().getContent().getSection(testRepoProjectName);
+		});
 
-  test('Check if a project folder has been created', async function(): Promise<void> {
-    testRepoProjectName = StringUtil.getProjectNameFromGitUrl(FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_REPO_URL);
-    Logger.debug(`new SideBarView().getContent().getSection: get ${testRepoProjectName}`);
-    projectSection = await new SideBarView().getContent().getSection(testRepoProjectName);
-  });
+		test('Accept the project as a trusted one', async function (): Promise<void> {
+			// click somewhere to trigger "Welcome Content" dialog
+			try {
+				await driverHelper.waitAndClick(webCheCodeLocators.Workbench.notificationItem);
+			} catch (e) {
+				Logger.info(`Click on ${webCheCodeLocators.Workbench.notificationItem} to get "Welcome Content" dialog ${e as string}`);
+			}
+			// "Welcome Content" dialog can be shown before of after dialog with an error for private repo
+			try {
+				const buttonYesITrustTheAuthors: string = 'Yes, I trust the authors';
+				await driverHelper.waitVisibility(
+					webCheCodeLocators.WelcomeContent.text,
+					TIMEOUT_CONSTANTS.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM
+				);
+				const welcomeContentDialog: ModalDialog = new ModalDialog();
+				Logger.debug(`trustedProjectDialog.pushButton: "${buttonYesITrustTheAuthors}"`);
+				await welcomeContentDialog.pushButton(buttonYesITrustTheAuthors);
+				await driverHelper.waitDisappearance(webCheCodeLocators.WelcomeContent.text);
+			} catch (e) {
+				Logger.info(`"Accept the project as a trusted one" dialog was not shown firstly for "${isPrivateRepo}"`);
+				if (!FACTORY_TEST_CONSTANTS.TS_SELENIUM_IS_PRIVATE_FACTORY_GIT_REPO) {
+					throw new WebDriverError(e as string);
+				}
+			}
+		});
 
-  test('Accept the project as a trusted one', async function(): Promise<void> {
-    // click somewhere to trigger "Welcome Content" dialog
-    try {
-      await driverHelper.waitAndClick(webCheCodeLocators.Workbench.notificationItem);
-    } catch (e) {
-      Logger.info(`Click on ${webCheCodeLocators.Workbench.notificationItem} to get "Welcome Content" dialog ${e as string}`);
-    }
-    // "Welcome Content" dialog can be shown before of after dialog with an error for private repo
-    try {
-      const buttonYesITrustTheAuthors: string = `Yes, I trust the authors`;
-      await driverHelper.waitVisibility(webCheCodeLocators.WelcomeContent.text, TimeoutConstants.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM);
-      const welcomeContentDialog: ModalDialog = new ModalDialog();
-      Logger.debug(`trustedProjectDialog.pushButton: "${buttonYesITrustTheAuthors}"`);
-      await welcomeContentDialog.pushButton(buttonYesITrustTheAuthors);
-      await driverHelper.waitDisappearance(webCheCodeLocators.WelcomeContent.text);
-    } catch (e) {
-      Logger.info(`"Accept the project as a trusted one" dialog was not shown firstly for "${isPrivateRepo}"`);
-      if (!FactoryTestConstants.TS_SELENIUM_IS_PRIVATE_FACTORY_GIT_REPO) {
-        throw new WebDriverError(e as string);
-      }
-    }
-  });
+		if (FACTORY_TEST_CONSTANTS.TS_SELENIUM_IS_PRIVATE_FACTORY_GIT_REPO) {
+			test('Check that project can not be cloned', async function (): Promise<void> {
+				await driverHelper.waitVisibility(webCheCodeLocators.Dialog.message);
+				const workspaceDoesNotExistDialog: ModalDialog = new ModalDialog();
+				const message: string = await workspaceDoesNotExistDialog.getMessage();
+				expect(message).contains('space does not exist');
+			});
 
-  if (FactoryTestConstants.TS_SELENIUM_IS_PRIVATE_FACTORY_GIT_REPO) {
-    test('Check that project can not be cloned', async function(): Promise<void> {
-      await driverHelper.waitVisibility(webCheCodeLocators.Dialog.message);
-      const workspaceDoesNotExistDialog: ModalDialog = new ModalDialog();
-      const message: string = await workspaceDoesNotExistDialog.getMessage();
-      expect(message).contains('space does not exist');
-    });
+			test('Check that project files were not imported', async function (): Promise<void> {
+				const isFileImported: ViewItem | undefined = await projectSection.findItem(label);
+				expect(isFileImported).eqls(undefined);
+			});
+		} else {
+			test('Check if the project files were imported', async function (): Promise<void> {
+				Logger.debug(`projectSection.findItem: find ${label}`);
+				const isFileImported: ViewItem | undefined = await projectSection.findItem(label);
+				// projectSection.findItem(label) can return undefined but test will goes on
+				expect(isFileImported).not.eqls(undefined);
+			});
 
-    test('Check that project files were not imported', async function(): Promise<void> {
-      const isFileImported: ViewItem | undefined = await projectSection.findItem(label);
-      expect(isFileImported).eqls(undefined);
-    });
+			test('Make changes to the file', async function (): Promise<void> {
+				Logger.debug(`projectSection.openItem: "${fileToChange}"`);
+				await projectSection.openItem(fileToChange);
+				const editor: TextEditor = (await new EditorView().openEditor(fileToChange)) as TextEditor;
+				await driverHelper.waitVisibility(webCheCodeLocators.Editor.inputArea);
+				Logger.debug('editor.clearText');
+				await editor.clearText();
+				Logger.debug(`editor.typeTextAt: "${changesToCommit}"`);
+				await editor.typeTextAt(1, 1, changesToCommit);
+			});
 
-  } else {
-    test('Check if the project files were imported', async function(): Promise<void> {
-      Logger.debug(`projectSection.findItem: find ${label}`);
-      const isFileImported: ViewItem | undefined = await projectSection.findItem(label);
-      // projectSection.findItem(label) can return undefined but test will goes on
-      expect(isFileImported).not.eqls(undefined);
-    });
+			test('Open a source control manager', async function (): Promise<void> {
+				const viewSourceControl: string = 'Source Control';
+				const sourceControl: ViewControl = (await new ActivityBar().getViewControl(viewSourceControl)) as ViewControl;
+				Logger.debug(`sourceControl.openView: "${viewSourceControl}"`);
+				await sourceControl.openView();
+				const scmView: NewScmView = new NewScmView();
+				await driverHelper.waitVisibility(webCheCodeLocators.ScmView.inputField);
+				let rest: SingleScmProvider[];
+				[scmProvider, ...rest] = await scmView.getProviders();
+				Logger.debug(`scmView.getProviders: "${JSON.stringify(scmProvider)}, ${rest}"`);
+			});
 
-    test('Make changes to the file', async function(): Promise<void> {
-      Logger.debug(`projectSection.openItem: "${fileToChange}"`);
-      await projectSection.openItem(fileToChange);
-      const editor: TextEditor = await new EditorView().openEditor(fileToChange) as TextEditor;
-      await driverHelper.waitVisibility(webCheCodeLocators.Editor.inputArea);
-      Logger.debug(`editor.clearText`);
-      await editor.clearText();
-      Logger.debug(`editor.typeTextAt: "${changesToCommit}"`);
-      await editor.typeTextAt(1, 1, changesToCommit);
-    });
+			test('Check if the changes are displayed in the source control manager', async function (): Promise<void> {
+				await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
+				await driverHelper.wait(timeToRefresh);
+				Logger.debug(`scmProvider.takeAction: "${refreshButtonLabel}"`);
+				await scmProvider.takeAction(refreshButtonLabel);
+				// wait while changes counter will be refreshed
+				await driverHelper.wait(timeToRefresh);
+				const changes: number = await scmProvider.getChangeCount();
+				Logger.debug(`scmProvider.getChangeCount: number of changes is "${changes}"`);
+				expect(changes).eql(1);
+			});
 
-    test('Open a source control manager', async function(): Promise<void> {
-      const viewSourceControl: string = `Source Control`;
-      const sourceControl: ViewControl = await new ActivityBar().getViewControl(viewSourceControl) as ViewControl;
-      Logger.debug(`sourceControl.openView: "${viewSourceControl}"`);
-      await sourceControl.openView();
-      const scmView: NewScmView = new NewScmView();
-      await driverHelper.waitVisibility(webCheCodeLocators.ScmView.actionConstructor(commitChangesButtonLabel));
-      [scmProvider, ...rest] = await scmView.getProviders();
-      Logger.debug(`scmView.getProviders: "${scmProvider}, ${scmProvider}"`);
-    });
+			test('Stage the changes', async function (): Promise<void> {
+				await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
+				Logger.debug('scmProvider.openMoreActions');
+				scmContextMenu = await scmProvider.openMoreActions();
+				await driverHelper.waitVisibility(webCheCodeLocators.ContextMenu.contextView);
+				Logger.debug('scmContextMenu.select: "Changes" -> "Stage All Changes"');
+				await scmContextMenu.select('Changes', 'Stage All Changes');
+			});
 
-    test('Check if the changes are displayed in the source control manager', async function(): Promise<void> {
-      await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
-      await driverHelper.wait(timeToRefresh);
-      Logger.debug(`scmProvider.takeAction: "${refreshButtonLabel}"`);
-      await scmProvider.takeAction(refreshButtonLabel);
-      // wait while changes counter will be refreshed
-      await driverHelper.wait(timeToRefresh);
-      const changes: number = await scmProvider.getChangeCount();
-      Logger.debug(`scmProvider.getChangeCount: number of changes is "${changes}"`);
-      expect(changes).eql(1);
-    });
+			test('Commit the changes', async function (): Promise<void> {
+				Logger.debug(`scmProvider.commitChanges: commit name "Commit ${changesToCommit}"`);
+				await scmProvider.commitChanges('Commit ' + changesToCommit);
+				await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
+				await driverHelper.wait(timeToRefresh);
+				Logger.debug(`scmProvider.takeAction: "${refreshButtonLabel}"`);
+				await scmProvider.takeAction(refreshButtonLabel);
+				// wait while changes counter will be refreshed
+				await driverHelper.wait(timeToRefresh);
+				const changes: number = await scmProvider.getChangeCount();
+				Logger.debug(`scmProvider.getChangeCount: number of changes is "${changes}"`);
+				expect(changes).eql(0);
+			});
 
-    test('Stage the changes', async function(): Promise<void> {
-      await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
-      Logger.debug(`scmProvider.openMoreActions`);
-      scmContextMenu = await scmProvider.openMoreActions();
-      await driverHelper.waitVisibility(webCheCodeLocators.ContextMenu.contextView);
-      Logger.debug(`scmContextMenu.select: "Changes" -> "Stage All Changes"`);
-      await scmContextMenu.select('Changes', 'Stage All Changes');
-    });
+			test('Push the changes', async function (): Promise<void> {
+				await driverHelper.waitVisibility(
+					webCheCodeLocators.ScmView.actionConstructor(
+						`Push 1 commits to origin/${FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_REPO_BRANCH}`
+					)
+				);
+				await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
+				Logger.debug('scmProvider.openMoreActions');
+				scmContextMenu = await scmProvider.openMoreActions();
+				await driverHelper.waitVisibility(webCheCodeLocators.ContextMenu.itemConstructor(pushItemLabel));
+				Logger.debug(`scmContextMenu.select: "${pushItemLabel}"`);
+				await scmContextMenu.select(pushItemLabel);
+			});
 
-    test('Commit the changes', async function(): Promise<void> {
-      await driverHelper.waitVisibility(webCheCodeLocators.ScmView.actionConstructor(commitChangesButtonLabel));
-      Logger.debug(`scmProvider.commitChanges: commit name "Commit ${changesToCommit}"`);
-      await scmProvider.commitChanges('Commit ' + changesToCommit);
-      await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
-      await driverHelper.wait(timeToRefresh);
-      Logger.debug(`scmProvider.takeAction: "${refreshButtonLabel}"`);
-      await scmProvider.takeAction(refreshButtonLabel);
-      // wait while changes counter will be refreshed
-      await driverHelper.wait(timeToRefresh);
-      const changes: number = await scmProvider.getChangeCount();
-      Logger.debug(`scmProvider.getChangeCount: number of changes is "${changes}"`);
-      expect(changes).eql(0);
-    });
-
-    test('Push the changes', async function(): Promise<void> {
-      await driverHelper.waitVisibility(webCheCodeLocators.ScmView.actionConstructor(`Push 1 commits to origin/${FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_REPO_BRANCH}`));
-      await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
-      Logger.debug(`scmProvider.openMoreActions`);
-      scmContextMenu = await scmProvider.openMoreActions();
-      await driverHelper.waitVisibility(webCheCodeLocators.ContextMenu.itemConstructor(pushItemLabel));
-      Logger.debug(`scmContextMenu.select: "${pushItemLabel}"`);
-      await scmContextMenu.select(pushItemLabel);
-    });
-
-    test('Insert git credentials which were asked after push', async function(): Promise<void> {
-      try {
-        await driverHelper.waitVisibility(webCheCodeLocators.InputBox.message);
-      } catch (e) {
-        Logger.info(`Workspace did not ask credentials before push - ${e};
+			test('Insert git credentials which were asked after push', async function (): Promise<void> {
+				try {
+					await driverHelper.waitVisibility(webCheCodeLocators.InputBox.message);
+				} catch (e) {
+					Logger.info(`Workspace did not ask credentials before push - ${e};
                 Known issue for github.com - https://issues.redhat.com/browse/CRW-4066, please check if not other git provider. `);
-        expect(FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER).eqls(GitProviderType.GITHUB);
-      }
-      const input: InputBox = new InputBox();
-      await input.setText(OAuthConstants.TS_SELENIUM_GIT_PROVIDER_USERNAME);
-      await input.confirm();
-      await driverHelper.wait(timeToRefresh);
-      await input.setText(OAuthConstants.TS_SELENIUM_GIT_PROVIDER_PASSWORD);
-      await input.confirm();
-      await driverHelper.wait(timeToRefresh);
-    });
+					expect(FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_PROVIDER).eqls(GitProviderType.GITHUB);
+				}
+				const input: InputBox = new InputBox();
+				await input.setText(OAUTH_CONSTANTS.TS_SELENIUM_GIT_PROVIDER_USERNAME);
+				await input.confirm();
+				await driverHelper.wait(timeToRefresh);
+				await input.setText(OAUTH_CONSTANTS.TS_SELENIUM_GIT_PROVIDER_PASSWORD);
+				await input.confirm();
+				await driverHelper.wait(timeToRefresh);
+			});
 
-    test('Check if the changes were pushed', async function(): Promise<void> {
-      try {
-        Logger.debug(`scmProvider.takeAction: "${refreshButtonLabel}"`);
-        await scmProvider.takeAction(refreshButtonLabel);
-      } catch (e) {
-        Logger.info('Check you use correct credentials.' +
-          'For bitbucket.org ensure you use an app password: https://support.atlassian.com/bitbucket-cloud/docs/using-app-passwords/;' +
-          'For github.com - personal access token instead of password.');
-      }
-      const isCommitButtonDisabled: string = await driverHelper.waitAndGetElementAttribute(webCheCodeLocators.ScmView.actionConstructor(commitChangesButtonLabel), 'aria-disabled');
-      expect(isCommitButtonDisabled).eql('true');
-    });
-  }
+			test('Check if the changes were pushed', async function (): Promise<void> {
+				try {
+					Logger.debug(`scmProvider.takeAction: "${refreshButtonLabel}"`);
+					await scmProvider.takeAction(refreshButtonLabel);
+				} catch (e) {
+					Logger.info(
+						'Check you use correct credentials.' +
+							'For bitbucket.org ensure you use an app password: https://support.atlassian.com/bitbucket-cloud/docs/using-app-passwords/;' +
+							'For github.com - personal access token instead of password.'
+					);
+				}
+				const isCommitButtonDisabled: string = await driverHelper.waitAndGetElementAttribute(
+					webCheCodeLocators.ScmView.actionConstructor(commitChangesButtonLabel),
+					'aria-disabled'
+				);
+				expect(isCommitButtonDisabled).eql('true');
+			});
+		}
 
-  test('Stop the workspace', async function(): Promise<void> {
-    await workspaceHandlingTests.stopWorkspace(WorkspaceHandlingTests.getWorkspaceName());
-    await browserTabsUtil.closeAllTabsExceptCurrent();
-  });
+		test('Stop the workspace', async function (): Promise<void> {
+			await workspaceHandlingTests.stopWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+			await browserTabsUtil.closeAllTabsExceptCurrent();
+		});
 
-  test('Delete the workspace', async function(): Promise<void> {
-    await workspaceHandlingTests.removeWorkspace(WorkspaceHandlingTests.getWorkspaceName());
-  });
+		test('Delete the workspace', async function (): Promise<void> {
+			await workspaceHandlingTests.removeWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+		});
 
-  loginTests.logoutFromChe();
-});
+		loginTests.logoutFromChe();
+	}
+);

package/specs/miscellaneous/PredefinedNamespace.spec.ts

@@ -1,78 +1,84 @@
+/** *******************************************************************
+ * copyright (c) 2023 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ **********************************************************************/
 import { e2eContainer } from '../../configs/inversify.config';
-import { assert } from 'chai';
+import { expect } from 'chai';
 import { CLASSES } from '../../configs/inversify.types';
 import { WorkspaceHandlingTests } from '../../tests-library/WorkspaceHandlingTests';
 import { Logger } from '../../utils/Logger';
 import { LoginTests } from '../../tests-library/LoginTests';
 import { registerRunningWorkspace } from '../MochaHooks';
+import { KubernetesCommandLineToolsExecutor } from '../../utils/KubernetesCommandLineToolsExecutor';
+import { ShellExecutor } from '../../utils/ShellExecutor';
 
-const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
-const util: any = require('node:util');
-const exec: any = util.promisify(require('node:child_process').exec);
-const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
-const predefinedNamespaceName: string = 'predefined-ns';
+suite('Create predefined workspace and check it', function (): void {
+	const predefinedNamespaceName: string = 'predefined-ns';
+	const stackName: string = 'Empty Workspace';
 
-async function runShellScript(shellCommandToExecution: string): Promise<string> {
-  const { stdout, stderr } = await exec(shellCommandToExecution);
-  console.log(stdout);
-  console.error(stderr);
-  return stdout;
-}
+	const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
+	const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
+	const kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor = e2eContainer.get(
+		CLASSES.KubernetesCommandLineToolsExecutor
+	);
+	const shellExecutor: ShellExecutor = e2eContainer.get(CLASSES.ShellExecutor);
 
-suite(`Create predefined workspace and check it `, async function(): Promise<void> {
-  let workspaceName: string = '';
+	suiteSetup(function (): void {
+		// create a predefined namespace for user using shell script and login into user dashboard
+		Logger.info('Test prerequisites:');
+		Logger.info(
+			' (1) there is OCP user with username and user password that have been set in the TS_SELENIUM_OCP_USERNAME and TS_SELENIUM_OCP_PASSWORD variables'
+		);
+		Logger.info(' (2) "oc" client installed and logged into test OCP cluster with admin rights.');
+		kubernetesCommandLineToolsExecutor.loginToOcp('admin');
+		const predefinedProjectConfiguration: string =
+			'kind: Namespace\n' +
+			'apiVersion: v1\n' +
+			'metadata:\n' +
+			`  name: ${predefinedNamespaceName}\n` +
+			'  labels:\n' +
+			'    app.kubernetes.io/part-of: che.eclipse.org\n' +
+			'    app.kubernetes.io/component: workspaces-namespace\n' +
+			'  annotations:\n' +
+			'    che.eclipse.org/username: user';
+		kubernetesCommandLineToolsExecutor.applyWithoutNamespace(predefinedProjectConfiguration);
+		const setEditRightsForUser: string = `oc adm policy add-role-to-user edit user -n ${predefinedNamespaceName}`;
+		shellExecutor.executeCommand(setEditRightsForUser);
+	});
 
-  const setEditRightsForUser: string = `oc adm policy add-role-to-user edit user -n ${predefinedNamespaceName}`;
-  const getDevWorkspaceFromPredefinedNameSpace: string = `oc get dw -n ${predefinedNamespaceName}`;
-  const deletePredefinedNamespace: string = `oc delete project ${predefinedNamespaceName}`;
-  const createPredefinedProjectCommand: string = 'cat <<EOF | oc apply -f - \n' +
-    'kind: Namespace\n' +
-    'apiVersion: v1\n' +
-    'metadata:\n' +
-    `  name: ${predefinedNamespaceName}\n` +
-    '  labels:\n' +
-    '    app.kubernetes.io/part-of: che.eclipse.org\n' +
-    '    app.kubernetes.io/component: workspaces-namespace\n' +
-    '  annotations:\n' +
-    '    che.eclipse.org/username: user\n' +
-    'EOF';
-  // create a predefined namespace for user using shell script and login into user dashboard
-  suiteSetup(async function(): Promise<void> {
-    Logger.info('Test prerequisites:');
-    Logger.info(' (1) there is OCP user with username and user password that have been set in the TS_SELENIUM_OCP_USERNAME and TS_SELENIUM_OCP_PASSWORD variables');
-    Logger.info(' (2) \'oc\' client installed and logged into test OCP cluster with admin rights.');
+	suiteTeardown(function (): void {
+		const workspaceName: string = WorkspaceHandlingTests.getWorkspaceName();
+		try {
+			kubernetesCommandLineToolsExecutor.deleteDevWorkspace();
+			kubernetesCommandLineToolsExecutor.deleteProject(predefinedNamespaceName);
+		} catch (e) {
+			Logger.error(`Cannot remove the predefined project: ${workspaceName}, please fix it manually: ${e}`);
+		}
+	});
 
-    await runShellScript(createPredefinedProjectCommand);
-    await runShellScript(setEditRightsForUser);
-  });
+	loginTests.loginIntoChe('user');
+	// create the Empty workspace using CHE Dashboard
+	test(`Create and open new workspace, stack:${stackName}`, async function (): Promise<void> {
+		await workspaceHandlingTests.createAndOpenWorkspace(stackName);
+	});
+	test('Obtain workspace name from workspace loader page', async function (): Promise<void> {
+		await workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
+	});
 
-  suiteTeardown(async (): Promise<void> => {
-    const workspaceName: string = WorkspaceHandlingTests.getWorkspaceName();
-    try {
-      await runShellScript(deletePredefinedNamespace);
-    } catch (e) {
-      Logger.error(`Cannot remove the predefined project: ${workspaceName}, please fix it manually: ${e}`);
-    }
-  });
+	// verify that just created workspace with unique name is present in the predefined namespace
+	test('Validate the created workspace is present in predefined namespace', function (): void {
+		const workspaceName: string = WorkspaceHandlingTests.getWorkspaceName();
+		registerRunningWorkspace(workspaceName);
+		kubernetesCommandLineToolsExecutor.workspaceName = workspaceName;
+		kubernetesCommandLineToolsExecutor.namespace = predefinedNamespaceName;
+		const ocDevWorkspaceOutput: string = kubernetesCommandLineToolsExecutor.getDevWorkspaceYamlConfiguration();
+		expect(ocDevWorkspaceOutput).includes(workspaceName);
+	});
 
-  loginTests.loginIntoChe();
-  // create the Empty workspace using CHE Dashboard
-  test(`Create and open new workspace, stack:${'Empty Workspace'}`, async function(): Promise<void> {
-    await workspaceHandlingTests.createAndOpenWorkspace('Empty Workspace');
-  });
-  test('Obtain workspace name from workspace loader page', async function(): Promise<void> {
-    await workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
-  });
-
-  // verify that just created workspace with unique name is present in the predefined namespace
-  test('Validate the created workspace is present in predefined namespace', async function(): Promise<void> {
-    workspaceName = WorkspaceHandlingTests.getWorkspaceName();
-    registerRunningWorkspace(workspaceName);
-    const ocDevWorkspaceOutput: string = await runShellScript(getDevWorkspaceFromPredefinedNameSpace);
-    await assert.isTrue(ocDevWorkspaceOutput.includes(workspaceName));
-  });
-
-  loginTests.logoutFromChe();
+	loginTests.logoutFromChe();
 });
-
-