@eclipse-che/che-e2e 7.76.0 → 7.77.0

package/specs/factory/RefusedOAuthFactory.spec.ts

@@ -16,7 +16,6 @@ import {
 	EditorView,
 	InputBox,
 	Locators,
-	ModalDialog,
 	NewScmView,
 	SingleScmProvider,
 	TextEditor,
@@ -26,7 +25,7 @@ import {
 import { expect } from 'chai';
 import { registerRunningWorkspace } from '../MochaHooks';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
-import { CLASSES } from '../../configs/inversify.types';
+import { CLASSES, TYPES } from '../../configs/inversify.types';
 import { WorkspaceHandlingTests } from '../../tests-library/WorkspaceHandlingTests';
 import { CheCodeLocatorLoader } from '../../pageobjects/ide/CheCodeLocatorLoader';
 import { ProjectAndFileTests } from '../../tests-library/ProjectAndFileTests';
@@ -38,6 +37,8 @@ import { LoginTests } from '../../tests-library/LoginTests';
 import { OAUTH_CONSTANTS } from '../../constants/OAUTH_CONSTANTS';
 import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
 import { FACTORY_TEST_CONSTANTS, GitProviderType } from '../../constants/FACTORY_TEST_CONSTANTS';
+import { ITestWorkspaceUtil } from '../../utils/workspace/ITestWorkspaceUtil';
+import { Dashboard } from '../../pageobjects/dashboard/Dashboard';
 
 suite(
 	`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}`,
@@ -50,9 +51,12 @@ suite(
 		const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
 		const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
 		const oauthPage: OauthPage = e2eContainer.get(CLASSES.OauthPage);
+		const testWorkspaceUtil: ITestWorkspaceUtil = e2eContainer.get(TYPES.WorkspaceUtil);
+		const dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard);
 
 		let projectSection: ViewSection;
 		let scmProvider: SingleScmProvider;
+		let rest: SingleScmProvider[];
 		let scmContextMenu: ContextMenu;
 
 		// test specific data
@@ -66,19 +70,19 @@ suite(
 		let testRepoProjectName: string;
 		const isPrivateRepo: string = FACTORY_TEST_CONSTANTS.TS_SELENIUM_IS_PRIVATE_FACTORY_GIT_REPO ? 'private' : 'public';
 
-		loginTests.loginIntoChe();
+		suiteSetup('Login', async function (): Promise<void> {
+			await loginTests.loginIntoChe();
+		});
 
 		test(`Navigate to the ${isPrivateRepo} repository factory URL`, async function (): Promise<void> {
 			await browserTabsUtil.navigateTo(FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_URL());
 		});
 
-		if (OAUTH_CONSTANTS.TS_SELENIUM_GIT_PROVIDER_OAUTH) {
-			test(`Authorize with a ${FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_PROVIDER} OAuth and deny access`, async function (): Promise<void> {
-				await oauthPage.login();
-				await oauthPage.waitOauthPage();
-				await oauthPage.denyAccess();
-			});
-		}
+		test(`Authorize with a ${FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_PROVIDER} OAuth and deny access`, async function (): Promise<void> {
+			await oauthPage.login();
+			await oauthPage.waitOauthPage();
+			await oauthPage.denyAccess();
+		});
 
 		test('Obtain workspace name from workspace loader page', async function (): Promise<void> {
 			await workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
@@ -96,29 +100,31 @@ suite(
 			await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
 		});
 
-		test('Check if a project folder has been created', async function (): Promise<void> {
-			testRepoProjectName = StringUtil.getProjectNameFromGitUrl(FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_REPO_URL);
-			projectSection = await projectAndFileTests.getProjectViewSession();
-			expect(await projectAndFileTests.getProjectTreeItem(projectSection, testRepoProjectName), 'Project folder was not imported').not
-				.undefined;
-		});
-
-		test('Accept the project as a trusted one', async function (): Promise<void> {
-			await projectAndFileTests.performTrustAuthorDialog();
-		});
-
 		if (FACTORY_TEST_CONSTANTS.TS_SELENIUM_IS_PRIVATE_FACTORY_GIT_REPO) {
-			test('Check that project can not be cloned', async function (): Promise<void> {
-				await driverHelper.waitVisibility(webCheCodeLocators.Dialog.message);
-				const workspaceDoesNotExistDialog: ModalDialog = new ModalDialog();
-				const message: string = await workspaceDoesNotExistDialog.getMessage();
-				expect(message).contains('space does not exist');
+			test('Check that a project folder has not been cloned', async function (): Promise<void> {
+				testRepoProjectName = StringUtil.getProjectNameFromGitUrl(FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_REPO_URL);
+				await driverHelper.waitVisibility(webCheCodeLocators.ScmView.multiProviderItem);
+				await projectAndFileTests.performTrustAuthorDialog();
+				const isProjectFolderUnable: string = await driverHelper.waitAndGetElementAttribute(
+					(webCheCodeLocators.TreeItem as any).projectFolderItem,
+					'aria-label'
+				);
+				expect(isProjectFolderUnable).to.contain(
+					'/projects/' + testRepoProjectName + ' • Unable to resolve workspace folder (Unable to resolve nonexistent file'
+				);
+			});
+		} else {
+			test('Check if a project folder has been created', async function (): Promise<void> {
+				testRepoProjectName = StringUtil.getProjectNameFromGitUrl(FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_REPO_URL);
+				projectSection = await projectAndFileTests.getProjectViewSession();
+				expect(await projectAndFileTests.getProjectTreeItem(projectSection, testRepoProjectName), 'Project folder was not imported')
+					.not.undefined;
 			});
 
-			test('Check that project files were not imported', async function (): Promise<void> {
-				expect(await projectAndFileTests.getProjectTreeItem(projectSection, label), 'Project files were found').to.be.undefined;
+			test('Accept the project as a trusted one', async function (): Promise<void> {
+				await projectAndFileTests.performTrustAuthorDialog();
 			});
-		} else {
+
 			test('Check if the project files were imported', async function (): Promise<void> {
 				expect(await projectAndFileTests.getProjectTreeItem(projectSection, label), 'Project files were not imported').not
 					.undefined;
@@ -142,7 +148,6 @@ suite(
 				await sourceControl.openView();
 				const scmView: NewScmView = new NewScmView();
 				await driverHelper.waitVisibility(webCheCodeLocators.ScmView.inputField);
-				let rest: SingleScmProvider[];
 				[scmProvider, ...rest] = await scmView.getProviders();
 				Logger.debug(`scmView.getProviders: "${JSON.stringify(scmProvider)}, ${rest}"`);
 			});
@@ -232,15 +237,17 @@ suite(
 			});
 		}
 
-		test('Stop the workspace', async function (): Promise<void> {
-			await workspaceHandlingTests.stopWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+		suiteTeardown('Open dashboard and close all other tabs', async function (): Promise<void> {
+			await dashboard.openDashboard();
 			await browserTabsUtil.closeAllTabsExceptCurrent();
 		});
 
-		test('Delete the workspace', async function (): Promise<void> {
-			await workspaceHandlingTests.removeWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+		suiteTeardown('Stop and delete the workspace by API', async function (): Promise<void> {
+			await testWorkspaceUtil.stopAndDeleteWorkspaceByName(WorkspaceHandlingTests.getWorkspaceName());
 		});
 
-		loginTests.logoutFromChe();
+		suiteTeardown('Unregister running workspace', function (): void {
+			registerRunningWorkspace('');
+		});
 	}
 );

package/specs/miscellaneous/CreateWorkspaceWithExistedName.spec.ts

@@ -9,7 +9,7 @@
  **********************************************************************/
 import { e2eContainer } from '../../configs/inversify.config';
 import { ViewSection } from 'monaco-page-objects';
-import { CLASSES } from '../../configs/inversify.types';
+import { CLASSES, TYPES } from '../../configs/inversify.types';
 import { expect } from 'chai';
 import { WorkspaceHandlingTests } from '../../tests-library/WorkspaceHandlingTests';
 import { ProjectAndFileTests } from '../../tests-library/ProjectAndFileTests';
@@ -19,6 +19,7 @@ import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
 import { Dashboard } from '../../pageobjects/dashboard/Dashboard';
 import { FACTORY_TEST_CONSTANTS } from '../../constants/FACTORY_TEST_CONSTANTS';
+import { ITestWorkspaceUtil } from '../../utils/workspace/ITestWorkspaceUtil';
 
 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';
@@ -29,10 +30,14 @@ suite(`"Start workspace with existed workspace name" test ${BASE_TEST_CONSTANTS.
 	const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
 	const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 	const dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard);
+	const testWorkspaceUtil: ITestWorkspaceUtil = e2eContainer.get(TYPES.WorkspaceUtil);
+
 	let projectSection: ViewSection;
 	let existedWorkspaceName: string;
 
-	loginTests.loginIntoChe();
+	suiteSetup('Login', async function (): Promise<void> {
+		await loginTests.loginIntoChe();
+	});
 
 	test(`Create and open new workspace, stack:${stackName}`, async function (): Promise<void> {
 		await workspaceHandlingTests.createAndOpenWorkspace(stackName);
@@ -76,15 +81,17 @@ suite(`"Start workspace with existed workspace name" test ${BASE_TEST_CONSTANTS.
 		).not.undefined;
 	});
 
-	test(`Stop all created ${stackName} workspaces`, async function (): Promise<void> {
-		await workspaceHandlingTests.stopWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+	suiteTeardown('Open dashboard and close all other tabs', async function (): Promise<void> {
+		await dashboard.openDashboard();
 		await browserTabsUtil.closeAllTabsExceptCurrent();
 	});
 
-	test(`Delete all created ${stackName} workspaces`, async function (): Promise<void> {
-		await workspaceHandlingTests.removeWorkspace(WorkspaceHandlingTests.getWorkspaceName());
-		await workspaceHandlingTests.removeWorkspace(existedWorkspaceName);
+	suiteTeardown(`Stop and delete all created ${stackName} workspaces by API`, async function (): Promise<void> {
+		await testWorkspaceUtil.stopAndDeleteWorkspaceByName(WorkspaceHandlingTests.getWorkspaceName());
+		await testWorkspaceUtil.stopAndDeleteWorkspaceByName(existedWorkspaceName);
 	});
 
-	loginTests.logoutFromChe();
+	suiteTeardown('Unregister running workspace', function (): void {
+		registerRunningWorkspace('');
+	});
 });

package/specs/miscellaneous/KubedockPodmanTest.spec.ts

@@ -9,7 +9,7 @@
  **********************************************************************/
 import { ViewSection } from 'monaco-page-objects';
 import { ProjectAndFileTests } from '../../tests-library/ProjectAndFileTests';
-import { CLASSES } from '../../configs/inversify.types';
+import { CLASSES, TYPES } from '../../configs/inversify.types';
 import { e2eContainer } from '../../configs/inversify.config';
 import { WorkspaceHandlingTests } from '../../tests-library/WorkspaceHandlingTests';
 import { registerRunningWorkspace } from '../MochaHooks';
@@ -19,6 +19,8 @@ import { expect } from 'chai';
 import { KubernetesCommandLineToolsExecutor } from '../../utils/KubernetesCommandLineToolsExecutor';
 import { ShellString } from 'shelljs';
 import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
+import { ITestWorkspaceUtil } from '../../utils/workspace/ITestWorkspaceUtil';
+import { Dashboard } from '../../pageobjects/dashboard/Dashboard';
 
 suite(
 	`Check possibility to manage containers within a workspace with kubedock and podman ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`,
@@ -27,6 +29,9 @@ suite(
 		const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 		const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
 		const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
+		const testWorkspaceUtil: ITestWorkspaceUtil = e2eContainer.get(TYPES.WorkspaceUtil);
+		const dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard);
+
 		let kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor;
 		let workspaceName: string = '';
 
@@ -48,7 +53,9 @@ suite(
 
 		const factoryUrl: string = 'https://github.com/l0rd/dockerfile-hello-world';
 
-		loginTests.loginIntoChe();
+		suiteSetup('Login', async function (): Promise<void> {
+			await loginTests.loginIntoChe();
+		});
 
 		test(`Create and open new workspace from factory:${factoryUrl}`, async function (): Promise<void> {
 			await workspaceHandlingTests.createAndOpenWorkspaceFromGitRepository(factoryUrl);
@@ -82,15 +89,17 @@ suite(
 			expect(output, 'Podman test script failed').contains('Hello from Kubedock!');
 		});
 
-		test('Stop the workspace', async function (): Promise<void> {
-			await workspaceHandlingTests.stopWorkspace(workspaceName);
+		suiteTeardown('Open dashboard and close all other tabs', async function (): Promise<void> {
+			await dashboard.openDashboard();
 			await browserTabsUtil.closeAllTabsExceptCurrent();
 		});
 
-		test('Delete the workspace', async function (): Promise<void> {
-			await workspaceHandlingTests.removeWorkspace(workspaceName);
+		suiteTeardown('Stop and delete the workspace by API', async function (): Promise<void> {
+			await testWorkspaceUtil.stopAndDeleteWorkspaceByName(WorkspaceHandlingTests.getWorkspaceName());
 		});
 
-		loginTests.logoutFromChe();
+		suiteTeardown('Unregister running workspace', function (): void {
+			registerRunningWorkspace('');
+		});
 	}
 );

package/specs/miscellaneous/PredefinedNamespace.spec.ts

@@ -9,7 +9,7 @@
  **********************************************************************/
 import { e2eContainer } from '../../configs/inversify.config';
 import { expect } from 'chai';
-import { CLASSES } from '../../configs/inversify.types';
+import { CLASSES, TYPES } from '../../configs/inversify.types';
 import { WorkspaceHandlingTests } from '../../tests-library/WorkspaceHandlingTests';
 import { Logger } from '../../utils/Logger';
 import { LoginTests } from '../../tests-library/LoginTests';
@@ -17,25 +17,33 @@ import { registerRunningWorkspace } from '../MochaHooks';
 import { KubernetesCommandLineToolsExecutor } from '../../utils/KubernetesCommandLineToolsExecutor';
 import { ShellExecutor } from '../../utils/ShellExecutor';
 import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
+import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
+import { Dashboard } from '../../pageobjects/dashboard/Dashboard';
+import { OAUTH_CONSTANTS } from '../../constants/OAUTH_CONSTANTS';
+import { ITestWorkspaceUtil } from '../../utils/workspace/ITestWorkspaceUtil';
 
 suite(`Create predefined workspace and check it ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, function (): void {
 	const predefinedNamespaceName: string = 'predefined-ns';
 	const stackName: string = 'Empty Workspace';
+	const userName: string = 'user';
 
+	const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
+	const dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard);
 	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);
+	const testWorkspaceUtil: ITestWorkspaceUtil = e2eContainer.get(TYPES.WorkspaceUtil);
 
 	suiteSetup(function (): void {
 		// create a predefined namespace for user using shell script and login into user dashboard
-		Logger.info('Test prerequisites:');
-		Logger.info(
+		Logger.debug('Test prerequisites:');
+		Logger.debug(
 			' (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.');
+		Logger.debug(' (2) "oc" client installed and logged into test OCP cluster with admin rights.');
 		kubernetesCommandLineToolsExecutor.loginToOcp('admin');
 		const predefinedProjectConfiguration: string =
 			'kind: Namespace\n' +
@@ -52,17 +60,18 @@ suite(`Create predefined workspace and check it ${BASE_TEST_CONSTANTS.TEST_ENVIR
 		shellExecutor.executeCommand(setEditRightsForUser);
 	});
 
-	suiteTeardown(function (): void {
-		const workspaceName: string = WorkspaceHandlingTests.getWorkspaceName();
-		try {
-			kubernetesCommandLineToolsExecutor.deleteDevWorkspace();
-			kubernetesCommandLineToolsExecutor.deleteProject(predefinedNamespaceName);
-		} catch (e) {
-			Logger.error(`Cannot remove the predefined project: ${workspaceName}, please fix it manually: ${e}`);
+	suiteSetup('Login', async function (): Promise<void> {
+		if (OAUTH_CONSTANTS.TS_SELENIUM_OCP_USERNAME === userName) {
+			await loginTests.loginIntoChe();
+		} else {
+			try {
+				await loginTests.logoutFromChe();
+			} catch (e) {
+				Logger.trace('user was not logged in.');
+			}
+			await loginTests.loginIntoChe(userName);
 		}
 	});
-
-	loginTests.loginIntoChe('user');
 	// create the Empty workspace using CHE Dashboard
 	test(`Create and open new workspace, stack:${stackName}`, async function (): Promise<void> {
 		await workspaceHandlingTests.createAndOpenWorkspace(stackName);
@@ -81,5 +90,33 @@ suite(`Create predefined workspace and check it ${BASE_TEST_CONSTANTS.TEST_ENVIR
 		expect(ocDevWorkspaceOutput).includes(workspaceName);
 	});
 
-	loginTests.logoutFromChe();
+	suiteTeardown(function (): void {
+		const workspaceName: string = WorkspaceHandlingTests.getWorkspaceName();
+		try {
+			kubernetesCommandLineToolsExecutor.deleteDevWorkspace();
+			kubernetesCommandLineToolsExecutor.deleteProject(predefinedNamespaceName);
+		} catch (e) {
+			Logger.error(`Cannot remove the predefined project: ${workspaceName}, please fix it manually: ${e}`);
+		}
+	});
+
+	suiteTeardown('Re-login with test user', async function (): Promise<void> {
+		if (OAUTH_CONSTANTS.TS_SELENIUM_OCP_USERNAME !== userName) {
+			await loginTests.logoutFromChe();
+			await loginTests.loginIntoChe();
+		}
+	});
+
+	suiteTeardown('Open dashboard and close all other tabs', async function (): Promise<void> {
+		await dashboard.openDashboard();
+		await browserTabsUtil.closeAllTabsExceptCurrent();
+	});
+
+	suiteTeardown('Stop and delete the workspace by API', async function (): Promise<void> {
+		await testWorkspaceUtil.stopAndDeleteWorkspaceByName(WorkspaceHandlingTests.getWorkspaceName());
+	});
+
+	suiteTeardown('Unregister running workspace', function (): void {
+		registerRunningWorkspace('');
+	});
 });

package/specs/miscellaneous/WorkspaceIdleTimeout.spec.ts

@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 import { e2eContainer } from '../../configs/inversify.config';
-import { CLASSES } from '../../configs/inversify.types';
+import { CLASSES, TYPES } from '../../configs/inversify.types';
 import { WorkspaceHandlingTests } from '../../tests-library/WorkspaceHandlingTests';
 import { ProjectAndFileTests } from '../../tests-library/ProjectAndFileTests';
 import { LoginTests } from '../../tests-library/LoginTests';
@@ -22,6 +22,8 @@ import { Locators, ModalDialog } from 'monaco-page-objects';
 import { expect } from 'chai';
 import { KubernetesCommandLineToolsExecutor } from '../../utils/KubernetesCommandLineToolsExecutor';
 import { ShellExecutor } from '../../utils/ShellExecutor';
+import { ITestWorkspaceUtil } from '../../utils/workspace/ITestWorkspaceUtil';
+import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 
 suite('"Check workspace idle timeout" test', function (): void {
 	const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
@@ -36,6 +38,8 @@ suite('"Check workspace idle timeout" test', function (): void {
 		CLASSES.KubernetesCommandLineToolsExecutor
 	);
 	const shellExecutor: ShellExecutor = e2eContainer.get(CLASSES.ShellExecutor);
+	const testWorkspaceUtil: ITestWorkspaceUtil = e2eContainer.get(TYPES.WorkspaceUtil);
+	const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 
 	const stackName: string = 'Empty Workspace';
 	const cheClusterName: string = 'devspaces';
@@ -65,7 +69,9 @@ suite('"Check workspace idle timeout" test', function (): void {
 		);
 	});
 
-	loginTests.loginIntoChe();
+	suiteSetup('Login', async function (): Promise<void> {
+		await loginTests.loginIntoChe();
+	});
 
 	test(`Create and open new workspace, stack:${stackName}`, async function (): Promise<void> {
 		await workspaceHandlingTests.createAndOpenWorkspace(stackName);
@@ -85,14 +91,21 @@ suite('"Check workspace idle timeout" test', function (): void {
 		await dialog.pushButton('Return to dashboard');
 	});
 
-	test('Check that the workskpace has Stopped state', async function (): Promise<void> {
+	test('Check that the workspace has Stopped state', async function (): Promise<void> {
 		await dashboard.waitPage();
 		await workspaces.waitWorkspaceWithStoppedStatus(WorkspaceHandlingTests.getWorkspaceName());
 	});
 
-	test('Delete the workspace', async function (): Promise<void> {
-		await dashboard.deleteStoppedWorkspaceByUI(WorkspaceHandlingTests.getWorkspaceName());
+	suiteTeardown('Open dashboard and close all other tabs', async function (): Promise<void> {
+		await dashboard.openDashboard();
+		await browserTabsUtil.closeAllTabsExceptCurrent();
+	});
+
+	suiteTeardown('Stop and delete the workspace by API', async function (): Promise<void> {
+		await testWorkspaceUtil.deleteWorkspaceByName(WorkspaceHandlingTests.getWorkspaceName());
 	});
 
-	loginTests.logoutFromChe();
+	suiteTeardown('Unregister running workspace', function (): void {
+		registerRunningWorkspace('');
+	});
 });

package/specs/miscellaneous/WorkspaceWithParent.spec.ts

@@ -41,7 +41,9 @@ suite(`Workspace using a parent test suite ${BASE_TEST_CONSTANTS.TEST_ENVIRONMEN
 		kubernetesCommandLineToolsExecutor.loginToOcp();
 	});
 
-	loginTests.loginIntoChe();
+	suiteSetup('Login', async function (): Promise<void> {
+		await loginTests.loginIntoChe();
+	});
 
 	test('Create a workspace using a parent', async function (): Promise<void> {
 		const factoryUrl: string = `${BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL}/dashboard/#https://github.com/testsfactory/parentDevfile`;
@@ -98,10 +100,13 @@ suite(`Workspace using a parent test suite ${BASE_TEST_CONSTANTS.TEST_ENVIRONMEN
 		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> {
+	suiteTeardown('Stop and delete the workspace by API', async function (): Promise<void> {
+		await dashboard.openDashboard();
 		await browserTabsUtil.closeAllTabsExceptCurrent();
-		testWorkspaceUtil.stopAndDeleteWorkspaceByName(WorkspaceHandlingTests.getWorkspaceName());
+		await testWorkspaceUtil.stopAndDeleteWorkspaceByName(WorkspaceHandlingTests.getWorkspaceName());
 	});
 
-	loginTests.logoutFromChe();
+	suiteTeardown('Unregister running workspace', function (): void {
+		registerRunningWorkspace('');
+	});
 });

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

@@ -12,10 +12,22 @@ 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';
+import { KubernetesCommandLineToolsExecutor } from '../../utils/KubernetesCommandLineToolsExecutor';
+import { ShellExecutor } from '../../utils/ShellExecutor';
+import { expect } from 'chai';
 
 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);
+	const kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor = e2eContainer.get(
+		CLASSES.KubernetesCommandLineToolsExecutor
+	);
+	const shellExecutor: ShellExecutor = e2eContainer.get(CLASSES.ShellExecutor);
+
+	suiteSetup(function (): void {
+		kubernetesCommandLineToolsExecutor.loginToOcp('admin');
+		shellExecutor.executeCommand('oc project openshift-operators');
+	});
 
 	loginTests.loginIntoOcpConsole();
 
@@ -23,4 +35,25 @@ suite(`Login to Openshift console and start WebTerminal ${BASE_TEST_CONSTANTS.TE
 		await ocpMainPage.waitOpenMainPage();
 		await ocpMainPage.openWebTerminal();
 	});
+
+	test('Check username is correct', function (): void {
+		const userUid: string = shellExecutor.executeCommand('oc get user $(oc whoami) -o jsonpath={.metadata.uid}').replace(/\n/g, '');
+
+		// label selector for Web Terminal workspaces owned by the currently-logged in user
+		const labelSelector: string = 'console.openshift.io/terminal=true,controller.devfile.io/creator=' + userUid;
+		// namespace of this users web terminal
+		const namespace: string = shellExecutor.executeCommand(
+			`oc get dw -A -l ${labelSelector} -o jsonpath='{.items[0].metadata.namespace}'`
+		);
+		// devWorkspace ID for this users web terminal
+		const termDwId: string = shellExecutor.executeCommand(
+			`oc get dw -A -l ${labelSelector} -o jsonpath='{.items[0].status.devworkspaceId}'`
+		);
+		// use oc exec to run oc whoami inside this user's terminal
+		const user: string = shellExecutor
+			.executeCommand(`oc exec -n ${namespace} deploy/${termDwId} -c web-terminal-tooling -- oc whoami`)
+			.replace(/\n/g, '');
+		// above should output current user's username:
+		expect(user).to.equal(shellExecutor.executeCommand('oc whoami').replace(/\n/g, ''));
+	});
 });

package/suites/devfile-acceptance-test-suite/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/DevfileAcceptanceTestAPI.spec';

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

@@ -12,5 +12,5 @@ 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';
+import '../../specs/miscellaneous/PredefinedNamespace.spec';

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

@@ -15,5 +15,5 @@ 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';
+import '../../specs/miscellaneous/PredefinedNamespace.spec';

package/tests-library/LoginTests.ts

@@ -15,7 +15,8 @@ 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';
+import { TIMEOUT_CONSTANTS } from '../constants/TIMEOUT_CONSTANTS';
+import { Logger } from '../utils/Logger';
 
 @injectable()
 export class LoginTests {
@@ -28,30 +29,39 @@ export class LoginTests {
 		@inject(CLASSES.Dashboard) private readonly dashboard: Dashboard
 	) {}
 
-	loginIntoChe(userName?: string, password?: string): void {
-		test('Login', async (): Promise<void> => {
+	async loginIntoChe(
+		userName?: string,
+		password?: string,
+		timeout: number = TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT
+	): Promise<void> {
+		Logger.debug();
+		try {
 			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.dashboard.waitPage(timeout);
+			Logger.debug('user already logged in');
+		} catch (e) {
+			Logger.debug('try to login into application');
 			await this.productLoginPage.login(userName, password);
 			await this.browserTabsUtil.maximize();
 			await this.dashboard.waitStartingPageLoaderDisappearance();
-		});
+		}
 	}
 
 	loginIntoOcpConsole(): void {
-		test('Login into ocp console', async (): Promise<void> => {
-			const openshiftConsoleUrl: string = BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL.replace('devspaces', 'console-openshift-console');
+		suiteSetup('Login into ocp console', async (): Promise<void> => {
+			const openshiftConsoleUrl: string = BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL.replace(
+				BASE_TEST_CONSTANTS.TESTING_APPLICATION_NAME(),
+				'console-openshift-console'
+			);
 			await this.browserTabsUtil.navigateTo(openshiftConsoleUrl);
 			await this.ocpLoginPage.login();
 			await this.browserTabsUtil.maximize();
 		});
 	}
 
-	logoutFromChe(): void {
-		test('Logout', async (): Promise<void> => {
-			await this.dashboard.logout();
-			registerRunningWorkspace('');
-		});
+	async logoutFromChe(): Promise<void> {
+		await this.dashboard.logout();
 	}
 }

package/tests-library/ProjectAndFileTests.ts

@@ -46,12 +46,6 @@ export class ProjectAndFileTests {
 		Logger.debug();
 		// sometimes the trust dialog does not appear at first time, for avoiding this problem we send click event for activating
 		const workbench: Workbench = new Workbench();
-		await workbench.click();
-
-		await this.driverHelper.waitAndClick(
-			this.cheCodeLocatorLoader.webCheCodeLocators.WelcomeContent.button,
-			TIMEOUT_CONSTANTS.TS_DIALOG_WINDOW_DEFAULT_TIMEOUT
-		);
 
 		try {
 			await workbench.click();

package/tests-library/WorkspaceHandlingTests.ts

@@ -42,12 +42,8 @@ export class WorkspaceHandlingTests {
 		return WorkspaceHandlingTests.workspaceName;
 	}
 
-	setWindowHandle(guid: string): void {
-		WorkspaceHandlingTests.parentGUID = guid;
-	}
-
-	getWindowHandle(): string {
-		return WorkspaceHandlingTests.parentGUID;
+	static clearWorkspaceName(): void {
+		WorkspaceHandlingTests.workspaceName = 'undefined';
 	}
 
 	async createAndOpenWorkspace(stack: string): Promise<void> {

package/tsconfig.json

@@ -13,5 +13,5 @@
 		"noImplicitReturns": false,
 		"sourceMap": true
 	},
-	"include": [".eslintrc.js", "**/*.ts", "**/**/*.ts"]
+	"include": [".eslintrc.js", "**/*.ts", "**/**/*.ts", "**/reporters.config.js"]
 }