@eclipse-che/che-e2e 7.76.0-next-6068ce8 → 7.76.0

package/specs/api/InbuiltApplicationDevWorkspacesAPI.spec.ts

@@ -0,0 +1,130 @@
+/** *******************************************************************
+ * 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 { 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';
+import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
+import { TIMEOUT_CONSTANTS } from '../../constants/TIMEOUT_CONSTANTS';
+import { API_TEST_CONSTANTS } from '../../constants/API_TEST_CONSTANTS';
+import { MOCHA_CONSTANTS } from '../../constants/MOCHA_CONSTANTS';
+
+/**
+ * dynamically generating tests
+ * info: https://mochajs.org/#delayed-root-suite
+ */
+
+void (async function (): Promise<void> {
+	const devfilesRegistryHelper: DevfilesRegistryHelper = e2eContainer.get(CLASSES.DevfilesRegistryHelper);
+	let devfileSamples: any;
+	if (MOCHA_CONSTANTS.MOCHA_DELAYED_SUITE) {
+		devfileSamples = await devfilesRegistryHelper.collectPathsToDevfilesFromRegistry(
+			true,
+			API_TEST_CONSTANTS.TS_API_TEST_DEV_WORKSPACE_LIST?.split(',')
+		);
+	}
+
+	for (const devfileSample of devfileSamples) {
+		suite(
+			`Inbuilt DevWorkspaces test suite for "${devfileSample.name}" sample ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`,
+			function (): void {
+				this.bail(false);
+				let devWorkspaceConfigurationHelper: DevWorkspaceConfigurationHelper;
+				let kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor;
+				let containerTerminal: ContainerTerminal;
+				let devfileContextYaml: any;
+				let devWorkspaceName: string | undefined;
+				let clonedProjectName: string;
+				let containerWorkDir: string;
+				const devfilesBuildCommands: any[] = [];
+
+				test('Get DevWorkspace configuration', function (): void {
+					devWorkspaceConfigurationHelper = new DevWorkspaceConfigurationHelper({});
+					devfileContextYaml = devWorkspaceConfigurationHelper.getDevWorkspaceConfigurationsAsYaml(
+						devfileSample.devWorkspaceConfigurationString
+					);
+					devWorkspaceName = devfileContextYaml.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 (devfileContextYaml.DevWorkspace.spec.template.commands === undefined) {
+						Logger.info('Devfile does not contains any commands.');
+					} else {
+						devfileContextYaml.DevWorkspace.spec.template.commands.forEach((command: any): void => {
+							if (command.exec?.group?.kind === 'build') {
+								Logger.debug(`Build command found: ${command.exec.commandLine}`);
+								devfilesBuildCommands.push(command);
+							}
+						});
+					}
+				});
+
+				test('Create and wait DevWorkspace', function (): void {
+					const output: ShellString = kubernetesCommandLineToolsExecutor.applyYamlConfigurationAsStringOutput(
+						devfileSample.devWorkspaceConfigurationString
+					);
+					expect(output.stdout)
+						.contains('devworkspacetemplate')
+						.and.contains('devworkspace')
+						.and.contains.oneOf(['created', 'configured']);
+				});
+
+				test('Wait until DevWorkspace has status "ready"', function (): void {
+					this.timeout(TIMEOUT_CONSTANTS.TS_SELENIUM_START_WORKSPACE_TIMEOUT);
+					expect(kubernetesCommandLineToolsExecutor.waitDevWorkspace().stdout).contains('condition met');
+				});
+
+				test('Check if project was created', function (): void {
+					clonedProjectName = devfileContextYaml.DevWorkspace.spec.template.projects[0].name;
+					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 {
+					this.test?.timeout(1500000); // 25 minutes because build of Quarkus sample takes 20+ minutes
+					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.execInContainerCommand(commandString, command.exec.component);
+							expect(output.code).eqls(0);
+						});
+					}
+				});
+
+				test('Delete DevWorkspace', function (): void {
+					kubernetesCommandLineToolsExecutor.deleteDevWorkspace();
+				});
+			}
+		);
+	}
+
+	run();
+})();

package/specs/api/PodOverridesAPI.spec.ts

@@ -17,7 +17,7 @@ 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 {
+suite(`Test defining pod overrides via attribute ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, function (): void {
 	const pathToSampleFile: string = path.resolve(
 		`resources/pod-overrides${BASE_TEST_CONSTANTS.IS_CLUSTER_DISCONNECTED() ? '-airgap' : ''}.yaml`
 	);

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

@@ -26,7 +26,7 @@ import { OAUTH_CONSTANTS } from '../../constants/OAUTH_CONSTANTS';
 import { Logger } from '../../utils/Logger';
 
 // suit works for DevSpaces
-suite('Check links to documentation page in Dashboard', function (): void {
+suite(`Check links to documentation page in Dashboard ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, function (): void {
 	this.timeout(180000);
 	const pathToSampleFile: string = path.resolve('resources/default-devfile.yaml');
 	const workspaceName: string = YAML.parse(fs.readFileSync(pathToSampleFile, 'utf8')).metadata.name;

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

@@ -16,10 +16,11 @@ import { ProjectAndFileTests } from '../../tests-library/ProjectAndFileTests';
 import { LoginTests } from '../../tests-library/LoginTests';
 import { registerRunningWorkspace } from '../MochaHooks';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
+import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
 
 const stackName: string = 'Empty Workspace';
 
-suite(`${stackName} test`, function (): void {
+suite(`${stackName} test ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, function (): void {
 	const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 	const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
 	const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);

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

@@ -21,7 +21,7 @@ import { expect } from 'chai';
 
 const stackName: string = 'Java 11 with Quarkus';
 
-suite(`The ${stackName} userstory`, function (): void {
+suite(`The ${stackName} userstory ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, function (): void {
 	const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
 	const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 	const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);

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

@@ -33,11 +33,12 @@ import { expect } from 'chai';
 import { TIMEOUT_CONSTANTS } from '../../constants/TIMEOUT_CONSTANTS';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 import { PLUGIN_TEST_CONSTANTS } from '../../constants/PLUGIN_TEST_CONSTANTS';
+import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
 
 const samples: string[] = PLUGIN_TEST_CONSTANTS.TS_SAMPLE_LIST.split(',');
 
 for (const sample of samples) {
-	suite(`Check if recommended extensions installed for ${sample}`, function (): void {
+	suite(`Check if recommended extensions installed for ${sample} ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, function (): void {
 		const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
 		const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 		const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);

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

@@ -25,7 +25,7 @@ import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
 import { ITestWorkspaceUtil } from '../../utils/workspace/ITestWorkspaceUtil';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 
-suite('DevConsole Integration', function (): void {
+suite(`DevConsole Integration ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, function (): void {
 	let ocpImportPage: OcpImportFromGitPage;
 	let ocpApplicationPage: OcpApplicationPage;
 

package/specs/factory/Factory.spec.ts

@@ -39,7 +39,7 @@ import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
 import { FACTORY_TEST_CONSTANTS } from '../../constants/FACTORY_TEST_CONSTANTS';
 
 suite(
-	`Create a workspace via launching a factory from the ${FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_PROVIDER} repository`,
+	`Create a workspace via launching a factory from the ${FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_PROVIDER} repository ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`,
 	function (): void {
 		const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 		const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);

package/specs/factory/NoSetupRepoFactory.spec.ts

@@ -41,7 +41,7 @@ import { OAUTH_CONSTANTS } from '../../constants/OAUTH_CONSTANTS';
 import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
 
 suite(
-	`Create a workspace via launching a factory from the ${FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_PROVIDER} repository without PAT/OAuth setup`,
+	`Create a workspace via launching a factory from the ${FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_PROVIDER} repository without PAT/OAuth setup ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`,
 	function (): void {
 		const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 		const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);

package/specs/factory/RefusedOAuthFactory.spec.ts

@@ -40,7 +40,7 @@ import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
 import { FACTORY_TEST_CONSTANTS, GitProviderType } from '../../constants/FACTORY_TEST_CONSTANTS';
 
 suite(
-	`Create a workspace via launching a factory from the ${FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_PROVIDER} repository and deny the access`,
+	`Create a workspace via launching a factory from the ${FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_PROVIDER} repository and deny the access ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`,
 	function (): void {
 		const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 		const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);

package/specs/miscellaneous/CreateWorkspaceWithExistedName.spec.ts

@@ -23,7 +23,7 @@ import { FACTORY_TEST_CONSTANTS } from '../../constants/FACTORY_TEST_CONSTANTS';
 const stackName: string = BASE_TEST_CONSTANTS.TS_SELENIUM_DASHBOARD_SAMPLE_NAME || 'Python';
 const projectName: string = FACTORY_TEST_CONSTANTS.TS_SELENIUM_PROJECT_NAME || 'python-hello-world';
 
-suite('"Start workspace with existed workspace name" test', function (): void {
+suite(`"Start workspace with existed workspace name" test ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, function (): void {
 	const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 	const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
 	const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);

package/specs/miscellaneous/KubedockPodmanTest.spec.ts

@@ -18,75 +18,79 @@ import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 import { expect } from 'chai';
 import { KubernetesCommandLineToolsExecutor } from '../../utils/KubernetesCommandLineToolsExecutor';
 import { ShellString } from 'shelljs';
+import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
 
-suite('Check possibility to manage containers within a workspace with kubedock and podman', 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 kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor;
-	let workspaceName: string = '';
+suite(
+	`Check possibility to manage containers within a workspace with kubedock and podman ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`,
+	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 kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor;
+		let workspaceName: string = '';
 
-	const testScript: string =
-		'# Enable Kubedock\n' +
-		'export KUBEDOCK_ENABLED=true\n' +
-		'echo KUBEDOCK_ENABLED\n' +
-		'/entrypoint.sh\n' +
-		'cd $PROJECT_SOURCE\n' +
-		'export USER=$(oc whoami)\n' +
-		'export TKN=$(oc whoami -t)\n' +
-		'export REG="image-registry.openshift-image-registry.svc:5000"\n' +
-		'export PROJECT=$(oc project -q)\n' +
-		'export IMG="${REG}/${PROJECT}/hello"\n' +
-		'podman login --tls-verify=false --username ${USER} --password ${TKN} ${REG}\n' +
-		'podman build -t ${IMG} .\n' +
-		'podman push --tls-verify=false ${IMG}\n' +
-		'podman run --rm ${IMG}';
+		const testScript: string =
+			'# Enable Kubedock\n' +
+			'export KUBEDOCK_ENABLED=true\n' +
+			'echo KUBEDOCK_ENABLED\n' +
+			'/entrypoint.sh\n' +
+			'cd $PROJECT_SOURCE\n' +
+			'export USER=$(oc whoami)\n' +
+			'export TKN=$(oc whoami -t)\n' +
+			'export REG="image-registry.openshift-image-registry.svc:5000"\n' +
+			'export PROJECT=$(oc project -q)\n' +
+			'export IMG="${REG}/${PROJECT}/hello"\n' +
+			'podman login --tls-verify=false --username ${USER} --password ${TKN} ${REG}\n' +
+			'podman build -t ${IMG} .\n' +
+			'podman push --tls-verify=false ${IMG}\n' +
+			'podman run --rm ${IMG}';
 
-	const factoryUrl: string = 'https://github.com/l0rd/dockerfile-hello-world';
+		const factoryUrl: string = 'https://github.com/l0rd/dockerfile-hello-world';
 
-	loginTests.loginIntoChe();
+		loginTests.loginIntoChe();
 
-	test(`Create and open new workspace from factory:${factoryUrl}`, async function (): Promise<void> {
-		await workspaceHandlingTests.createAndOpenWorkspaceFromGitRepository(factoryUrl);
-	});
+		test(`Create and open new workspace from factory:${factoryUrl}`, async function (): Promise<void> {
+			await workspaceHandlingTests.createAndOpenWorkspaceFromGitRepository(factoryUrl);
+		});
 
-	test('Obtain workspace name from workspace loader page', async function (): Promise<void> {
-		await workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
-		workspaceName = WorkspaceHandlingTests.getWorkspaceName();
-		expect(workspaceName, 'Workspace name was not fetched from the loading page').not.undefined;
-	});
+		test('Obtain workspace name from workspace loader page', async function (): Promise<void> {
+			await workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
+			workspaceName = WorkspaceHandlingTests.getWorkspaceName();
+			expect(workspaceName, 'Workspace name was not fetched from the loading page').not.undefined;
+		});
 
-	test('Register running workspace', function (): void {
-		registerRunningWorkspace(workspaceName);
-	});
+		test('Register running workspace', function (): void {
+			registerRunningWorkspace(workspaceName);
+		});
 
-	test('Wait workspace readiness', async function (): Promise<void> {
-		await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
-	});
+		test('Wait workspace readiness', async function (): Promise<void> {
+			await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
+		});
 
-	test('Check the project files were imported', async function (): Promise<void> {
-		const projectSection: ViewSection = await projectAndFileTests.getProjectViewSession();
-		expect(await projectAndFileTests.getProjectTreeItem(projectSection, 'Dockerfile'), 'Files not imported').not.undefined;
-	});
+		test('Check the project files were imported', async function (): Promise<void> {
+			const projectSection: ViewSection = await projectAndFileTests.getProjectViewSession();
+			expect(await projectAndFileTests.getProjectTreeItem(projectSection, 'Dockerfile'), 'Files not imported').not.undefined;
+		});
 
-	test('Create and check container runs using kubedock and podman', function (): void {
-		kubernetesCommandLineToolsExecutor = e2eContainer.get(CLASSES.KubernetesCommandLineToolsExecutor);
-		kubernetesCommandLineToolsExecutor.workspaceName = workspaceName;
-		kubernetesCommandLineToolsExecutor.loginToOcp();
-		kubernetesCommandLineToolsExecutor.getPodAndContainerNames();
-		const output: ShellString = kubernetesCommandLineToolsExecutor.executeCommand(testScript);
-		expect(output, 'Podman test script failed').contains('Hello from Kubedock!');
-	});
+		test('Create and check container runs using kubedock and podman', function (): void {
+			kubernetesCommandLineToolsExecutor = e2eContainer.get(CLASSES.KubernetesCommandLineToolsExecutor);
+			kubernetesCommandLineToolsExecutor.workspaceName = workspaceName;
+			kubernetesCommandLineToolsExecutor.loginToOcp();
+			kubernetesCommandLineToolsExecutor.getPodAndContainerNames();
+			const output: ShellString = kubernetesCommandLineToolsExecutor.execInContainerCommand(testScript);
+			expect(output, 'Podman test script failed').contains('Hello from Kubedock!');
+		});
 
-	test('Stop the workspace', async function (): Promise<void> {
-		await workspaceHandlingTests.stopWorkspace(workspaceName);
-		await browserTabsUtil.closeAllTabsExceptCurrent();
-	});
+		test('Stop the workspace', async function (): Promise<void> {
+			await workspaceHandlingTests.stopWorkspace(workspaceName);
+			await browserTabsUtil.closeAllTabsExceptCurrent();
+		});
 
-	test('Delete the workspace', async function (): Promise<void> {
-		await workspaceHandlingTests.removeWorkspace(workspaceName);
-	});
+		test('Delete the workspace', async function (): Promise<void> {
+			await workspaceHandlingTests.removeWorkspace(workspaceName);
+		});
 
-	loginTests.logoutFromChe();
-});
+		loginTests.logoutFromChe();
+	}
+);

package/specs/miscellaneous/PredefinedNamespace.spec.ts

@@ -16,8 +16,9 @@ import { LoginTests } from '../../tests-library/LoginTests';
 import { registerRunningWorkspace } from '../MochaHooks';
 import { KubernetesCommandLineToolsExecutor } from '../../utils/KubernetesCommandLineToolsExecutor';
 import { ShellExecutor } from '../../utils/ShellExecutor';
+import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
 
-suite('Create predefined workspace and check it', function (): void {
+suite(`Create predefined workspace and check it ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, function (): void {
 	const predefinedNamespaceName: string = 'predefined-ns';
 	const stackName: string = 'Empty Workspace';
 

package/specs/miscellaneous/WorkspaceWithParent.spec.ts

@@ -10,7 +10,7 @@
 import { e2eContainer } from '../../configs/inversify.config';
 import { ShellExecutor } from '../../utils/ShellExecutor';
 import { InputBox, QuickOpenBox, QuickPickItem, ViewItem, ViewSection, Workbench } from 'monaco-page-objects';
-import { CLASSES } from '../../configs/inversify.types';
+import { CLASSES, TYPES } from '../../configs/inversify.types';
 import { ProjectAndFileTests } from '../../tests-library/ProjectAndFileTests';
 import { LoginTests } from '../../tests-library/LoginTests';
 import { Dashboard } from '../../pageobjects/dashboard/Dashboard';
@@ -21,13 +21,15 @@ import { API_TEST_CONSTANTS } from '../../constants/API_TEST_CONSTANTS';
 import { WorkspaceHandlingTests } from '../../tests-library/WorkspaceHandlingTests';
 import { registerRunningWorkspace } from '../MochaHooks';
 import { KubernetesCommandLineToolsExecutor } from '../../utils/KubernetesCommandLineToolsExecutor';
+import { ITestWorkspaceUtil } from '../../utils/workspace/ITestWorkspaceUtil';
 
-suite('Workspace using a parent test suite', function (): void {
+suite(`Workspace using a parent test suite ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, function (): void {
 	const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
 	const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
 	const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 	const dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard);
 	const shellExecutor: ShellExecutor = e2eContainer.get(CLASSES.ShellExecutor);
+	const testWorkspaceUtil: ITestWorkspaceUtil = e2eContainer.get(TYPES.WorkspaceUtil);
 	const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 	const kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor = e2eContainer.get(
 		CLASSES.KubernetesCommandLineToolsExecutor
@@ -96,5 +98,10 @@ suite('Workspace using a parent test suite', function (): void {
 		expect(envList).contains('DEVFILE_ENV_VAR=true').and.contains('PARENT_ENV_VAR=true');
 	});
 
+	test('Stop and delete the workspace by API', async function (): Promise<void> {
+		await browserTabsUtil.closeAllTabsExceptCurrent();
+		testWorkspaceUtil.stopAndDeleteWorkspaceByName(WorkspaceHandlingTests.getWorkspaceName());
+	});
+
 	loginTests.logoutFromChe();
 });

package/specs/web-terminal/WebTerminalTest.spec.ts

@@ -11,8 +11,9 @@ import { CLASSES } from '../../configs/inversify.types';
 import { e2eContainer } from '../../configs/inversify.config';
 import { LoginTests } from '../../tests-library/LoginTests';
 import { OcpMainPage } from '../../pageobjects/openshift/OcpMainPage';
+import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
 
-suite('Login to Openshift console and start WebTerminal', function (): void {
+suite(`Login to Openshift console and start WebTerminal ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, function (): void {
 	const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
 	const ocpMainPage: OcpMainPage = e2eContainer.get(CLASSES.OcpMainPage);
 

package/suites/disconnected-ocp/APITest.suite.ts

@@ -0,0 +1,11 @@
+/** *******************************************************************
+ * 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 '../../specs/api/ContainerOverridesAPI.spec';
+import '../../specs/api/PodOverridesAPI.spec';

package/suites/disconnected-ocp/DynamicallyGeneratingAPITest.suite.ts

@@ -0,0 +1,10 @@
+/** *******************************************************************
+ * 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 '../../specs/api/InbuiltApplicationDevWorkspacesAPI.spec';

package/suites/disconnected-ocp/UITest.suite.ts

@@ -0,0 +1,16 @@
+/** *******************************************************************
+ * 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 '../../specs/dashboard-samples/Quarkus.spec';
+import '../../specs/dashboard-samples/RecommendedExtensions.spec';
+import '../../specs/dashboard-samples/Documentation.spec';
+import '../../specs/devconsole-intergration/DevConsoleIntegration.spec';
+import '../../specs/miscellaneous/CreateWorkspaceWithExistedName.spec';
+import '../../specs/miscellaneous/PredefinedNamespace.spec';
+import '../../specs/miscellaneous/WorkspaceWithParent.spec';

package/suites/online-ocp/APITest.suite.ts

@@ -0,0 +1,12 @@
+/** *******************************************************************
+ * 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 '../../specs/api/ContainerOverridesAPI.spec';
+import '../../specs/api/EmptyWorkspaceAPI.spec';
+import '../../specs/api/PodOverridesAPI.spec';

package/suites/online-ocp/DynamicallyGeneratingAPITest.suite.ts

@@ -0,0 +1,10 @@
+/** *******************************************************************
+ * 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 '../../specs/api/InbuiltApplicationDevWorkspacesAPI.spec';

package/suites/online-ocp/UITest.suite.ts

@@ -0,0 +1,19 @@
+/** *******************************************************************
+ * 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 '../../specs/SmokeTest.spec';
+import '../../specs/dashboard-samples/EmptyWorkspace.spec';
+import '../../specs/dashboard-samples/Quarkus.spec';
+import '../../specs/dashboard-samples/RecommendedExtensions.spec';
+import '../../specs/dashboard-samples/Documentation.spec';
+import '../../specs/devconsole-intergration/DevConsoleIntegration.spec';
+import '../../specs/miscellaneous/CreateWorkspaceWithExistedName.spec';
+import '../../specs/miscellaneous/KubedockPodmanTest.spec';
+import '../../specs/miscellaneous/PredefinedNamespace.spec';
+import '../../specs/miscellaneous/WorkspaceWithParent.spec';

package/tests-library/LoginTests.ts

@@ -15,6 +15,7 @@ import { inject, injectable } from 'inversify';
 import { Dashboard } from '../pageobjects/dashboard/Dashboard';
 import { IOcpLoginPage } from '../pageobjects/login/interfaces/IOcpLoginPage';
 import { BASE_TEST_CONSTANTS } from '../constants/BASE_TEST_CONSTANTS';
+import { registerRunningWorkspace } from '../specs/MochaHooks';
 
 @injectable()
 export class LoginTests {
@@ -50,6 +51,7 @@ export class LoginTests {
 	logoutFromChe(): void {
 		test('Logout', async (): Promise<void> => {
 			await this.dashboard.logout();
+			registerRunningWorkspace('');
 		});
 	}
 }

package/utils/DevWorkspaceConfigurationHelper.ts

@@ -19,12 +19,16 @@ import { injectable } from 'inversify';
 import { IContextParams } from './IContextParams';
 import { e2eContainer } from '../configs/inversify.config';
 import { CLASSES, EXTERNAL_CLASSES } from '../configs/inversify.types';
+import getDecorators from 'inversify-inject-decorators';
+
+const { lazyInject } = getDecorators(e2eContainer);
 
 @injectable()
 export class DevWorkspaceConfigurationHelper {
-	private generator: Generator = e2eContainer.get(EXTERNAL_CLASSES.Generator);
-	private shellExecutor: ShellExecutor = e2eContainer.get(CLASSES.ShellExecutor);
-
+	@lazyInject(EXTERNAL_CLASSES.Generator)
+	private readonly generator!: Generator;
+	@lazyInject(CLASSES.ShellExecutor)
+	private readonly shellExecutor!: ShellExecutor;
 	private readonly params: IContextParams;
 
 	constructor(params: IContextParams) {
@@ -74,4 +78,30 @@ export class DevWorkspaceConfigurationHelper {
 
 		return allContentArray.join('---\n');
 	}
+
+	getDevWorkspaceConfigurationsAsYaml(allContentString: string): string {
+		Logger.debug(`${this.constructor.name}.${this.getDevWorkspaceConfigurationsAsYaml.name}`);
+		const content: any = {};
+		const contentArray: string[] = allContentString.split('---\n');
+		contentArray.forEach((e: any): void => {
+			e = YAML.parse(e);
+			e.kind === 'DevWorkspace'
+				? (content.DevWorkspace = e)
+				: e.kind === 'DevWorkspaceTemplate'
+				? (content.DevWorkspaceTemplate = e)
+				: Logger.error(
+						'Problems with configuration parsing, string should be in format "DevWorkspace\\n---\\nDevWorkspaceTemplate"'
+				  );
+		});
+
+		return content;
+	}
+	patchDevWorkspaceConfigWithBuildContainerAttribute(devfileContextDevWorkspace: any): void {
+		devfileContextDevWorkspace.spec.template.attributes = YAML.parse(`
+                    controller.devfile.io/devworkspace-config:
+                      name: devworkspace-config
+                      namespace: openshift-devspaces
+                    controller.devfile.io/scc: container-build
+                    controller.devfile.io/storage-type: per-user`);
+	}
 }