@eclipse-che/che-e2e 7.50.0-dev-d6432ff → 7.51.0-dev-6c69f4f

package/tests/e2e/FactoryUrl.spec.ts

@@ -12,20 +12,18 @@ import { e2eContainer } from '../../inversify.config';
 import { CLASSES, TYPES } from '../../inversify.types';
 import { TestConstants } from '../../TestConstants';
 import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
-import CheReporter from '../../driver/CheReporter';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
-import { WorkspaceNameHandler } from '../../utils/WorkspaceNameHandler';
-import { TestWorkspaceUtil } from '../../utils/workspace/TestWorkspaceUtil';
+import { ITestWorkspaceUtil } from '../../utils/workspace/ITestWorkspaceUtil';
+import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
 
 const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
-const workspaceNameHandler: WorkspaceNameHandler = e2eContainer.get(CLASSES.WorkspaceNameHandler);
-const testWorkspaceUtils: TestWorkspaceUtil = e2eContainer.get<TestWorkspaceUtil>(TYPES.WorkspaceUtil);
+const testWorkspaceUtils: ITestWorkspaceUtil = e2eContainer.get<ITestWorkspaceUtil>(TYPES.WorkspaceUtil);
+const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get<WorkspaceHandlingTests>(CLASSES.WorkspaceHandlingTests);
 
 const factoryUrl : string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=https://raw.githubusercontent.com/eclipse/che-devfile-registry/master/devfiles/java-maven/devfile.yaml`;
 const workspaceSampleName: string = 'console-java-simple';
 const workspaceRootFolderName: string = 'src';
-let workspaceName: string;
 
 // the suite expect user to be logged in
 suite('Workspace creation via factory url', async () => {
@@ -36,15 +34,13 @@ suite('Workspace creation via factory url', async () => {
     });
 
     suite('Wait workspace readyness', async () => {
+        workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
         projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceRootFolderName);
     });
 
     suite ('Stopping and deleting the workspace', async () => {
         test('Stop and remove workspace', async () => {
-            workspaceName = await workspaceNameHandler.getNameFromUrl();
-            CheReporter.registerRunningWorkspace(workspaceName);
-
-            await testWorkspaceUtils.cleanUpRunningWorkspace(workspaceName);
+            await testWorkspaceUtils.cleanUpRunningWorkspace(WorkspaceHandlingTests.getWorkspaceName());
         });
     });
 

package/tests/e2e/GitPublishBranch.spec.ts

@@ -18,12 +18,13 @@ import { QuickOpenContainer } from '../../pageobjects/ide/QuickOpenContainer';
 import { ICheLoginPage } from '../../pageobjects/login/ICheLoginPage';
 import { TestConstants } from '../../TestConstants';
 import { DriverHelper } from '../../utils/DriverHelper';
-import { TestWorkspaceUtil } from '../../utils/workspace/TestWorkspaceUtil';
 import { TopMenu } from '../../pageobjects/ide/TopMenu';
 import { WorkspaceNameHandler } from '../../utils/WorkspaceNameHandler';
 import { By } from 'selenium-webdriver';
-import CheReporter from '../../driver/CheReporter';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
+import { ITestWorkspaceUtil } from '../../utils/workspace/ITestWorkspaceUtil';
+import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../driver/CheReporter';
 
 const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
@@ -34,7 +35,7 @@ const topMenu: TopMenu = e2eContainer.get(CLASSES.TopMenu);
 const loginPage: ICheLoginPage = e2eContainer.get<ICheLoginPage>(TYPES.CheLogin);
 const projectTree: ProjectTree = e2eContainer.get(CLASSES.ProjectTree);
 const gitPlugin: GitPlugin = e2eContainer.get(CLASSES.GitPlugin);
-const testWorkspaceUtils: TestWorkspaceUtil = e2eContainer.get<TestWorkspaceUtil>(TYPES.WorkspaceUtil);
+const testWorkspaceUtils: ITestWorkspaceUtil = e2eContainer.get<ITestWorkspaceUtil>(TYPES.WorkspaceUtil);
 const workspaceNameHandler: WorkspaceNameHandler = e2eContainer.get(CLASSES.WorkspaceNameHandler);
 
 const workspacePrefixUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/dashboard/#/ide/${TestConstants.TS_SELENIUM_USERNAME}/`;
@@ -53,6 +54,7 @@ suite('Publish branch in git extension', async () => {
     test('Login into workspace', async () => {
         await browserTabsUtil.navigateTo(workspacePrefixUrl + wsNameGitPublishBranch);
         await loginPage.login();
+        WorkspaceHandlingTests.setWorkspaceName(wsNameGitPublishBranch);
         CheReporter.registerRunningWorkspace(wsNameGitPublishBranch);
         await ide.waitWorkspaceAndIde();
         await projectTree.openProjectTreeContainer();

package/tests/e2e/GitSelfSignCert.spec.ts

@@ -8,68 +8,71 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 
- import { e2eContainer } from '../../inversify.config';
- import { CLASSES, TYPES } from '../../inversify.types';
- import { GitPlugin } from '../../pageobjects/ide/plugins/GitPlugin';
- import { Ide } from '../../pageobjects/ide/Ide';
- import { ProjectTree } from '../../pageobjects/ide/ProjectTree';
- import { QuickOpenContainer } from '../../pageobjects/ide/QuickOpenContainer';
- import { ICheLoginPage } from '../../pageobjects/login/ICheLoginPage';
- import { TestConstants } from '../../TestConstants';
- import { DriverHelper } from '../../utils/DriverHelper';
- import { TestWorkspaceUtil } from '../../utils/workspace/TestWorkspaceUtil';
- import { TopMenu } from '../../pageobjects/ide/TopMenu';
- import { TimeoutConstants } from '../../TimeoutConstants';
- import { Dashboard } from '../../pageobjects/dashboard/Dashboard';
- import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
- import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
- import { Editor } from '../../pageobjects/ide/Editor';
+import { e2eContainer } from '../../inversify.config';
+import { CLASSES, TYPES } from '../../inversify.types';
+import { GitPlugin } from '../../pageobjects/ide/plugins/GitPlugin';
+import { Ide } from '../../pageobjects/ide/Ide';
+import { ProjectTree } from '../../pageobjects/ide/ProjectTree';
+import { QuickOpenContainer } from '../../pageobjects/ide/QuickOpenContainer';
+import { ICheLoginPage } from '../../pageobjects/login/ICheLoginPage';
+import { TestConstants } from '../../TestConstants';
+import { DriverHelper } from '../../utils/DriverHelper';
+import { TopMenu } from '../../pageobjects/ide/TopMenu';
+import { TimeoutConstants } from '../../TimeoutConstants';
+import { Dashboard } from '../../pageobjects/dashboard/Dashboard';
+import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
+import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
+import { Editor } from '../../pageobjects/ide/Editor';
+import { ITestWorkspaceUtil } from '../../utils/workspace/ITestWorkspaceUtil';
+import CheReporter from '../../driver/CheReporter';
 
- const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
- const ide: Ide = e2eContainer.get(CLASSES.Ide);
- const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
- const quickOpenContainer: QuickOpenContainer = e2eContainer.get(CLASSES.QuickOpenContainer);
- const topMenu: TopMenu = e2eContainer.get(CLASSES.TopMenu);
- const loginPage: ICheLoginPage = e2eContainer.get<ICheLoginPage>(TYPES.CheLogin);
- const projectTree: ProjectTree = e2eContainer.get(CLASSES.ProjectTree);
- const gitPlugin: GitPlugin = e2eContainer.get(CLASSES.GitPlugin);
- const testWorkspaceUtils: TestWorkspaceUtil = e2eContainer.get<TestWorkspaceUtil>(TYPES.WorkspaceUtil);
- const dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard);
- const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
- const editor: Editor = e2eContainer.get(CLASSES.Editor);
+const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
+const ide: Ide = e2eContainer.get(CLASSES.Ide);
+const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
+const quickOpenContainer: QuickOpenContainer = e2eContainer.get(CLASSES.QuickOpenContainer);
+const topMenu: TopMenu = e2eContainer.get(CLASSES.TopMenu);
+const loginPage: ICheLoginPage = e2eContainer.get<ICheLoginPage>(TYPES.CheLogin);
+const projectTree: ProjectTree = e2eContainer.get(CLASSES.ProjectTree);
+const gitPlugin: GitPlugin = e2eContainer.get(CLASSES.GitPlugin);
+const testWorkspaceUtils: ITestWorkspaceUtil = e2eContainer.get<ITestWorkspaceUtil>(TYPES.WorkspaceUtil);
+const dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard);
+const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
+const editor: Editor = e2eContainer.get(CLASSES.Editor);
 
- const workspaceName = 'gitSelfSignCert';
+const workspaceName = 'gitSelfSignCert';
 
- suite('Checking git + self sign cert', async () => {
-     const workspacePrefixUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/dashboard/#/ide/${TestConstants.TS_SELENIUM_USERNAME}/`;
-     const gitProjectUrl = `https://${TestConstants.TS_SELF_HOSTED_GIT_SERVER_URL}/maxura/gitService.git`;
-     const committedFile = 'README.md';
+suite('Checking git + self sign cert', async () => {
+    const workspacePrefixUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/dashboard/#/ide/${TestConstants.TS_SELENIUM_USERNAME}/`;
+    const gitProjectUrl = `https://${TestConstants.TS_SELF_HOSTED_GIT_SERVER_URL}/maxura/gitService.git`;
+    const committedFile = 'README.md';
 
-     suiteSetup(async function () {
-         const wsConfig = await testWorkspaceUtils.getBaseDevfile();
-         wsConfig.metadata!.name = workspaceName;
-         await browserTabsUtil.navigateTo(TestConstants.TS_SELENIUM_BASE_URL);
-         await loginPage.login();
-         await testWorkspaceUtils.createWsFromDevFile(wsConfig);
-     });
+    suiteSetup(async function () {
+        const wsConfig = await testWorkspaceUtils.getBaseDevfile();
+        wsConfig.metadata!.name = workspaceName;
+        WorkspaceHandlingTests.setWorkspaceName(workspaceName);
+        CheReporter.registerRunningWorkspace(workspaceName);
+        await browserTabsUtil.navigateTo(TestConstants.TS_SELENIUM_BASE_URL);
+        await loginPage.login();
+        await testWorkspaceUtils.createWsFromDevFile(wsConfig);
+    });
 
-     test('Wait until created workspace is started', async () => {
-         await dashboard.waitPage();
-         await browserTabsUtil.navigateTo(workspacePrefixUrl + workspaceName);
-         await ide.waitWorkspaceAndIde();
-         await projectTree.openProjectTreeContainer();
-         await driverHelper.wait(TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
-     });
+    test('Wait until created workspace is started', async () => {
+        await dashboard.waitPage();
+        await browserTabsUtil.navigateTo(workspacePrefixUrl + workspaceName);
+        await ide.waitWorkspaceAndIde();
+        await projectTree.openProjectTreeContainer();
+        await driverHelper.wait(TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
+    });
 
 
-     test('Clone project', async () => {
-         await cloneTestRepo(gitProjectUrl);
+    test('Clone project', async () => {
+        await cloneTestRepo(gitProjectUrl);
 
-         await projectTree.waitProjectImportedNoSubfolder('gitService');
-         await projectTree.waitItem('gitService/README.md');
-     });
+        await projectTree.waitProjectImportedNoSubfolder('gitService');
+        await projectTree.waitItem('gitService/README.md');
+    });
 
-     test('Change commit and push', async function changeCommitAndPushFunc() {
+    test('Change commit and push', async function changeCommitAndPushFunc() {
         const currentDate: string = Date.now().toString();
         await projectTree.expandPathAndOpenFile('gitService', committedFile);
         await editor.type(committedFile, currentDate + '\n', 1);
@@ -85,23 +88,23 @@
         await gitPlugin.waitDataIsSynchronized();
     });
 
- });
+});
 
- suite('Stopping and deleting the workspace', async () => {
+suite('Stopping and deleting the workspace', async () => {
     test(`Stop and remove workspace`, async () => {
         await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
     });
 });
 
- async function cloneTestRepo(linkToRepo: string) {
-     const confirmMessage = 'Clone from URL';
+async function cloneTestRepo(linkToRepo: string) {
+    const confirmMessage = 'Clone from URL';
 
-     await topMenu.selectOption('View', 'Find Command...');
-     // workaround - reopen 'Find Command' container - https://github.com/eclipse/che/issues/19793
-     await topMenu.selectOption('View', 'Find Command...');
-     await quickOpenContainer.typeAndSelectSuggestion('clone', 'Git: Clone');
-     await quickOpenContainer.typeAndSelectSuggestion(linkToRepo, confirmMessage);
-     await gitPlugin.clickOnSelectRepositoryButton();
+    await topMenu.selectOption('View', 'Find Command...');
+    // workaround - reopen 'Find Command' container - https://github.com/eclipse/che/issues/19793
+    await topMenu.selectOption('View', 'Find Command...');
+    await quickOpenContainer.typeAndSelectSuggestion('clone', 'Git: Clone');
+    await quickOpenContainer.typeAndSelectSuggestion(linkToRepo, confirmMessage);
+    await gitPlugin.clickOnSelectRepositoryButton();
 
-     await ide.waitAndApplyTrustNotification();
- }
+    await ide.waitAndApplyTrustNotification();
+}

package/tests/e2e/GitSsh.spec.ts

@@ -22,11 +22,12 @@ import { DriverHelper } from '../../utils/DriverHelper';
 import { WorkspaceNameHandler } from '../../utils/WorkspaceNameHandler';
 import { CheGitApi } from '../../utils/VCS/CheGitApi';
 import { GitHubUtil } from '../../utils/VCS/github/GitHubUtil';
-import { TestWorkspaceUtil } from '../../utils/workspace/TestWorkspaceUtil';
 import { TopMenu } from '../../pageobjects/ide/TopMenu';
 import { TimeoutConstants } from '../../TimeoutConstants';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 import { Dashboard } from '../..';
+import { ITestWorkspaceUtil } from '../../utils/workspace/ITestWorkspaceUtil';
+import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
 import CheReporter from '../../driver/CheReporter';
 
 const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
@@ -39,7 +40,7 @@ const gitHubUtils: GitHubUtil = e2eContainer.get<GitHubUtil>(CLASSES.GitHubUtil)
 const cheGitAPI: CheGitApi = e2eContainer.get(CLASSES.CheGitApi);
 const projectTree: ProjectTree = e2eContainer.get(CLASSES.ProjectTree);
 const gitPlugin: GitPlugin = e2eContainer.get(CLASSES.GitPlugin);
-const testWorkspaceUtils: TestWorkspaceUtil = e2eContainer.get<TestWorkspaceUtil>(TYPES.WorkspaceUtil);
+const testWorkspaceUtils: ITestWorkspaceUtil = e2eContainer.get<ITestWorkspaceUtil>(TYPES.WorkspaceUtil);
 const dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard);
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 const workspaceNameHandler: WorkspaceNameHandler = e2eContainer.get(CLASSES.WorkspaceNameHandler);
@@ -61,6 +62,7 @@ suite('Git with ssh workflow', async () => {
     test('Login into workspace and open tree container', async () => {
         await dashboard.openDashboard();
         await browserTabsUtil.navigateTo(workspacePrefixUrl + wsNameCheckGeneratingKeys);
+        WorkspaceHandlingTests.setWorkspaceName(wsNameCheckGeneratingKeys);
         CheReporter.registerRunningWorkspace(wsNameCheckGeneratingKeys);
         await ide.waitWorkspaceAndIde();
         await projectTree.openProjectTreeContainer();
@@ -111,7 +113,8 @@ suite('Git with ssh workflow', async () => {
         await testWorkspaceUtils.createWsFromDevFile(data);
         await dashboard.openDashboard();
         await browserTabsUtil.navigateTo(workspacePrefixUrl + wsNameCheckPropagatingKeys);
-        CheReporter.registerRunningWorkspace(wsNameCheckPropagatingKeys);
+        WorkspaceHandlingTests.setWorkspaceName(wsNameCheckPropagatingKeys);
+        CheReporter.registerRunningWorkspace(wsNameCheckGeneratingKeys);
         await ide.waitWorkspaceAndIde();
         await projectTree.openProjectTreeContainer();
         await driverHelper.wait(TimeoutConstants.TS_PROJECT_TREE_TIMEOUT);

package/tests/e2e/OpenshiftConnector.spec.ts

@@ -23,15 +23,16 @@ import { ICheLoginPage } from '../../pageobjects/login/ICheLoginPage';
 import { TestConstants } from '../../TestConstants';
 import { DriverHelper } from '../../utils/DriverHelper';
 import { PreferencesHandler, TerminalRendererType } from '../../utils/PreferencesHandler';
-import { TestWorkspaceUtil } from '../../utils/workspace/TestWorkspaceUtil';
 import { TimeoutConstants } from '../../TimeoutConstants';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
+import { ITestWorkspaceUtil } from '../../utils/workspace/ITestWorkspaceUtil';
+import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
 import CheReporter from '../../driver/CheReporter';
 
 const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
 const ide: Ide = e2eContainer.get(CLASSES.Ide);
 const loginPage: ICheLoginPage = e2eContainer.get<ICheLoginPage>(TYPES.CheLogin);
-const testWorkspaceUtils: TestWorkspaceUtil = e2eContainer.get<TestWorkspaceUtil>(TYPES.WorkspaceUtil);
+const testWorkspaceUtils: ITestWorkspaceUtil = e2eContainer.get<ITestWorkspaceUtil>(TYPES.WorkspaceUtil);
 const openshiftPlugin: OpenshiftPlugin = e2eContainer.get(CLASSES.OpenshiftPlugin);
 const dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard);
 const quickOpenContainer: QuickOpenContainer = e2eContainer.get(CLASSES.QuickOpenContainer);
@@ -77,6 +78,7 @@ suite('Openshift connector user story', async () => {
   test('Login into workspace and open plugin', async () => {
     await dashboard.openDashboard();
     await browserTabsUtil.navigateTo(workspacePrefixUrl + wsName);
+    WorkspaceHandlingTests.setWorkspaceName(wsName);
     CheReporter.registerRunningWorkspace(wsName);
     await ide.waitWorkspaceAndIde();
     await projectTree.openProjectTreeContainer();

package/tests/e2e/factories/DirectUrlFactoryWithKeepDirectoryTest.spec.ts

@@ -12,7 +12,6 @@ import { e2eContainer } from '../../../inversify.config';
 import { CLASSES } from '../../../inversify.types';
 import { TestConstants } from '../../../TestConstants';
 import { ProjectAndFileTests } from '../../../testsLibrary/ProjectAndFileTests';
-import CheReporter from '../../../driver/CheReporter';
 import { BrowserTabsUtil } from '../../../utils/BrowserTabsUtil';
 import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
 import { PreferencesHandler } from '../../../utils/PreferencesHandler';
@@ -28,7 +27,6 @@ const workspaceRootFolderName: string = 'src';
 const fileName: string = 'pom.xml';
 const fileFolderPath: string = `${workspaceSampleName}/${workspaceRootFolderName}/main/java/org/eclipse/che/examples`;
 const tabTitle: string = 'HelloWorld.java';
-let workspaceName: string = 'console-java-simple';
 
 suite('Workspace creation via factory url', async () => {
     suite('Open factory URL', async () => {
@@ -38,11 +36,10 @@ suite('Workspace creation via factory url', async () => {
     });
 
     suite('Wait workspace readyness', async () => {
+        workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
         projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceRootFolderName);
 
         test('Set confirmExit preference to never', async () => {
-            CheReporter.registerRunningWorkspace(workspaceName);
-
             await preferencesHandler.setPreferenceUsingUI('application.confirmExit', 'never');
         });
     });
@@ -56,7 +53,7 @@ suite('Workspace creation via factory url', async () => {
 
     suite ('Stopping and deleting the workspace', async () => {
         test('Stop and remove workspace', async () => {
-            await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
+            await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
         });
     });
 

package/tests/e2e/factories/DirectUrlFactoryWithRootFolderTest.spec.ts

@@ -12,7 +12,6 @@ import { e2eContainer } from '../../../inversify.config';
 import { CLASSES } from '../../../inversify.types';
 import { TestConstants } from '../../../TestConstants';
 import { ProjectAndFileTests } from '../../../testsLibrary/ProjectAndFileTests';
-import CheReporter from '../../../driver/CheReporter';
 import { BrowserTabsUtil } from '../../../utils/BrowserTabsUtil';
 import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
 import { PreferencesHandler } from '../../../utils/PreferencesHandler';
@@ -27,7 +26,6 @@ const workspaceSampleName: string = 'console-java-simple';
 const workspaceRootFolderName: string = 'src';
 const fileFolderPath: string = `${workspaceSampleName}/${workspaceRootFolderName}/main/java/org/eclipse/che/examples`;
 const tabTitle: string = 'HelloWorld.java';
-let workspaceName: string = 'console-java-simple';
 
 suite('Workspace creation via factory url', async () => {
     suite('Open factory URL', async () => {
@@ -37,11 +35,10 @@ suite('Workspace creation via factory url', async () => {
     });
 
     suite('Wait workspace readyness', async () => {
+        workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
         projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceRootFolderName);
 
         test('Set confirmExit preference to never', async () => {
-            CheReporter.registerRunningWorkspace(workspaceName);
-
             await preferencesHandler.setPreferenceUsingUI('application.confirmExit', 'never');
         });
     });
@@ -53,7 +50,7 @@ suite('Workspace creation via factory url', async () => {
 
     suite ('Stopping and deleting the workspace', async () => {
         test('Stop and remove workspace', async () => {
-            await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
+            await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
         });
     });
 

package/tests/e2e/factories/DirectUrlFactoryWithSpecificBranchTest.spec.ts

@@ -12,7 +12,6 @@ import { e2eContainer } from '../../../inversify.config';
 import { CLASSES } from '../../../inversify.types';
 import { TestConstants } from '../../../TestConstants';
 import { ProjectAndFileTests } from '../../../testsLibrary/ProjectAndFileTests';
-import CheReporter from '../../../driver/CheReporter';
 import { BrowserTabsUtil } from '../../../utils/BrowserTabsUtil';
 import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
 import { PreferencesHandler } from '../../../utils/PreferencesHandler';
@@ -27,7 +26,6 @@ const workspaceSampleName: string = 'console-java-simple';
 const workspaceRootFolderName: string = 'src';
 const fileFolderPath: string = `${workspaceSampleName}/${workspaceRootFolderName}/main/java/org/eclipse/che/examples`;
 const tabTitle: string = 'HelloWorld.java';
-let workspaceName: string = 'console-java-simple';
 
 suite('Workspace creation via factory url', async () => {
     suite('Open factory URL', async () => {
@@ -37,11 +35,10 @@ suite('Workspace creation via factory url', async () => {
     });
 
     suite('Wait workspace readyness', async () => {
+        workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
         projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceRootFolderName);
 
         test('Set confirmExit preference to never', async () => {
-            CheReporter.registerRunningWorkspace(workspaceName);
-
             await preferencesHandler.setPreferenceUsingUI('application.confirmExit', 'never');
         });
     });
@@ -53,7 +50,7 @@ suite('Workspace creation via factory url', async () => {
 
     suite ('Stopping and deleting the workspace', async () => {
         test('Stop and remove workspace', async () => {
-            await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
+            await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
         });
     });
 

package/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.ts

@@ -24,6 +24,7 @@ import { TimeoutConstants } from '../../TimeoutConstants';
 import { TopMenu } from '../../pageobjects/ide/TopMenu';
 import * as fs from 'fs';
 import axios from 'axios';
+import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
 import CheReporter from '../../driver/CheReporter';
 
 const ide: Ide = e2eContainer.get(CLASSES.Ide);
@@ -65,6 +66,7 @@ suite('Workspace creation via factory url', async () => {
         });
 
         test('Register running workspace', async () => {
+            WorkspaceHandlingTests.setWorkspaceName(projectName);
             CheReporter.registerRunningWorkspace(projectName);
         });
 

package/tests/e2e_happy_path/HappyPath.spec.ts

@@ -28,6 +28,7 @@ import { TimeoutConstants } from '../../TimeoutConstants';
 import { Logger } from '../../utils/Logger';
 import { RightToolBar } from '../../pageobjects/ide/RightToolBar';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
+import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
 import CheReporter from '../../driver/CheReporter';
 
 const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
@@ -75,11 +76,12 @@ suite('Validation of workspace start', async () => {
     });
 
     test('Register running workspace', async () => {
+        WorkspaceHandlingTests.setWorkspaceName(workspaceName);
         CheReporter.registerRunningWorkspace(workspaceName);
     });
 
     test('Wait for workspace readiness', async () => {
-        await ide.waitAndSwitchToIdeFrame();
+        // await ide.waitAndSwitchToIdeFrame(); test is outdated, should be deprecated.
         await ide.waitIde(TimeoutConstants.TS_SELENIUM_START_WORKSPACE_TIMEOUT);
         await projectTree.openProjectTreeContainer();
         await ide.waitNotificationAndClickOnButton('Do you trust the authors of', 'Yes, I trust', 60_000);
@@ -126,7 +128,7 @@ suite('Language server validation', async () => {
         } catch (err) {
             Logger.debug('Workaround for the https://github.com/eclipse/che/issues/18974.');
             await browserTabsUtil.refreshPage();
-            await ide.waitAndSwitchToIdeFrame();
+            // await ide.waitAndSwitchToIdeFrame(); test is outdated, should be deprecated.
             await ide.waitIde();
             await editor.waitErrorInLine(30, javaFileName, TimeoutConstants.TS_ERROR_HIGHLIGHTING_TIMEOUT * 2);
         }
@@ -240,10 +242,11 @@ suite('Validation of debug functionality', async () => {
     });
 
     test('Check content of the launched application', async () => {
-        await previewWidget.waitAndSwitchToWidgetFrame();
+        await previewWidget.waitAndSwitchToWidgetFrame(); // test is outdated, should be deprecated.
         await previewWidget.waitAndClick(SpringAppLocators.springHomeButtonLocator);
         await driverHelper.getDriver().switchTo().defaultContent();
-        await ide.waitAndSwitchToIdeFrame();
+        // await ide.waitAndSwitchToIdeFrame(); test is outdated, should be deprecated.
+        await ide.waitIde();
     });
 
     test('Open debug view', async () => {
@@ -280,7 +283,7 @@ suite('Validation of debug functionality', async () => {
 });
 
 async function checkErrorMessageInApplicationController() {
-    await previewWidget.waitAndSwitchToWidgetFrame();
+    await previewWidget.waitAndSwitchToWidgetFrame(); // test is outdated, should be deprecated.
     await previewWidget.waitAndClick(SpringAppLocators.springMenuButtonLocator);
     await previewWidget.waitAndClick(SpringAppLocators.springErrorButtonLocator);
 
@@ -289,15 +292,17 @@ async function checkErrorMessageInApplicationController() {
     } catch (err) {
 
         await driverHelper.getDriver().switchTo().defaultContent();
-        await ide.waitAndSwitchToIdeFrame();
+        // await ide.waitAndSwitchToIdeFrame(); test is outdated, should be deprecated.
+        await ide.waitIde();
 
-        await previewWidget.waitAndSwitchToWidgetFrame();
+        await previewWidget.waitAndSwitchToWidgetFrame(); // test is outdated, should be deprecated.
         await previewWidget.waitVisibility(SpringAppLocators.springErrorMessageLocator, 15_000);
     }
 
 
     await driverHelper.getDriver().switchTo().defaultContent();
-    await ide.waitAndSwitchToIdeFrame();
+    // await ide.waitAndSwitchToIdeFrame(); test is outdated, should be deprecated.
+    await ide.waitIde();
 }
 
 async function checkJavaPathCompletion() {

package/tests/intelij/IntelijOpenWorkspace.spec.ts

@@ -14,8 +14,6 @@ import { CLASSES } from '../../inversify.types';
 import { Ide } from '../../pageobjects/ide/Ide';
 import { DriverHelper } from '../../utils/DriverHelper';
 import { TestConstants } from '../../TestConstants';
-import { WorkspaceNameHandler } from '../../utils/WorkspaceNameHandler';
-import CheReporter from '../../driver/CheReporter';
 import { Dashboard } from '../../pageobjects/dashboard/Dashboard';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 
@@ -23,7 +21,6 @@ const ide: Ide = e2eContainer.get(CLASSES.Ide);
 const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 const dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard);
-const workspaceNameHandler: WorkspaceNameHandler = e2eContainer.get(CLASSES.WorkspaceNameHandler);
 
 const dashboardUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}`;
 
@@ -35,7 +32,8 @@ suite('The "IntelijOpenWorkspace" userstory', async () => {
 
         test('Wait workspace', async () => {
             await dashboard.waitWorkspaceStartingPage();
-            CheReporter.registerRunningWorkspace(await workspaceNameHandler.getNameFromUrl());
+            // todo: Fix workspace register in IntelliJ devfile - https://issues.redhat.com/browse/CRW-2954
+            /* CheReporter.registerRunningWorkspace(await workspaceNameHandler.getNameFromUrl()); */
             await ide.waitAndSwitchToIdeFrame();
             await waitIntelijWorkspace();
         });

package/tests/load_test/LoadTest.spec.ts

@@ -13,16 +13,16 @@ import { CLASSES, TYPES } from '../../inversify.types';
 import { Ide } from '../../pageobjects/ide/Ide';
 import { ProjectTree } from '../../pageobjects/ide/ProjectTree';
 import { ICheLoginPage } from '../../pageobjects/login/ICheLoginPage';
-import { TestWorkspaceUtil } from '../../utils/workspace/TestWorkspaceUtil';
 import { TestConstants, WorkspaceNameHandler } from '../..';
-import CheReporter from '../../driver/CheReporter';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
+import { ITestWorkspaceUtil } from '../../utils/workspace/ITestWorkspaceUtil';
+import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
 
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 const ide: Ide = e2eContainer.get(CLASSES.Ide);
 const projectTree: ProjectTree = e2eContainer.get(CLASSES.ProjectTree);
 const cheLoginPage: ICheLoginPage = e2eContainer.get<ICheLoginPage>(TYPES.CheLogin);
-const testWorkspaceUtils: TestWorkspaceUtil = e2eContainer.get<TestWorkspaceUtil>(TYPES.WorkspaceUtil);
+const testWorkspaceUtils: ITestWorkspaceUtil = e2eContainer.get<ITestWorkspaceUtil>(TYPES.WorkspaceUtil);
 const workspaceNameHandler: WorkspaceNameHandler = e2eContainer.get(CLASSES.WorkspaceNameHandler);
 
 const workspaceName: string = workspaceNameHandler.generateWorkspaceName('wksp-test-', 5);
@@ -44,7 +44,7 @@ suite('Load test suite', async () => {
     });
 
     test('Wait loading workspace and get time', async () => {
-        CheReporter.registerRunningWorkspace(workspaceName);
+        WorkspaceHandlingTests.setWorkspaceName(workspaceName);
         await ide.waitWorkspaceAndIde();
         await projectTree.openProjectTreeContainer();
     });

package/tests/login/LinkCheAndOcpUsers.spec.ts

@@ -8,14 +8,15 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 
-import { TestConstants, DriverHelper, CLASSES, TYPES } from '../..';
+import { TestConstants, CLASSES, TYPES } from '../..';
 import { e2eContainer } from '../../inversify.config';
 import { IOcpLoginPage } from '../../pageobjects/login/IOcpLoginPage';
 import { UpdateAccountInformationPage } from '../../pageobjects/login/UpdateAccountInformationPage';
 import { TimeoutConstants } from '../../TimeoutConstants';
 import { Dashboard } from '../../pageobjects/dashboard/Dashboard';
+import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 
-const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
+const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 const ocpLogin: IOcpLoginPage = e2eContainer.get<IOcpLoginPage>(TYPES.OcpLogin);
 const updateAccountInformation: UpdateAccountInformationPage = e2eContainer.get(CLASSES.UpdateAccountInformationPage);
 const dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard);
@@ -24,7 +25,7 @@ const commonTimeout: number = TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT * 2
 
 suite('Link users', async () => {
     test('Login to OCP', async () => {
-        await driverHelper.navigateToUrl(TestConstants.TS_SELENIUM_BASE_URL);
+        await browserTabsUtil.navigateTo(TestConstants.TS_SELENIUM_BASE_URL);
 
         await ocpLogin.login();
         await updateAccountInformation.clickToAllowSelectedPermissionsButton(commonTimeout);