@eclipse-che/che-e2e 7.46.1-dev-5e33fd3 → 7.48.0-dev-29d4f0d

package/tests/devfiles/JavaVertx.spec.ts

@@ -14,6 +14,7 @@ import { e2eContainer } from '../../inversify.config';
 import { CodeExecutionTests } from '../../testsLibrary/CodeExecutionTests';
 import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
 import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../driver/CheReporter';
 
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
@@ -27,11 +28,17 @@ const tabTitle: string = 'HttpApplication.java';
 const codeNavigationClassName: string = 'RouterImpl.class';
 const buildTaskName: string = 'maven build';
 const stack: string = 'Java Vert.x';
+let workspaceName: string;
 
 suite(`${stack} test`, async () => {
     suite (`Create ${stack} workspace`, async () => {
         workspaceHandlingTests.createAndOpenWorkspace(stack);
-        workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
+
+        test('Register running workspace', async () => {
+            workspaceName = WorkspaceHandlingTests.getWorkspaceName();
+            CheReporter.registerRunningWorkspace(workspaceName);
+        });
+
         projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceRootFolderName, false);
     });
 
@@ -54,7 +61,7 @@ suite(`${stack} test`, async () => {
 
     suite ('Stopping and deleting the workspace', async () => {
         test(`Stop and remowe workspace`, async () => {
-            await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+            await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
         });
     });
 

package/tests/devfiles/NodeJS.spec.ts

@@ -14,6 +14,7 @@ import { e2eContainer } from '../../inversify.config';
 import { CodeExecutionTests } from '../../testsLibrary/CodeExecutionTests';
 import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
 import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../driver/CheReporter';
 
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
@@ -29,12 +30,18 @@ const fileName: string = `app.js`;
 const taskDownloadDependencies: string = 'download dependencies';
 const taskRunWebApp: string = 'run the web app';
 const taskExpectedDialogText: string = 'Process nodejs is now listening on port 3000. Open it ?';
+let workspaceName: string;
 
 suite(`${workspaceStack} test`, async () => {
 
     suite(`Create ${workspaceStack}`, async () => {
         workspaceHandlingTests.createAndOpenWorkspace(workspaceStack);
-        workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
+
+        test('Register running workspace', async () => {
+            workspaceName = WorkspaceHandlingTests.getWorkspaceName();
+            CheReporter.registerRunningWorkspace(workspaceName);
+        });
+
         projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceRootFolderName, false);
     });
 
@@ -61,7 +68,7 @@ suite(`${workspaceStack} test`, async () => {
 
     suite('Stop and remove workspace', async() => {
         test(`Stop and remowe workspace`, async () => {
-            await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+            await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
         });
     });
 });

package/tests/devfiles/PHPSimple.spec.ts

@@ -15,6 +15,7 @@ import { LanguageServerTests } from '../../testsLibrary/LanguageServerTests';
 import { CodeExecutionTests } from '../../testsLibrary/CodeExecutionTests';
 import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
 import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../driver/CheReporter';
 
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
@@ -29,11 +30,17 @@ const tabTitle: string = 'index.php';
 const depTaskName: string = 'Configure Apache Web Server DocumentRoot';
 const buildTaskName: string = 'Start Apache Web Server';
 const stack: string = 'PHP Simple';
+let workspaceName: string;
 
 suite(`${stack} test`, async () => {
     suite (`Create ${stack} workspace`, async () => {
         workspaceHandlingTests.createAndOpenWorkspace(stack);
-        workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
+
+        test('Register running workspace', async () => {
+            workspaceName = WorkspaceHandlingTests.getWorkspaceName();
+            CheReporter.registerRunningWorkspace(workspaceName);
+        });
+
         projectAndFileTests.waitWorkspaceReadinessNoSubfolder(workspaceSampleName, false);
     });
 
@@ -60,7 +67,7 @@ suite(`${stack} test`, async () => {
 
     suite ('Stopping and deleting the workspace', async () => {
         test(`Stop and remowe workspace`, async () => {
-            await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+            await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
         });
     });
 

package/tests/devfiles/Python.spec.ts

@@ -14,6 +14,7 @@ import { e2eContainer } from '../../inversify.config';
 import { CodeExecutionTests } from '../../testsLibrary/CodeExecutionTests';
 import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
 import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../driver/CheReporter';
 
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
@@ -26,12 +27,18 @@ const workspaceSampleName: string = 'python-hello-world';
 const taskRunName: string = 'run';
 const fileFolderPath: string = `${workspaceSampleName}`;
 const fileName: string = `hello-world.py`;
+let workspaceName: string;
 
 suite(`${workspaceStack} test`, async () => {
 
     suite(`Create ${workspaceStack} workspace`, async () => {
         workspaceHandlingTests.createAndOpenWorkspace(workspaceStack);
-        workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
+
+        test('Register running workspace', async () => {
+            workspaceName = WorkspaceHandlingTests.getWorkspaceName();
+            CheReporter.registerRunningWorkspace(workspaceName);
+        });
+
         projectAndFileTests.waitWorkspaceReadinessNoSubfolder(workspaceSampleName, false);
     });
 
@@ -54,7 +61,7 @@ suite(`${workspaceStack} test`, async () => {
 
     suite ('Stopping and deleting the workspace', async () => {
         test(`Stop and remowe workspace`, async () => {
-            await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+            await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
         });
     });
 });

package/tests/devfiles/PythonDjango.spec.ts

@@ -13,6 +13,7 @@ import { CodeExecutionTests } from '../../testsLibrary/CodeExecutionTests';
 import { e2eContainer } from '../../inversify.config';
 import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
 import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../driver/CheReporter';
 
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
@@ -28,12 +29,18 @@ const taskRunServer: string = 'run server';
 const taskRunServerInDebugMode: string = 'run server in debug mode';
 const taskExpectedDialogText: string = 'Process django is now listening on port 7000. Open it ?';
 const taskExpectedDialogTextInDebugMode: string = 'A new process is now listening on port 5678 but this port is not a current endpoint.          Would you want to add a redirect for this port so it becomes available ?';
+let workspaceName: string;
 
 suite(`${workspaceStack} test`, async () => {
 
     suite(`Create ${workspaceStack} workspace`, async () => {
         workspaceHandlingTests.createAndOpenWorkspace(workspaceStack);
-        workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
+
+        test('Register running workspace', async () => {
+            workspaceName = WorkspaceHandlingTests.getWorkspaceName();
+            CheReporter.registerRunningWorkspace(workspaceName);
+        });
+
         projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceRootFolderName, false);
     });
 
@@ -57,7 +64,7 @@ suite(`${workspaceStack} test`, async () => {
 
     suite ('Stopping and deleting the workspace', async () => {
         test(`Stop and remowe workspace`, async () => {
-            await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+            await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
         });
     });
 });

package/tests/devfiles/Quarkus.spec.ts

@@ -14,6 +14,7 @@ import { e2eContainer } from '../../inversify.config';
 import { CodeExecutionTests } from '../../testsLibrary/CodeExecutionTests';
 import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
 import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../driver/CheReporter';
 
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
@@ -29,11 +30,17 @@ const fileName: string = `GreetingService.java`;
 const taskPackage: string = 'Package';
 const taskPackageNative: string = 'Package Native';
 const taskStartNative: string = 'Start Native';
+let workspaceName: string;
 
 suite(`${workspaceStack} test`, async () => {
     suite(`Create ${workspaceStack}`, async () => {
         workspaceHandlingTests.createAndOpenWorkspace(workspaceStack);
-        workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
+
+        test('Register running workspace', async () => {
+            workspaceName = WorkspaceHandlingTests.getWorkspaceName();
+            CheReporter.registerRunningWorkspace(workspaceName);
+        });
+
         projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceRootFolderName, false);
     });
 
@@ -66,7 +73,7 @@ suite(`${workspaceStack} test`, async () => {
 
     suite('Stop and remove workspace', async() => {
         test(`Stop and remowe workspace`, async () => {
-            await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+            await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
         });
     });
 });

package/tests/devfiles/Scala.spec.ts

@@ -14,6 +14,7 @@ import { e2eContainer } from '../../inversify.config';
 import { CodeExecutionTests } from '../../testsLibrary/CodeExecutionTests';
 import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
 import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../driver/CheReporter';
 
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
@@ -28,12 +29,18 @@ const compileTaskkName: string = 'sbt compile';
 const runTaskName: string = 'sbt run';
 const testTaskName: string = 'sbt test';
 const stack: string = 'Scala';
+let workspaceName: string;
 
 // skipping scala to enable pre-release suite to be easily used for updates until https://github.com/eclipse/che/issues/18662 is fixed
 suite.skip(`${stack} test`, async () => {
     suite (`Create ${stack} workspace`, async () => {
         workspaceHandlingTests.createAndOpenWorkspace(stack);
-        workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
+
+        test('Register running workspace', async () => {
+            workspaceName = WorkspaceHandlingTests.getWorkspaceName();
+            CheReporter.registerRunningWorkspace(workspaceName);
+        });
+
         projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceRootFolderName, false);
     });
 
@@ -60,7 +67,8 @@ suite.skip(`${stack} test`, async () => {
 
     suite ('Stopping and deleting the workspace', async () => {
         test(`Stop and remowe workspace`, async () => {
-            await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+            await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
         });
     });
+
 });

package/tests/e2e/FactoryUrl.spec.ts

@@ -12,18 +12,20 @@ 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 { 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 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 () => {
@@ -34,13 +36,15 @@ 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 () => {
-            await testWorkspaceUtils.cleanUpRunningWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+            workspaceName = await workspaceNameHandler.getNameFromUrl();
+            CheReporter.registerRunningWorkspace(workspaceName);
+
+            await testWorkspaceUtils.cleanUpRunningWorkspace(workspaceName);
         });
     });
 

package/tests/e2e/GitPublishBranch.spec.ts

@@ -22,8 +22,8 @@ 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 { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
 
 const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
@@ -53,7 +53,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();
         await driverHelper.wait(15000);

package/tests/e2e/GitSelfSignCert.spec.ts

@@ -8,69 +8,68 @@
  * 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 { 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';
 
-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: 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 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;
-        WorkspaceHandlingTests.setWorkspaceName(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;
+         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);
@@ -86,23 +85,23 @@ suite('Checking git + self sign cert', async () => {
         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

@@ -27,7 +27,7 @@ import { TopMenu } from '../../pageobjects/ide/TopMenu';
 import { TimeoutConstants } from '../../TimeoutConstants';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 import { Dashboard } from '../..';
-import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../driver/CheReporter';
 
 const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
 const ide: Ide = e2eContainer.get(CLASSES.Ide);
@@ -61,7 +61,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();
         await driverHelper.wait(TimeoutConstants.TS_PROJECT_TREE_TIMEOUT);
@@ -111,7 +111,7 @@ suite('Git with ssh workflow', async () => {
         await testWorkspaceUtils.createWsFromDevFile(data);
         await dashboard.openDashboard();
         await browserTabsUtil.navigateTo(workspacePrefixUrl + wsNameCheckPropagatingKeys);
-        WorkspaceHandlingTests.setWorkspaceName(wsNameCheckPropagatingKeys);
+        CheReporter.registerRunningWorkspace(wsNameCheckPropagatingKeys);
         await ide.waitWorkspaceAndIde();
         await projectTree.openProjectTreeContainer();
         await driverHelper.wait(TimeoutConstants.TS_PROJECT_TREE_TIMEOUT);

package/tests/e2e/OpenshiftConnector.spec.ts

@@ -26,7 +26,7 @@ import { PreferencesHandler, TerminalRendererType } from '../../utils/Preference
 import { TestWorkspaceUtil } from '../../utils/workspace/TestWorkspaceUtil';
 import { TimeoutConstants } from '../../TimeoutConstants';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
-import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../driver/CheReporter';
 
 const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
 const ide: Ide = e2eContainer.get(CLASSES.Ide);
@@ -77,7 +77,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();
     await projectTree.waitProjectImported(projectName, 'index.js');

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

@@ -12,6 +12,7 @@ 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,6 +28,7 @@ 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 () => {
@@ -36,10 +38,11 @@ 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 +56,7 @@ suite('Workspace creation via factory url', async () => {
 
     suite ('Stopping and deleting the workspace', async () => {
         test('Stop and remove workspace', async () => {
-            await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+            await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
         });
     });
 

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

@@ -12,6 +12,7 @@ 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';
@@ -26,6 +27,7 @@ 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 () => {
@@ -35,10 +37,11 @@ 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');
         });
     });
@@ -50,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(WorkspaceHandlingTests.getWorkspaceName());
+            await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
         });
     });
 

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

@@ -12,6 +12,7 @@ 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';
@@ -26,6 +27,7 @@ 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 () => {
@@ -35,10 +37,11 @@ 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');
         });
     });
@@ -50,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(WorkspaceHandlingTests.getWorkspaceName());
+            await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
         });
     });