@eclipse-che/che-e2e 7.76.0-next-95f5f91 → 7.76.0-next-af784fc

package/specs/factory/NoSetupRepoFactory.spec.ts

@@ -28,7 +28,7 @@ import { StringUtil } from '../../utils/StringUtil';
 import { CheCodeLocatorLoader } from '../../pageobjects/ide/CheCodeLocatorLoader';
 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 { ProjectAndFileTests } from '../../tests-library/ProjectAndFileTests';
 import { DriverHelper } from '../../utils/DriverHelper';
@@ -39,6 +39,7 @@ import { LoginTests } from '../../tests-library/LoginTests';
 import { FACTORY_TEST_CONSTANTS, GitProviderType } from '../../constants/FACTORY_TEST_CONSTANTS';
 import { OAUTH_CONSTANTS } from '../../constants/OAUTH_CONSTANTS';
 import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
+import { ITestWorkspaceUtil } from '../../utils/workspace/ITestWorkspaceUtil';
 
 suite(
 	`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}`,
@@ -52,6 +53,7 @@ suite(
 		const dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard);
 		const workspaces: Workspaces = e2eContainer.get(CLASSES.Workspaces);
 		const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
+		const testWorkspaceUtil: ITestWorkspaceUtil = e2eContainer.get(TYPES.WorkspaceUtil);
 
 		let projectSection: ViewSection;
 		let scmProvider: SingleScmProvider;
@@ -69,7 +71,9 @@ 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('Get number of previously created workspaces', async function (): Promise<void> {
 			await dashboard.clickWorkspacesButton();
@@ -95,8 +99,6 @@ suite(
 				const allCreatedWorkspacesNames: string[] = await workspaces.getAllCreatedWorkspacesNames();
 				expect(allCreatedWorkspacesNames).has.length(numberOfCreatedWorkspaces);
 			});
-
-			loginTests.logoutFromChe();
 		} else {
 			test('Obtain workspace name from workspace loader page', async function (): Promise<void> {
 				await workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
@@ -241,16 +243,18 @@ suite(
 				expect(isCommitButtonDisabled).to.be.true;
 			});
 
-			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/factory/RefusedOAuthFactory.spec.ts

@@ -26,7 +26,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 +38,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,6 +52,8 @@ 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;
@@ -66,7 +70,9 @@ 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());
@@ -232,15 +238,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/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,19 +29,28 @@ 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> => {
+		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'
@@ -51,10 +61,7 @@ export class LoginTests {
 		});
 	}
 
-	logoutFromChe(): void {
-		test('Logout', async (): Promise<void> => {
-			await this.dashboard.logout();
-			registerRunningWorkspace('');
-		});
+	async logoutFromChe(): Promise<void> {
+		await this.dashboard.logout();
 	}
 }

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/utils/BrowserTabsUtil.ts

@@ -76,7 +76,14 @@ export class BrowserTabsUtil {
 	async getCurrentUrl(): Promise<string> {
 		Logger.trace();
 
-		return await this.driverHelper.getDriver().getCurrentUrl();
+		let currentUrl: string = '';
+		try {
+			currentUrl = await this.driverHelper.getDriver().getCurrentUrl();
+		} catch (e) {
+			Logger.trace('cannot get current url');
+		}
+
+		return currentUrl;
 	}
 
 	async waitURL(expectedUrl: string, timeout: number): Promise<void> {

package/utils/Logger.ts

@@ -150,7 +150,7 @@ export class Logger {
 
 	private static isRootCaller(traceLevel: number = 6): boolean {
 		return this.getCallStackArray()
-			.slice(traceLevel, traceLevel + 2)
+			.slice(traceLevel, traceLevel + 4)
 			.reduce((acc, e): boolean => {
 				return acc || /MochaHooks|CheReporter/.test(e);
 			}, false);

package/utils/workspace/ITestWorkspaceUtil.ts

@@ -11,33 +11,33 @@
 import { WorkspaceStatus } from './WorkspaceStatus';
 
 export interface ITestWorkspaceUtil {
-	waitWorkspaceStatus(namespace: string, workspaceName: string, expectedWorkspaceStatus: WorkspaceStatus): void;
+	waitWorkspaceStatus(workspaceName: string, expectedWorkspaceStatus: WorkspaceStatus): Promise<void>;
 
-	stopWorkspaceByName(workspaceName: string): void;
+	stopWorkspaceByName(workspaceName: string): Promise<void>;
 
 	/**
 	 * delete a workspace without stopping phase (similar with force deleting)
 	 */
-	deleteWorkspaceByName(workspaceName: string): void;
+	deleteWorkspaceByName(workspaceName: string): Promise<void>;
 
 	/**
 	 * stop workspace before deleting with checking stopping phase
 	 */
-	stopAndDeleteWorkspaceByName(workspaceName: string): void;
+	stopAndDeleteWorkspaceByName(workspaceName: string): Promise<void>;
 
 	/**
 	 * stop all run workspaces in the namespace
 	 */
-	stopAllRunningWorkspaces(namespace: string): void;
+	stopAllRunningWorkspaces(): Promise<void>;
 
 	/**
 	 * stop all run workspaces, check statused and remove the workspaces
 	 */
-	stopAndDeleteAllRunningWorkspaces(namespace: string): void;
+	stopAndDeleteAllRunningWorkspaces(): Promise<void>;
 
 	/**
 	 * stop all run workspaces without stopping and waiting for of 'Stopped' phase
 	 * Similar with 'force' deleting
 	 */
-	deleteAllWorkspaces(namespace: string): void;
+	deleteAllWorkspaces(): Promise<void>;
 }