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

package/specs/api/ContainerOverridesAPI.spec.ts

@@ -1,38 +1,51 @@
+/** *******************************************************************
+ * 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 { KubernetesCommandLineToolsExecutor } from '../../utils/KubernetesCommandLineToolsExecutor';
 import fs from 'fs';
 import path from 'path';
 import YAML from 'yaml';
 import { expect } from 'chai';
 import { ShellExecutor } from '../../utils/ShellExecutor';
+import { e2eContainer } from '../../configs/inversify.config';
+import { CLASSES } from '../../configs/inversify.types';
 
-suite(`Test defining container overrides via attribute.`, async function(): Promise<void> {
-  const pathToSampleFile: string = path.resolve('resources/container-overrides.yaml');
-  const workspaceName: string = YAML.parse(fs.readFileSync(pathToSampleFile, 'utf8')).metadata.name;
-  const kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor = new KubernetesCommandLineToolsExecutor(workspaceName);
+suite('Test defining container overrides via attribute.', function (): void {
+	const pathToSampleFile: string = path.resolve('resources/container-overrides.yaml');
+	const workspaceName: string = YAML.parse(fs.readFileSync(pathToSampleFile, 'utf8')).metadata.name;
+	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();
-  });
+	suiteSetup('Login into OC client', function (): void {
+		kubernetesCommandLineToolsExecutor.loginToOcp();
+	});
 
-  suiteTeardown('Delete DevWorkspace', function(): void {
-    kubernetesCommandLineToolsExecutor.deleteDevWorkspace();
-  });
+	suiteTeardown('Delete DevWorkspace', function (): void {
+		kubernetesCommandLineToolsExecutor.deleteDevWorkspace();
+	});
 
-  test('Apply container-overrides sample as DevWorkspace with OC client', function(): void {
-    kubernetesCommandLineToolsExecutor.applyYamlConfigurationAsFile(pathToSampleFile);
-    ShellExecutor.wait(5);
-  });
+	test('Apply container-overrides sample as DevWorkspace with OC client', function (): void {
+		kubernetesCommandLineToolsExecutor.applyYamlConfigurationAsFile(pathToSampleFile);
+		shellExecutor.wait(5);
+	});
 
-  test('Check that fields are overridden in the Deployment for DevWorkspace', function(): void {
-    const devWorkspaceFullYamlOutput: any = YAML.parse(kubernetesCommandLineToolsExecutor.getDevWorkspaceYamlConfiguration());
-    expect(devWorkspaceFullYamlOutput.spec.template.components[0].attributes['container-overrides']).eqls({
-      resources: {
-        limits: {
-          'nvidia.com/gpu': '1'
-        }
-      }
-    });
-  });
+	test('Check that fields are overridden in the Deployment for DevWorkspace', function (): void {
+		const devWorkspaceFullYamlOutput: any = YAML.parse(kubernetesCommandLineToolsExecutor.getDevWorkspaceYamlConfiguration());
+		expect(devWorkspaceFullYamlOutput.spec.template.components[0].attributes['container-overrides']).eqls({
+			resources: {
+				limits: {
+					'nvidia.com/gpu': '1'
+				}
+			}
+		});
+	});
 });
-
-

package/specs/api/DevfileAcceptanceTestAPI.spec.ts

@@ -1,108 +1,121 @@
-import { KubernetesCommandLineToolsExecutor } from '../../utils/KubernetesCommandLineToolsExecutor';
+/** *******************************************************************
+ * 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 { 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
+ * dynamically generating tests
  * info: https://mochajs.org/#delayed-root-suite
  */
-
-(async function(): Promise<void> {
-
-  // todo: skipped while don`t use to avoid sending useless requests
-  // const devfilesRegistryHelper: DevfilesRegistryHelper = new DevfilesRegistryHelper();
-  const devfileSamples: any = [];
-  // devfileSamples = await devfilesRegistryHelper.collectPathsToDevfilesFromRegistry();
-
-  for (const devfileSample of devfileSamples) {
-    suite.skip(`Devfile acceptance test suite for ${devfileSample.name}`, async function(): Promise<void> {
-      this.bail(false);
-      this.timeout(1500000); // 25 minutes because build of Quarkus sample takes 20+ minutes
-      let devWorkspaceConfigurationHelper: DevWorkspaceConfigurationHelper;
-      let kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor;
-      let containerTerminal: KubernetesCommandLineToolsExecutor.ContainerTerminal;
-      let devfileContext: DevfileContext;
-      let devWorkspaceName: string | undefined;
-      let clonedProjectName: string;
-      let containerWorkDir: string;
-      let devfilesBuildCommands: any[] = [];
-
-      test('Get DevWorkspace configuration', async function(): Promise<void> {
-        devWorkspaceConfigurationHelper = new DevWorkspaceConfigurationHelper({
-          devfileUrl: devfileSample.link
-        });
-        devfileContext = await devWorkspaceConfigurationHelper.generateDevfileContext();
-        devWorkspaceName = devfileContext?.devWorkspace?.metadata?.name;
-
-        kubernetesCommandLineToolsExecutor = new KubernetesCommandLineToolsExecutor(devWorkspaceName);
-        containerTerminal = new KubernetesCommandLineToolsExecutor.ContainerTerminal(kubernetesCommandLineToolsExecutor);
-        kubernetesCommandLineToolsExecutor.loginToOcp();
-      });
-
-      test('Collect build commands from the devfile', async function(): Promise<void> {
-        if (devfileContext.devfile.commands === undefined) {
-          Logger.info(`Devfile does not contains any commands.`);
-        } else {
-          devfileContext.devfile.commands.forEach((command: any) => {
-            if (command.exec?.group?.kind === 'build') {
-              Logger.debug(`Build command found: ${command.exec.commandLine}`);
-              devfilesBuildCommands.push(command);
-            }
-          });
-        }
-      });
-
-      test('Create DevWorkspace', async function(): Promise<void> {
-        const devWorkspaceConfigurationYamlString: string = await devWorkspaceConfigurationHelper.getDevWorkspaceConfigurationYamlAsString(devfileContext);
-        const applyOutput: ShellString = kubernetesCommandLineToolsExecutor.applyYamlConfigurationAsStringOutput(devWorkspaceConfigurationYamlString);
-
-        expect(applyOutput.stdout)
-          .contains('devworkspacetemplate')
-          .and.contains('devworkspace')
-          .and.contains.oneOf(['created', 'configured']);
-
-      });
-
-      test('Wait until DevWorkspace has status "ready"', async function(): Promise<void> {
-        expect(kubernetesCommandLineToolsExecutor.waitDevWorkspace().stdout).contains('condition met');
-      });
-
-      test('Check if project was created', function(): void {
-        clonedProjectName = StringUtil.getProjectNameFromGitUrl(devfileSample.link);
-        expect(containerTerminal.ls().stdout).includes(clonedProjectName);
-      });
-
-      test('Check if project files are imported', function(): void {
-        containerWorkDir = containerTerminal.pwd().stdout.replace('\n', '');
-        expect(containerTerminal.ls(`${containerWorkDir}/${clonedProjectName}`).stdout).includes(`devfile.yaml`);
-      });
-
-      test(`Check if build commands returns success`, function(): void {
-        if (devfilesBuildCommands.length === 0) {
-          Logger.info(`Devfile does not contains build commands.`);
-        } else {
-          devfilesBuildCommands.forEach((command) => {
-            Logger.info(`command.exec: ${JSON.stringify(command.exec)}`);
-
-            const commandString: string = StringUtil.updateCommandEnvsToShStyle(`cd ${command.exec.workingDir} && ${command.exec.commandLine}`);
-            Logger.info(`Full build command to be executed: ${commandString}`);
-
-            const output: ShellString = containerTerminal.executeCommand(commandString, command.exec.component);
-            expect(output.code).eqls(0);
-          });
-        }
-      });
-
-      test('Delete DevWorkspace', async function(): Promise<void> {
-        kubernetesCommandLineToolsExecutor.deleteDevWorkspace();
-      });
-    });
-  }
-
-  run();
+// 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 = e2eContainer.get(CLASSES.DevfilesRegistryHelper);
+
+	const devfileSamples: any = [];
+	// devfileSamples = await devfilesRegistryHelper.collectPathsToDevfilesFromRegistry();
+
+	for (const devfileSample of devfileSamples) {
+		suite.skip(`Devfile acceptance test suite for ${devfileSample.name}`, function (): void {
+			this.bail(false);
+			this.timeout(1500000); // 25 minutes because build of Quarkus sample takes 20+ minutes
+			let devWorkspaceConfigurationHelper: DevWorkspaceConfigurationHelper;
+			let kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor;
+			let containerTerminal: ContainerTerminal;
+			let devfileContext: DevfileContext;
+			let devWorkspaceName: string | undefined;
+			let clonedProjectName: string;
+			let containerWorkDir: string;
+			const devfilesBuildCommands: any[] = [];
+
+			test('Get DevWorkspace configuration', async function (): Promise<void> {
+				devWorkspaceConfigurationHelper = new DevWorkspaceConfigurationHelper({
+					devfileUrl: devfileSample.link
+				});
+				devfileContext = await devWorkspaceConfigurationHelper.generateDevfileContext();
+				devWorkspaceName = devfileContext?.devWorkspace?.metadata?.name;
+				kubernetesCommandLineToolsExecutor = e2eContainer.get(CLASSES.KubernetesCommandLineToolsExecutor);
+				kubernetesCommandLineToolsExecutor.workspaceName = devWorkspaceName;
+				containerTerminal = e2eContainer.get(CLASSES.ContainerTerminal);
+				kubernetesCommandLineToolsExecutor.loginToOcp();
+			});
+
+			test('Collect build commands from the devfile', function (): void {
+				if (devfileContext.devfile.commands === undefined) {
+					Logger.info('Devfile does not contains any commands.');
+				} else {
+					devfileContext.devfile?.commands?.forEach((command: any): void => {
+						if (command.exec?.group?.kind === 'build') {
+							Logger.debug(`Build command found: ${command.exec.commandLine}`);
+							devfilesBuildCommands.push(command);
+						}
+					});
+				}
+			});
+
+			test('Create DevWorkspace', function (): void {
+				const devWorkspaceConfigurationYamlString: string =
+					devWorkspaceConfigurationHelper.getDevWorkspaceConfigurationYamlAsString(devfileContext);
+				const applyOutput: ShellString =
+					kubernetesCommandLineToolsExecutor.applyYamlConfigurationAsStringOutput(devWorkspaceConfigurationYamlString);
+
+				expect(applyOutput.stdout)
+					.contains('devworkspacetemplate')
+					.and.contains('devworkspace')
+					.and.contains.oneOf(['created', 'configured']);
+			});
+
+			test('Wait until DevWorkspace has status "ready"', function (): void {
+				expect(kubernetesCommandLineToolsExecutor.waitDevWorkspace().stdout).contains('condition met');
+			});
+
+			test('Check if project was created', function (): void {
+				clonedProjectName = StringUtil.getProjectNameFromGitUrl(devfileSample.link);
+				expect(containerTerminal.ls().stdout).includes(clonedProjectName);
+			});
+
+			test('Check if project files are imported', function (): void {
+				containerWorkDir = containerTerminal.pwd().stdout.replace('\n', '');
+				expect(containerTerminal.ls(`${containerWorkDir}/${clonedProjectName}`).stdout).includes('devfile.yaml');
+			});
+
+			test('Check if build commands returns success', function (): void {
+				if (devfilesBuildCommands.length === 0) {
+					Logger.info('Devfile does not contains build commands.');
+				} else {
+					devfilesBuildCommands.forEach((command): void => {
+						Logger.info(`command.exec: ${JSON.stringify(command.exec)}`);
+
+						const commandString: string = StringUtil.updateCommandEnvsToShStyle(
+							`cd ${command.exec.workingDir} && ${command.exec.commandLine}`
+						);
+						Logger.info(`Full build command to be executed: ${commandString}`);
+
+						const output: ShellString = containerTerminal.executeCommand(commandString, command.exec.component);
+						expect(output.code).eqls(0);
+					});
+				}
+			});
+
+			test('Delete DevWorkspace', function (): void {
+				kubernetesCommandLineToolsExecutor.deleteDevWorkspace();
+			});
+		});
+	}
+
+	run();
 })();

package/specs/api/EmptyWorkspaceAPI.spec.ts

@@ -1,74 +1,83 @@
-import { KubernetesCommandLineToolsExecutor } from '../../utils/KubernetesCommandLineToolsExecutor';
+/** *******************************************************************
+ * 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 { ContainerTerminal, KubernetesCommandLineToolsExecutor } from '../../utils/KubernetesCommandLineToolsExecutor';
 import { expect } from 'chai';
 import { ShellString } from 'shelljs';
 import { StringUtil } from '../../utils/StringUtil';
 import { DevWorkspaceConfigurationHelper } from '../../utils/DevWorkspaceConfigurationHelper';
 import { DevfileContext } from '@eclipse-che/che-devworkspace-generator/lib/api/devfile-context';
-import { APITestConstants } from '../../constants/APITestConstants';
-import { BaseTestConstants } from '../../constants/BaseTestConstants';
+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`, async function(): Promise<void> {
-  // works only for root user
-  const namespace: string = APITestConstants.TS_API_TEST_NAMESPACE;
-  let clonedProjectName: string;
-  let containerWorkDir: string;
-  let devWorkspaceConfigurationHelper: DevWorkspaceConfigurationHelper;
-  let kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor;
-  let devfileContext: DevfileContext;
-  let devWorkspaceName: string | undefined;
-  let containerTerminal: KubernetesCommandLineToolsExecutor.ContainerTerminal;
+suite('Empty workspace API test', function (): void {
+	// works only for root user
+	const namespace: string | undefined = API_TEST_CONSTANTS.TS_API_TEST_NAMESPACE;
+	let clonedProjectName: string;
+	let containerWorkDir: string;
+	let devWorkspaceConfigurationHelper: DevWorkspaceConfigurationHelper;
+	let kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor;
+	let devfileContext: DevfileContext;
+	let devWorkspaceName: string | undefined;
+	let containerTerminal: ContainerTerminal;
 
-  const gitRepository: string = 'https://github.com/crw-qe/web-nodejs-sample';
+	const gitRepository: string = 'https://github.com/crw-qe/web-nodejs-sample';
 
-  suiteSetup('Create empty workspace with OC client', async function(): Promise<void> {
-    const workspaceName: string = 'empty-' + Math.floor(Math.random() * 1000);
-    const devfileContent: string =
-      'schemaVersion: 2.2.0\n' +
-      'metadata:\n' +
-      `  name: ${workspaceName}\n`;
+	suiteSetup('Create empty workspace with OC client', async function (): Promise<void> {
+		const workspaceName: string = 'empty-' + Math.floor(Math.random() * 1000);
+		const devfileContent: string = 'schemaVersion: 2.2.0\n' + 'metadata:\n' + `  name: ${workspaceName}\n`;
 
-    devWorkspaceConfigurationHelper = new DevWorkspaceConfigurationHelper({
-      devfileContent
-    });
-    devfileContext = await devWorkspaceConfigurationHelper.generateDevfileContext();
-    devWorkspaceName = devfileContext?.devWorkspace?.metadata?.name;
-    kubernetesCommandLineToolsExecutor = new KubernetesCommandLineToolsExecutor(devWorkspaceName, namespace);
-    containerTerminal = new KubernetesCommandLineToolsExecutor.ContainerTerminal(kubernetesCommandLineToolsExecutor);
-  });
+		devWorkspaceConfigurationHelper = new DevWorkspaceConfigurationHelper({
+			devfileContent
+		});
+		devfileContext = await devWorkspaceConfigurationHelper.generateDevfileContext();
+		devWorkspaceName = devfileContext?.devWorkspace?.metadata?.name;
+		kubernetesCommandLineToolsExecutor = e2eContainer.get(CLASSES.KubernetesCommandLineToolsExecutor);
+		kubernetesCommandLineToolsExecutor.workspaceName = devWorkspaceName;
+		kubernetesCommandLineToolsExecutor.namespace = namespace;
+		containerTerminal = e2eContainer.get(CLASSES.ContainerTerminal);
+	});
 
-  test('Create empty workspace', async function(): Promise<void> {
-    kubernetesCommandLineToolsExecutor.loginToOcp();
-    const devWorkspaceConfigurationYamlString: string = await devWorkspaceConfigurationHelper.getDevWorkspaceConfigurationYamlAsString(devfileContext);
-    const output: ShellString = kubernetesCommandLineToolsExecutor.applyAndWaitDevWorkspace(devWorkspaceConfigurationYamlString);
-    expect(output.stdout).contains('condition met');
-  });
+	test('Create empty workspace', function (): void {
+		kubernetesCommandLineToolsExecutor.loginToOcp();
+		const devWorkspaceConfigurationYamlString: string =
+			devWorkspaceConfigurationHelper.getDevWorkspaceConfigurationYamlAsString(devfileContext);
+		const output: ShellString = kubernetesCommandLineToolsExecutor.applyAndWaitDevWorkspace(devWorkspaceConfigurationYamlString);
+		expect(output.stdout).contains('condition met');
+	});
 
-  suite('Clone public repo without previous setup', function(): void {
+	suite('Clone public repo without previous setup', function (): void {
+		test('Check if public repo can be cloned', function (): void {
+			containerWorkDir = containerTerminal.pwd().stdout.replace('\n', '');
+			const cloneOutput: ShellString = containerTerminal.gitClone(gitRepository);
+			expect(cloneOutput.stdout + cloneOutput.stderr).includes('Cloning');
+		});
 
-    test('Check if public repo can be cloned', function(): void {
-      containerWorkDir = containerTerminal.pwd().stdout.replace('\n', '');
-      const cloneOutput: ShellString = containerTerminal.gitClone(gitRepository);
-      expect(cloneOutput.stdout + cloneOutput.stderr).includes('Cloning');
-    });
+		test('Check if project was created', function (): void {
+			clonedProjectName = StringUtil.getProjectNameFromGitUrl(gitRepository);
+			expect(containerTerminal.ls().stdout).includes(clonedProjectName);
+		});
 
-    test('Check if project was created', function(): void {
-      clonedProjectName = StringUtil.getProjectNameFromGitUrl(gitRepository);
-      expect(containerTerminal.ls().stdout).includes(clonedProjectName);
-    });
+		test('Check if project files are imported', function (): void {
+			expect(containerTerminal.ls(`${containerWorkDir}/${clonedProjectName}`).stdout).includes(
+				BASE_TEST_CONSTANTS.TS_SELENIUM_PROJECT_ROOT_FILE_NAME
+			);
+		});
 
-    test('Check if project files are imported', function(): void {
-      expect(containerTerminal.ls(`${containerWorkDir}/${clonedProjectName}`).stdout)
-        .includes(BaseTestConstants.TS_SELENIUM_PROJECT_ROOT_FILE_NAME);
-    });
+		suiteTeardown('Delete cloned project', function (): void {
+			containerTerminal.removeFolder(`${clonedProjectName}`);
+		});
+	});
 
-    suiteTeardown('Delete cloned project', function(): void {
-      containerTerminal.removeFolder(`${clonedProjectName}`);
-    });
-  });
-
-  suiteTeardown('Delete workspace', function(): void {
-    kubernetesCommandLineToolsExecutor.deleteDevWorkspace();
-  });
+	suiteTeardown('Delete workspace', function (): void {
+		kubernetesCommandLineToolsExecutor.deleteDevWorkspace();
+	});
 });
-
-

package/specs/api/PodOverridesAPI.spec.ts

@@ -1,45 +1,59 @@
+/** *******************************************************************
+ * 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 { KubernetesCommandLineToolsExecutor } from '../../utils/KubernetesCommandLineToolsExecutor';
 import fs from 'fs';
 import path from 'path';
 import YAML from 'yaml';
 import { expect } from 'chai';
 import { ShellExecutor } from '../../utils/ShellExecutor';
-import { BaseTestConstants } from '../../constants/BaseTestConstants';
+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.`, async function(): Promise<void> {
-  const pathToSampleFile: string = path.resolve(`resources/pod-overrides${BaseTestConstants.IS_CLUSTER_DISCONNECTED() ? '-airgap' : ''}.yaml`);
-  const workspaceName: string = YAML.parse(fs.readFileSync(pathToSampleFile, 'utf8')).metadata.name;
-  const kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor = new KubernetesCommandLineToolsExecutor(workspaceName);
+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 = e2eContainer.get(
+		CLASSES.KubernetesCommandLineToolsExecutor
+	);
+	kubernetesCommandLineToolsExecutor.workspaceName = workspaceName;
+	const shellExecutor: ShellExecutor = e2eContainer.get(CLASSES.ShellExecutor);
+	suiteSetup('Login into OC client', function (): void {
+		kubernetesCommandLineToolsExecutor.loginToOcp();
+	});
 
-  suiteSetup('Login into OC client', function(): void {
-    kubernetesCommandLineToolsExecutor.loginToOcp();
-  });
+	suiteTeardown('Delete DevWorkspace', function (): void {
+		kubernetesCommandLineToolsExecutor.deleteDevWorkspace();
+	});
 
-  suiteTeardown('Delete DevWorkspace', function(): void {
-    kubernetesCommandLineToolsExecutor.deleteDevWorkspace();
-  });
+	test('Apply pod-overrides sample as DevWorkspace with OC client', function (): void {
+		kubernetesCommandLineToolsExecutor.applyYamlConfigurationAsFile(pathToSampleFile);
+		shellExecutor.wait(5);
+	});
 
-  test('Apply pod-overrides sample as DevWorkspace with OC client', function(): void {
-    kubernetesCommandLineToolsExecutor.applyYamlConfigurationAsFile(pathToSampleFile);
-    ShellExecutor.wait(5);
-  });
-
-  test('Check that fields are overridden in the Deployment for DevWorkspace', function(): void {
-    const devWorkspaceFullYamlOutput: any = YAML.parse(kubernetesCommandLineToolsExecutor.getDevWorkspaceYamlConfiguration());
-    expect(devWorkspaceFullYamlOutput.spec.template.attributes['pod-overrides']).eqls({
-      metadata: {
-        annotations: {
-          'io.kubernetes.cri-o.userns-mode': 'auto:size=65536;map-to-root=true',
-          'io.openshift.userns': 'true',
-          'openshift.io/scc': 'container-build'
-        }
-      },
-      spec: {
-        runtimeClassName: 'kata',
-        schedulerName: 'stork'
-      }
-    });
-  });
+	test('Check that fields are overridden in the Deployment for DevWorkspace', function (): void {
+		const devWorkspaceFullYamlOutput: any = YAML.parse(kubernetesCommandLineToolsExecutor.getDevWorkspaceYamlConfiguration());
+		expect(devWorkspaceFullYamlOutput.spec.template.attributes['pod-overrides']).eqls({
+			metadata: {
+				annotations: {
+					'io.kubernetes.cri-o.userns-mode': 'auto:size=65536;map-to-root=true',
+					'io.openshift.userns': 'true',
+					'openshift.io/scc': 'container-build'
+				}
+			},
+			spec: {
+				runtimeClassName: 'kata',
+				schedulerName: 'stork'
+			}
+		});
+	});
 });
-
-

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

@@ -1,5 +1,5 @@
-/*********************************************************************
- * Copyright (c) 2020-2023 Red Hat, Inc.
+/** *******************************************************************
+ * copyright (c) 2020-2023 Red Hat, Inc.
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -17,49 +17,49 @@ 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`, async function(): Promise<void> {
-  loginTests.loginIntoChe();
+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> {
-    await workspaceHandlingTests.createAndOpenWorkspace(stackName);
-  });
+	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();
-  });
+	test('Obtain workspace name from workspace loader page', async function (): Promise<void> {
+		await workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
+	});
 
-  test('Register running workspace', async function(): Promise<void> {
-    registerRunningWorkspace(WorkspaceHandlingTests.getWorkspaceName());
-  });
+	test('Register running workspace', function (): void {
+		registerRunningWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+	});
 
-  test('Wait workspace readiness', async function(): Promise<void> {
-    await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
+	test('Wait workspace readiness', async function (): Promise<void> {
+		await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
 
-    const workbench: Workbench = new Workbench();
-    const activityBar: ActivityBar = workbench.getActivityBar();
-    const activityBarControls: ViewControl[] = await activityBar.getViewControls();
+		const workbench: Workbench = new Workbench();
+		const activityBar: ActivityBar = workbench.getActivityBar();
+		const activityBarControls: ViewControl[] = await activityBar.getViewControls();
 
-    Logger.debug(`Editor sections:`);
-    for (const control of activityBarControls) {
-      Logger.debug(`${await control.getTitle()}`);
-    }
-  });
+		Logger.debug('Editor sections:');
+		for (const control of activityBarControls) {
+			Logger.debug(`${await control.getTitle()}`);
+		}
+	});
 
-  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();
 });