@eclipse-che/che-e2e 7.74.0-dev-41d1364 → 7.74.0-dev-aace77a

package/specs/api/DevfileAcceptanceTestAPI.spec.ts

@@ -7,14 +7,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
-import { KubernetesCommandLineToolsExecutor } from '../../utils/KubernetesCommandLineToolsExecutor';
+import { ContainerTerminal, KubernetesCommandLineToolsExecutor } from '../../utils/KubernetesCommandLineToolsExecutor';
 import { DevWorkspaceConfigurationHelper } from '../../utils/DevWorkspaceConfigurationHelper';
 import { ShellString } from 'shelljs';
 import { expect } from 'chai';
 import { DevfileContext } from '@eclipse-che/che-devworkspace-generator/lib/api/devfile-context';
 import { StringUtil } from '../../utils/StringUtil';
-// import { DevfilesRegistryHelper } from '../../utils/DevfilesRegistryHelper';
 import { Logger } from '../../utils/Logger';
+import { e2eContainer } from '../../configs/inversify.config';
+import { CLASSES } from '../../configs/inversify.types';
 
 /**
  * dynamically generating tests
@@ -23,7 +24,8 @@ import { Logger } from '../../utils/Logger';
 // todo: skipped while don`t use to avoid sending useless requests
 // eslint-disable-next-line @typescript-eslint/require-await
 void (async function (): Promise<void> {
-	// const devfilesRegistryHelper: DevfilesRegistryHelper = new DevfilesRegistryHelper();
+	// const devfilesRegistryHelper: DevfilesRegistryHelper = e2eContainer.get(CLASSES.DevfilesRegistryHelper);
+
 	const devfileSamples: any = [];
 	// devfileSamples = await devfilesRegistryHelper.collectPathsToDevfilesFromRegistry();
 
@@ -33,7 +35,7 @@ void (async function (): Promise<void> {
 			this.timeout(1500000); // 25 minutes because build of Quarkus sample takes 20+ minutes
 			let devWorkspaceConfigurationHelper: DevWorkspaceConfigurationHelper;
 			let kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor;
-			let containerTerminal: KubernetesCommandLineToolsExecutor.ContainerTerminal;
+			let containerTerminal: ContainerTerminal;
 			let devfileContext: DevfileContext;
 			let devWorkspaceName: string | undefined;
 			let clonedProjectName: string;
@@ -46,9 +48,9 @@ void (async function (): Promise<void> {
 				});
 				devfileContext = await devWorkspaceConfigurationHelper.generateDevfileContext();
 				devWorkspaceName = devfileContext?.devWorkspace?.metadata?.name;
-
-				kubernetesCommandLineToolsExecutor = new KubernetesCommandLineToolsExecutor(devWorkspaceName);
-				containerTerminal = new KubernetesCommandLineToolsExecutor.ContainerTerminal(kubernetesCommandLineToolsExecutor);
+				kubernetesCommandLineToolsExecutor = e2eContainer.get(CLASSES.KubernetesCommandLineToolsExecutor);
+				kubernetesCommandLineToolsExecutor.workspaceName = devWorkspaceName;
+				containerTerminal = e2eContainer.get(CLASSES.ContainerTerminal);
 				kubernetesCommandLineToolsExecutor.loginToOcp();
 			});
 

package/specs/api/EmptyWorkspaceAPI.spec.ts

@@ -7,7 +7,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
-import { KubernetesCommandLineToolsExecutor } from '../../utils/KubernetesCommandLineToolsExecutor';
+import { ContainerTerminal, KubernetesCommandLineToolsExecutor } from '../../utils/KubernetesCommandLineToolsExecutor';
 import { expect } from 'chai';
 import { ShellString } from 'shelljs';
 import { StringUtil } from '../../utils/StringUtil';
@@ -15,6 +15,8 @@ import { DevWorkspaceConfigurationHelper } from '../../utils/DevWorkspaceConfigu
 import { DevfileContext } from '@eclipse-che/che-devworkspace-generator/lib/api/devfile-context';
 import { API_TEST_CONSTANTS } from '../../constants/API_TEST_CONSTANTS';
 import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
+import { e2eContainer } from '../../configs/inversify.config';
+import { CLASSES } from '../../configs/inversify.types';
 
 suite('Empty workspace API test', function (): void {
 	// works only for root user
@@ -25,7 +27,7 @@ suite('Empty workspace API test', function (): void {
 	let kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor;
 	let devfileContext: DevfileContext;
 	let devWorkspaceName: string | undefined;
-	let containerTerminal: KubernetesCommandLineToolsExecutor.ContainerTerminal;
+	let containerTerminal: ContainerTerminal;
 
 	const gitRepository: string = 'https://github.com/crw-qe/web-nodejs-sample';
 
@@ -38,8 +40,10 @@ suite('Empty workspace API test', function (): void {
 		});
 		devfileContext = await devWorkspaceConfigurationHelper.generateDevfileContext();
 		devWorkspaceName = devfileContext?.devWorkspace?.metadata?.name;
-		kubernetesCommandLineToolsExecutor = new KubernetesCommandLineToolsExecutor(devWorkspaceName, namespace);
-		containerTerminal = new KubernetesCommandLineToolsExecutor.ContainerTerminal(kubernetesCommandLineToolsExecutor);
+		kubernetesCommandLineToolsExecutor = e2eContainer.get(CLASSES.KubernetesCommandLineToolsExecutor);
+		kubernetesCommandLineToolsExecutor.workspaceName = devWorkspaceName;
+		kubernetesCommandLineToolsExecutor.namespace = namespace;
+		containerTerminal = e2eContainer.get(CLASSES.ContainerTerminal);
 	});
 
 	test('Create empty workspace', function (): void {

package/specs/api/PodOverridesAPI.spec.ts

@@ -14,14 +14,19 @@ import YAML from 'yaml';
 import { expect } from 'chai';
 import { ShellExecutor } from '../../utils/ShellExecutor';
 import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
+import { e2eContainer } from '../../configs/inversify.config';
+import { CLASSES } from '../../configs/inversify.types';
 
 suite('Test defining pod overrides via attribute.', function (): void {
 	const pathToSampleFile: string = path.resolve(
 		`resources/pod-overrides${BASE_TEST_CONSTANTS.IS_CLUSTER_DISCONNECTED() ? '-airgap' : ''}.yaml`
 	);
 	const workspaceName: string = YAML.parse(fs.readFileSync(pathToSampleFile, 'utf8')).metadata.name;
-	const kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor = new KubernetesCommandLineToolsExecutor(workspaceName);
-
+	const kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor = e2eContainer.get(
+		CLASSES.KubernetesCommandLineToolsExecutor
+	);
+	kubernetesCommandLineToolsExecutor.workspaceName = workspaceName;
+	const shellExecutor: ShellExecutor = e2eContainer.get(CLASSES.ShellExecutor);
 	suiteSetup('Login into OC client', function (): void {
 		kubernetesCommandLineToolsExecutor.loginToOcp();
 	});
@@ -32,7 +37,7 @@ suite('Test defining pod overrides via attribute.', function (): void {
 
 	test('Apply pod-overrides sample as DevWorkspace with OC client', function (): void {
 		kubernetesCommandLineToolsExecutor.applyYamlConfigurationAsFile(pathToSampleFile);
-		ShellExecutor.wait(5);
+		shellExecutor.wait(5);
 	});
 
 	test('Check that fields are overridden in the Deployment for DevWorkspace', function (): void {

package/specs/dashboard-samples/EmptyWorkspace.spec.ts

@@ -17,14 +17,14 @@ import { LoginTests } from '../../tests-library/LoginTests';
 import { registerRunningWorkspace } from '../MochaHooks';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 
-const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
-const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
-const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
-const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
-
 const stackName: string = 'Empty Workspace';
 
 suite(`${stackName} test`, function (): void {
+	const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
+	const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
+	const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
+	const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
+
 	loginTests.loginIntoChe();
 
 	test(`Create and open new workspace, stack:${stackName}`, async function (): Promise<void> {

package/specs/dashboard-samples/Quarkus.spec.ts

@@ -19,17 +19,18 @@ import { Logger } from '../../utils/Logger';
 import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 
-const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
-const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
-const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
-const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
-
 const stackName: string = 'Java 11 with Quarkus';
-const projectName: string = 'quarkus-quickstarts';
 
 suite(`The ${stackName} userstory`, function (): void {
+	const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
+	const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
+	const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
+	const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
+
 	let projectSection: ViewSection;
 
+	const projectName: string = 'quarkus-quickstarts';
+
 	loginTests.loginIntoChe();
 
 	test(`Create and open new workspace, stack:${stackName}`, async function (): Promise<void> {

package/specs/dashboard-samples/RecommendedExtensions.spec.ts

@@ -37,16 +37,17 @@ import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 import { PLUGIN_TEST_CONSTANTS } from '../../constants/PLUGIN_TEST_CONSTANTS';
 import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
 
-const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
-const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
-const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
-const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
-
-const webCheCodeLocators: Locators = new CheCodeLocatorLoader().webCheCodeLocators;
 const samples: string[] = PLUGIN_TEST_CONSTANTS.TS_SAMPLE_LIST.split(',');
-const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 
 suite(`Check if recommended extensions installed for ${samples}`, function (): void {
+	const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
+	const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
+	const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
+	const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
+	const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
+	const cheCodeLocatorLoader: CheCodeLocatorLoader = e2eContainer.get(CLASSES.CheCodeLocatorLoader);
+	const webCheCodeLocators: Locators = cheCodeLocatorLoader.webCheCodeLocators;
+
 	let projectSection: ViewSection;
 	let extensionsView: SideBarView | undefined;
 	let extensionSection: ExtensionsViewSection;

package/specs/devconsole-intergration/DevConsoleIntegration.spec.ts

@@ -25,18 +25,19 @@ import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
 import { ITestWorkspaceUtil } from '../../utils/workspace/ITestWorkspaceUtil';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 
-const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
-const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
-const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
-const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
-const ocpMainPage: OcpMainPage = e2eContainer.get(CLASSES.OcpMainPage);
-const testWorkspaceUtil: ITestWorkspaceUtil = e2eContainer.get(TYPES.WorkspaceUtil);
-
-let ocpImportPage: OcpImportFromGitPage;
-let ocpApplicationPage: OcpApplicationPage;
-const kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor = new KubernetesCommandLineToolsExecutor();
-
 suite('DevConsole Integration', function (): void {
+	let ocpImportPage: OcpImportFromGitPage;
+	let ocpApplicationPage: OcpApplicationPage;
+
+	const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
+	const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
+	const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
+	const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
+	const ocpMainPage: OcpMainPage = e2eContainer.get(CLASSES.OcpMainPage);
+	const testWorkspaceUtil: ITestWorkspaceUtil = e2eContainer.get(TYPES.WorkspaceUtil);
+	const kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor = e2eContainer.get(
+		CLASSES.KubernetesCommandLineToolsExecutor
+	);
 	// test specific data
 	const gitImportRepo: string = 'https://github.com/crw-qe/summit-lab-spring-music.git';
 	const gitImportReference: string = 'pipeline';

package/specs/factory/Factory.spec.ts

@@ -28,7 +28,6 @@ import {
 import { expect } from 'chai';
 import { OauthPage } from '../../pageobjects/git-providers/OauthPage';
 import { StringUtil } from '../../utils/StringUtil';
-import { CheCodeLocatorLoader } from '../../pageobjects/ide/CheCodeLocatorLoader';
 import { registerRunningWorkspace } from '../MochaHooks';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 import { WorkspaceHandlingTests } from '../../tests-library/WorkspaceHandlingTests';
@@ -41,18 +40,16 @@ import { OAUTH_CONSTANTS } from '../../constants/OAUTH_CONSTANTS';
 import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
 import { FACTORY_TEST_CONSTANTS } from '../../constants/FACTORY_TEST_CONSTANTS';
 
-const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
-const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
-const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
-const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
-const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
-
-const webCheCodeLocators: Locators = new CheCodeLocatorLoader().webCheCodeLocators;
-
 suite(
 	`Create a workspace via launching a factory from the ${FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_PROVIDER} repository`,
 	function (): void {
-		const oauthPage: OauthPage = new OauthPage(driverHelper);
+		const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
+		const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
+		const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
+		const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
+		const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
+		const webCheCodeLocators: Locators = e2eContainer.get(CLASSES.CheCodeLocatorLoader);
+		const oauthPage: OauthPage = e2eContainer.get(CLASSES.OauthPage);
 
 		let projectSection: ViewSection;
 		let scmProvider: SingleScmProvider;
@@ -131,7 +128,7 @@ suite(
 			Logger.debug(`sourceControl.openView: "${viewSourceControl}"`);
 			await sourceControl.openView();
 			const scmView: NewScmView = new NewScmView();
-			await driverHelper.waitVisibility(webCheCodeLocators.ScmView.actionConstructor(commitChangesButtonLabel));
+			await driverHelper.waitVisibility(webCheCodeLocators.ScmView.inputField);
 			[scmProvider, ...rest] = await scmView.getProviders();
 			Logger.debug(`scmView.getProviders: "${JSON.stringify(scmProvider)}, ${rest}"`);
 		});
@@ -158,7 +155,6 @@ suite(
 		});
 
 		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);

package/specs/factory/NoSetupRepoFactory.spec.ts

@@ -45,18 +45,18 @@ import { OAUTH_CONSTANTS } from '../../constants/OAUTH_CONSTANTS';
 import { BASE_TEST_CONSTANTS } from '../../constants/BASE_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 dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard);
-const workspaces: Workspaces = e2eContainer.get(CLASSES.Workspaces);
-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 without OAuth setup`,
 	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 dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard);
+		const workspaces: Workspaces = e2eContainer.get(CLASSES.Workspaces);
+		const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
+
 		let projectSection: ViewSection;
 		let scmProvider: SingleScmProvider;
 		let scmContextMenu: ContextMenu;
@@ -173,7 +173,7 @@ suite(
 				Logger.debug(`sourceControl.openView: "${viewSourceControl}"`);
 				await sourceControl.openView();
 				const scmView: NewScmView = new NewScmView();
-				await driverHelper.waitVisibility(webCheCodeLocators.ScmView.actionConstructor(commitChangesButtonLabel));
+				await driverHelper.waitVisibility(webCheCodeLocators.ScmView.inputField);
 				let rest: SingleScmProvider[];
 				[scmProvider, ...rest] = await scmView.getProviders();
 				Logger.debug(`scmView.getProviders: "${JSON.stringify(scmProvider)}, ${rest}"`);
@@ -201,7 +201,6 @@ suite(
 			});
 
 			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);

package/specs/factory/RefusedOAuthFactory.spec.ts

@@ -44,17 +44,16 @@ 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 oauthPage: OauthPage = new OauthPage(driverHelper);
+		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);
 
 		let projectSection: ViewSection;
 		let scmProvider: SingleScmProvider;
@@ -170,7 +169,7 @@ suite(
 				Logger.debug(`sourceControl.openView: "${viewSourceControl}"`);
 				await sourceControl.openView();
 				const scmView: NewScmView = new NewScmView();
-				await driverHelper.waitVisibility(webCheCodeLocators.ScmView.actionConstructor(commitChangesButtonLabel));
+				await driverHelper.waitVisibility(webCheCodeLocators.ScmView.inputField);
 				let rest: SingleScmProvider[];
 				[scmProvider, ...rest] = await scmView.getProviders();
 				Logger.debug(`scmView.getProviders: "${JSON.stringify(scmProvider)}, ${rest}"`);
@@ -198,7 +197,6 @@ suite(
 			});
 
 			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);

package/specs/miscellaneous/PredefinedNamespace.spec.ts

@@ -8,80 +8,76 @@
  * 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 ', function (): void {
-	let workspaceName: string = '';
-
-	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> {
+	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.');
-
-		await runShellScript(createPredefinedProjectCommand);
-		await runShellScript(setEditRightsForUser);
+		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);
 	});
 
-	suiteTeardown(async (): Promise<void> => {
+	suiteTeardown(function (): void {
 		const workspaceName: string = WorkspaceHandlingTests.getWorkspaceName();
 		try {
-			await runShellScript(deletePredefinedNamespace);
+			kubernetesCommandLineToolsExecutor.deleteDevWorkspace();
+			kubernetesCommandLineToolsExecutor.deleteProject(predefinedNamespaceName);
 		} catch (e) {
 			Logger.error(`Cannot remove the predefined project: ${workspaceName}, please fix it manually: ${e}`);
 		}
 	});
 
-	loginTests.loginIntoChe();
+	loginTests.loginIntoChe('user');
 	// 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(`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();
 	});
 
 	// 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();
+	test('Validate the created workspace is present in predefined namespace', function (): void {
+		const workspaceName: string = WorkspaceHandlingTests.getWorkspaceName();
 		registerRunningWorkspace(workspaceName);
-		const ocDevWorkspaceOutput: string = await runShellScript(getDevWorkspaceFromPredefinedNameSpace);
-		assert.isTrue(ocDevWorkspaceOutput.includes(workspaceName));
+		kubernetesCommandLineToolsExecutor.workspaceName = workspaceName;
+		kubernetesCommandLineToolsExecutor.namespace = predefinedNamespaceName;
+		const ocDevWorkspaceOutput: string = kubernetesCommandLineToolsExecutor.getDevWorkspaceYamlConfiguration();
+		expect(ocDevWorkspaceOutput).includes(workspaceName);
 	});
 
 	loginTests.logoutFromChe();

package/tests-library/LoginTests.ts

@@ -27,12 +27,12 @@ export class LoginTests {
 		@inject(CLASSES.Dashboard) private readonly dashboard: Dashboard
 	) {}
 
-	loginIntoChe(): void {
+	loginIntoChe(userName?: string, password?: string): void {
 		test('Login', async (): Promise<void> => {
 			if (!(await this.browserTabsUtil.getCurrentUrl()).includes(BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL)) {
 				await this.browserTabsUtil.navigateTo(BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL);
 			}
-			await this.productLoginPage.login();
+			await this.productLoginPage.login(userName, password);
 			await this.browserTabsUtil.maximize();
 			await this.dashboard.waitStartingPageLoaderDisappearance();
 		});
@@ -42,7 +42,7 @@ export class LoginTests {
 		test('Login into ocp console', async (): Promise<void> => {
 			const openshiftConsoleUrl: string = BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL.replace('devspaces', 'console-openshift-console');
 			await this.browserTabsUtil.navigateTo(openshiftConsoleUrl);
-			this.ocpLoginPage.login();
+			await this.ocpLoginPage.login();
 			await this.browserTabsUtil.maximize();
 		});
 	}

package/tests-library/WorkspaceHandlingTests.ts

@@ -22,7 +22,7 @@ import { By, error } from 'selenium-webdriver';
 
 @injectable()
 export class WorkspaceHandlingTests {
-	private static WORKSPACE_NAME_LOCATOR: By = By.xpath('//h1[contains(.,"Starting workspace ")]');
+	private static WORKSPACE_NAME: By = By.xpath('//h1[contains(.,"Starting workspace ")]');
 	private static workspaceName: string = 'undefined';
 	private static parentGUID: string;
 
@@ -82,7 +82,7 @@ export class WorkspaceHandlingTests {
 			try {
 				const startingWorkspaceLineContent: string = await this.driverHelper
 					.getDriver()
-					.findElement(WorkspaceHandlingTests.WORKSPACE_NAME_LOCATOR)
+					.findElement(WorkspaceHandlingTests.WORKSPACE_NAME)
 					.getText();
 				Logger.trace(`obtained starting workspace getText():${startingWorkspaceLineContent}`);
 				// cutting away leading text

package/utils/BrowserTabsUtil.ts

@@ -12,7 +12,6 @@ import { inject, injectable } from 'inversify';
 import { CLASSES } from '../configs/inversify.types';
 import { DriverHelper } from './DriverHelper';
 import { Logger } from './Logger';
-import { TIMEOUT_CONSTANTS } from '../constants/TIMEOUT_CONSTANTS';
 import { CHROME_DRIVER_CONSTANTS } from '../constants/CHROME_DRIVER_CONSTANTS';
 
 @injectable()
@@ -24,6 +23,7 @@ export class BrowserTabsUtil {
 
 	async switchToWindow(windowHandle: string): Promise<void> {
 		Logger.debug();
+
 		await this.driverHelper.getDriver().switchTo().window(windowHandle);
 	}
 
@@ -42,14 +42,7 @@ export class BrowserTabsUtil {
 	async navigateTo(url: string): Promise<void> {
 		Logger.debug(`${url}`);
 
-		await this.driverHelper.getDriver().navigate().to(url);
-	}
-
-	async navigateAndWaitToUrl(url: string, timeout: number = TIMEOUT_CONSTANTS.TS_SELENIUM_WAIT_FOR_URL): Promise<void> {
-		Logger.trace(`${url}`);
-
-		await this.navigateTo(url);
-		await this.waitURL(url, timeout);
+		await this.driverHelper.navigateToUrl(url);
 	}
 
 	async waitAndSwitchToAnotherWindow(currentWindowHandle: string, timeout: number): Promise<void> {
@@ -77,11 +70,14 @@ export class BrowserTabsUtil {
 	}
 
 	async getCurrentUrl(): Promise<string> {
+		Logger.trace();
+
 		return await this.driverHelper.getDriver().getCurrentUrl();
 	}
 
 	async waitURL(expectedUrl: string, timeout: number): Promise<void> {
 		Logger.trace(`${expectedUrl}`);
+
 		try {
 			await this.driverHelper.getDriver().wait(async (): Promise<boolean | undefined> => {
 				const currentUrl: string = await this.driverHelper.getDriver().getCurrentUrl();
@@ -98,6 +94,7 @@ export class BrowserTabsUtil {
 
 	async maximize(): Promise<void> {
 		Logger.trace();
+
 		if (CHROME_DRIVER_CONSTANTS.TS_SELENIUM_LAUNCH_FULLSCREEN) {
 			Logger.debug('TS_SELENIUM_LAUNCH_FULLSCREEN is set to true, maximizing window.');
 			await this.driverHelper.getDriver().manage().window().maximize();
@@ -106,6 +103,7 @@ export class BrowserTabsUtil {
 
 	async closeAllTabsExceptCurrent(): Promise<void> {
 		Logger.trace();
+
 		const allTabsHandles: string[] = await this.getAllWindowHandles();
 		const currentTabHandle: string = await this.getCurrentWindowHandle();
 		allTabsHandles.splice(allTabsHandles.indexOf(currentTabHandle), 1);