@eclipse-che/che-e2e 7.50.0-dev-25a3c8c → 7.50.0

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>(CLASSES.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);

package/tests/plugins/GitHubPullRequestPlugin.spec.ts

@@ -24,7 +24,6 @@ import { GitPlugin } from '../../pageobjects/ide/plugins/GitPlugin';
 import { TopMenu } from '../../pageobjects/ide/TopMenu';
 import { QuickOpenContainer } from '../../pageobjects/ide/QuickOpenContainer';
 import { Editor } from '../../pageobjects/ide/Editor';
-import CheReporter from '../../driver/CheReporter';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 import { Key } from 'selenium-webdriver';
 
@@ -40,6 +39,7 @@ const topMenu: TopMenu = e2eContainer.get(CLASSES.TopMenu);
 const quickOpenContainer: QuickOpenContainer = e2eContainer.get(CLASSES.QuickOpenContainer);
 const editor: Editor = e2eContainer.get(CLASSES.Editor);
 const workspaceNameHandler: WorkspaceNameHandler = e2eContainer.get(CLASSES.WorkspaceNameHandler);
+const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 
 const devfileUrl: string = `https://raw.githubusercontent.com/eclipse/che/main/tests/e2e/files/devfiles/plugins/GitHubPullRequestPlugin.yaml`;
 const factoryUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devfileUrl}`;
@@ -50,7 +50,6 @@ const changedFile: string = 'README.md';
 // added call back url, but needs to be re-verified
 const identityCallbackUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/api/oauth/callback`;
 const currentDate: string = Date.now().toString();
-let workspaceName: string;
 
 suite(`The 'GitHubPullRequestPlugin' test`, async () => {
     suite('Setup github', async () => {
@@ -77,11 +76,9 @@ suite(`The 'GitHubPullRequestPlugin' test`, async () => {
             await browserTabsUtil.navigateTo(factoryUrl);
         });
 
-        test('Wait until created workspace is started', async () => {
-            await ide.waitAndSwitchToIdeFrame();
-            workspaceName = await workspaceNameHandler.getNameFromUrl();
-            CheReporter.registerRunningWorkspace(workspaceName);
+        workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
 
+        test('Wait until created workspace is started', async () => {
             await ide.waitIde(TimeoutConstants.TS_SELENIUM_START_WORKSPACE_TIMEOUT);
             await ide.waitNotificationAndClickOnButton('Do you trust the authors of', 'Yes, I trust', 60_000);
 
@@ -140,7 +137,7 @@ suite(`The 'GitHubPullRequestPlugin' test`, async () => {
     suite('Stopping and deleting the workspace', async () => {
         test(`Stop and remove workspace`, async () => {
             if (TestConstants.TS_DELETE_PLUGINS_TEST_WORKSPACE === 'true') {
-                await workspaceHandling.stopAndRemoveWorkspace(workspaceName);
+                await workspaceHandling.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
                 return;
             }
 

package/tests/plugins/InstallPluginUsingUI.spec.ts

@@ -18,8 +18,6 @@ import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 import { PluginsView } from '../../pageobjects/ide/plugins/PluginsView';
 import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
 import { Logger } from '../../utils/Logger';
-import { WorkspaceNameHandler } from '../../utils/WorkspaceNameHandler';
-import CheReporter from '../../driver/CheReporter';
 
 const ide: Ide = e2eContainer.get(CLASSES.Ide);
 const projectTree: ProjectTree = e2eContainer.get(CLASSES.ProjectTree);
@@ -27,13 +25,12 @@ const pluginsView: PluginsView = e2eContainer.get(CLASSES.PluginsView);
 
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 const workspaceHandling: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
-const workspaceNameHandler: WorkspaceNameHandler = e2eContainer.get(CLASSES.WorkspaceNameHandler);
+const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 
 const devfileUrl: string = 'https://raw.githubusercontent.com/eclipse/che/main/tests/e2e/files/devfiles/plugins/InstallPluginUsingUI.yaml';
 const factoryUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devfileUrl}`;
 
 const pluginTitle: string = 'java11';
-let workspaceName: string;
 
 suite(`The 'InstallPluginUsingUI' test`, async () => {
     suite('Create workspace', async () => {
@@ -41,11 +38,9 @@ suite(`The 'InstallPluginUsingUI' test`, async () => {
             await browserTabsUtil.navigateTo(factoryUrl);
         });
 
-        test('Wait until created workspace is started', async () => {
-            await ide.waitAndSwitchToIdeFrame();
-            workspaceName = await workspaceNameHandler.getNameFromUrl();
-            CheReporter.registerRunningWorkspace(workspaceName);
+        workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
 
+        test('Wait until created workspace is started', async () => {
             await ide.waitIde(TimeoutConstants.TS_SELENIUM_START_WORKSPACE_TIMEOUT);
 
             await projectTree.openProjectTreeContainer();
@@ -72,7 +67,7 @@ suite(`The 'InstallPluginUsingUI' test`, async () => {
     suite('Stopping and deleting the workspace', async () => {
         test(`Stop and remove workspace`, async () => {
             if (TestConstants.TS_DELETE_PLUGINS_TEST_WORKSPACE === 'true') {
-                await workspaceHandling.stopAndRemoveWorkspace(workspaceName);
+                await workspaceHandling.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
                 return;
             }
 

package/tests/plugins/JavaPlugin.spec.ts

@@ -18,7 +18,6 @@ import { Editor } from '../../pageobjects/ide/Editor';
 import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
 import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
 import { Logger } from '../../utils/Logger';
-import CheReporter from '../../driver/CheReporter';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 import { PreferencesHandler } from '../../utils/PreferencesHandler';
 
@@ -37,7 +36,6 @@ const subRootFolder: string = 'backend';
 
 const fileFolderPath: string = `${projectName}/backend/src/main/java/cloudcode/guestbook/backend`;
 const tabTitle: string = 'GuestBookEntry.java';
-let workspaceName: string = 'java-guestbook';
 
 suite(`The 'JavaPlugin' test`, async () => {
     suite('Create workspace', async () => {
@@ -45,11 +43,11 @@ suite(`The 'JavaPlugin' test`, async () => {
             await browserTabsUtil.navigateTo(factoryUrl);
         });
 
-        projectAndFileTests.waitWorkspaceReadiness(projectName, subRootFolder);
+        workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
 
-        test('Wait until created workspace is started', async () => {
-            CheReporter.registerRunningWorkspace(workspaceName);
+        projectAndFileTests.waitWorkspaceReadiness(projectName, subRootFolder);
 
+        test('Set confirmExit preference to never', async () => {
             await preferencesHandler.setPreferenceUsingUI('application.confirmExit', 'never');
         });
     });
@@ -91,7 +89,7 @@ suite(`The 'JavaPlugin' test`, async () => {
     suite('Stopping and deleting the workspace', async () => {
         test('Stop and remove workspace', async () => {
             if (TestConstants.TS_DELETE_PLUGINS_TEST_WORKSPACE === 'true') {
-                await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
+                await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
                 return;
             }
 

package/tests/plugins/PhpPlugin.spec.ts

@@ -7,7 +7,6 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
-import { WorkspaceNameHandler } from '../..';
 import 'reflect-metadata';
 import { e2eContainer } from '../../inversify.config';
 import { CLASSES } from '../../inversify.types';
@@ -22,7 +21,6 @@ import { DebugView } from '../../pageobjects/ide/DebugView';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
 import { Logger } from '../../utils/Logger';
-import CheReporter from '../../driver/CheReporter';
 
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 const ide: Ide = e2eContainer.get(CLASSES.Ide);
@@ -31,7 +29,6 @@ const editor: Editor = e2eContainer.get(CLASSES.Editor);
 const topMenu: TopMenu = e2eContainer.get(CLASSES.TopMenu);
 const debugView: DebugView = e2eContainer.get(CLASSES.DebugView);
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
-const workspaceNameHandler: WorkspaceNameHandler = e2eContainer.get(CLASSES.WorkspaceNameHandler);
 
 const devfileUrl: string = 'https://raw.githubusercontent.com/eclipse/che/main/tests/e2e/files/devfiles/plugins/PhpPluginTest.yaml';
 const factoryUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devfileUrl}`;
@@ -40,7 +37,6 @@ const subRootFolder: string = 'README.md';
 
 const fileFolderPath: string = `${projectName}`;
 const tabTitle: string = 'index.php';
-let workspaceName: string;
 
 suite(`The 'PhpPlugin' tests`, async () => {
     suite('Create workspace', async () => {
@@ -48,11 +44,9 @@ suite(`The 'PhpPlugin' tests`, async () => {
             await browserTabsUtil.navigateTo(factoryUrl);
         });
 
-        test('Wait until created workspace is started', async () => {
-            await ide.waitAndSwitchToIdeFrame();
-            workspaceName = await workspaceNameHandler.getNameFromUrl();
-            CheReporter.registerRunningWorkspace(workspaceName);
+        workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
 
+        test('Wait until created workspace is started', async () => {
             await ide.waitIde(TimeoutConstants.TS_SELENIUM_START_WORKSPACE_TIMEOUT);
             await ide.waitNotificationAndClickOnButton('Do you trust the authors of', 'Yes, I trust', 60_000);
 
@@ -111,7 +105,7 @@ suite(`The 'PhpPlugin' tests`, async () => {
     suite('Stopping and deleting the workspace', async () => {
         test('Stop and remove workspace', async () => {
             if (TestConstants.TS_DELETE_PLUGINS_TEST_WORKSPACE === 'true') {
-                await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
+                await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
                 return;
             }
 

package/tests/plugins/PythonPlugin.spec.ts

@@ -17,7 +17,6 @@ import { Key } from 'selenium-webdriver';
 import { Editor } from '../../pageobjects/ide/Editor';
 import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
 import { Logger } from '../../utils/Logger';
-import CheReporter from '../../driver/CheReporter';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
 import { PreferencesHandler } from '../../utils/PreferencesHandler';
@@ -36,7 +35,6 @@ const subRootFolder: string = '.vscode';
 
 const fileFolderPath: string = `${projectName}`;
 const tabTitle: string = 'hello-world.py';
-let workspaceName: string = 'python-hello-world';
 
 suite(`The 'PythonPlugin' test`, async () => {
     suite('Create workspace', async () => {
@@ -44,11 +42,11 @@ suite(`The 'PythonPlugin' test`, async () => {
             await browserTabsUtil.navigateTo(factoryUrl);
         });
 
-        projectAndFileTests.waitWorkspaceReadiness(projectName, subRootFolder);
+        workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
 
-        test('Wait until created workspace is started', async () => {
-            CheReporter.registerRunningWorkspace(workspaceName);
+        projectAndFileTests.waitWorkspaceReadiness(projectName, subRootFolder);
 
+        test('Set confirmExit preference to never', async () => {
             await preferencesHandler.setPreferenceUsingUI('application.confirmExit', 'never');
         });
     });
@@ -78,7 +76,7 @@ suite(`The 'PythonPlugin' test`, async () => {
     suite('Stopping and deleting the workspace', async () => {
         test('Stop and remove workspace', async () => {
             if (TestConstants.TS_DELETE_PLUGINS_TEST_WORKSPACE === 'true') {
-                await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
+                await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
                 return;
             }
 

package/tests/plugins/TypescriptPlugin.spec.ts

@@ -23,7 +23,6 @@ import { Terminal } from '../../pageobjects/ide/Terminal';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
 import { Logger } from '../../utils/Logger';
-import CheReporter from '../../driver/CheReporter';
 import { PreferencesHandler } from '../../utils/PreferencesHandler';
 import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
 
@@ -49,7 +48,6 @@ const fileFolderPath: string = `${projectName}`;
 const debugFileFolderPath: string = `${projectName}/app`;
 const debugFile: string = 'app.js';
 const tabTitle: string = 'typescript-node-debug.ts';
-let workspaceName: string = 'typescript-plugin';
 
 suite(`The 'TypescriptPlugin and Node-debug' tests`, async () => {
     suite('Create workspace', async () => {
@@ -57,11 +55,11 @@ suite(`The 'TypescriptPlugin and Node-debug' tests`, async () => {
             await browserTabsUtil.navigateTo(factoryUrl);
         });
 
-        projectAndFileTests.waitWorkspaceReadiness(projectName, subRootFolder);
+        workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
 
-        test('Wait until created workspace is started', async () => {
-            CheReporter.registerRunningWorkspace(workspaceName);
+        projectAndFileTests.waitWorkspaceReadiness(projectName, subRootFolder);
 
+        test('Set confirmExit preference to never', async () => {
             await preferencesHandler.setPreferenceUsingUI('application.confirmExit', 'never');
         });
     });
@@ -160,7 +158,7 @@ suite(`The 'TypescriptPlugin and Node-debug' tests`, async () => {
     suite('Stopping and deleting the workspace', async () => {
         test('Stop and remove workspace', async () => {
             if (TestConstants.TS_DELETE_PLUGINS_TEST_WORKSPACE === 'true') {
-                await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
+                await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
                 return;
             }
 

package/tests/plugins/VscodeKubernetesPlugin.spec.ts

@@ -17,9 +17,7 @@ import { KubernetesPlugin } from '../../pageobjects/ide/plugins/KubernetesPlugin
 import { ProjectTree } from '../../pageobjects/ide/ProjectTree';
 import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
 import { Logger } from '../../utils/Logger';
-import CheReporter from '../../driver/CheReporter';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
-import { WorkspaceNameHandler } from '../../utils/WorkspaceNameHandler';
 import { TopMenu } from '../../pageobjects/ide/TopMenu';
 import { QuickOpenContainer } from '../../pageobjects/ide/QuickOpenContainer';
 import { OpenDialogWidget, Buttons } from '../../pageobjects/ide/OpenDialogWidget';
@@ -29,7 +27,6 @@ const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUti
 const ide: Ide = e2eContainer.get(CLASSES.Ide);
 const kubernetesPlugin: KubernetesPlugin = e2eContainer.get(CLASSES.KubernetesPlugin);
 const projectTree: ProjectTree = e2eContainer.get(CLASSES.ProjectTree);
-const workspaceNameHandler: WorkspaceNameHandler = e2eContainer.get(CLASSES.WorkspaceNameHandler);
 const topMenu: TopMenu = e2eContainer.get(CLASSES.TopMenu);
 const quickOpenContainer: QuickOpenContainer = e2eContainer.get(CLASSES.QuickOpenContainer);
 const openDialogWidget: OpenDialogWidget = e2eContainer.get(CLASSES.OpenDialogWidget);
@@ -38,7 +35,6 @@ const devfileUrl: string = 'https://raw.githubusercontent.com/eclipse/che/main/t
 const factoryUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devfileUrl}`;
 const sampleName: string = 'nodejs-web-app';
 const subRootFolder: string = 'app';
-let workspaceName: string;
 
 suite(`The 'VscodeKubernetesPlugin' test`, async () => {
     suite('Create workspace', async () => {
@@ -46,11 +42,9 @@ suite(`The 'VscodeKubernetesPlugin' test`, async () => {
             await browserTabsUtil.navigateTo(factoryUrl);
         });
 
-        test('Wait until created workspace is started', async () => {
-            await ide.waitAndSwitchToIdeFrame();
-            workspaceName = await workspaceNameHandler.getNameFromUrl();
-            CheReporter.registerRunningWorkspace(workspaceName);
+        workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
 
+        test('Wait until created workspace is started', async () => {
             await ide.waitIde(TimeoutConstants.TS_SELENIUM_START_WORKSPACE_TIMEOUT);
             await ide.waitNotificationAndClickOnButton('Do you trust the authors of', 'Yes, I trust', 60_000);
 
@@ -79,7 +73,7 @@ suite(`The 'VscodeKubernetesPlugin' test`, async () => {
     suite('Stopping and deleting the workspace', async () => {
         test('Stop and remove workspace', async () => {
             if (TestConstants.TS_DELETE_PLUGINS_TEST_WORKSPACE === 'true') {
-                await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
+                await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
                 return;
             }
 

package/tests/plugins/VscodeShellcheckPlugin.spec.ts

@@ -19,9 +19,7 @@ import { ProjectTree } from '../../pageobjects/ide/ProjectTree';
 import { Key } from 'selenium-webdriver';
 import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
 import { Logger } from '../../utils/Logger';
-import CheReporter from '../../driver/CheReporter';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
-import { WorkspaceNameHandler } from '../../utils/WorkspaceNameHandler';
 
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
@@ -29,7 +27,6 @@ const ide: Ide = e2eContainer.get(CLASSES.Ide);
 const preferencesHandler: PreferencesHandler = e2eContainer.get(CLASSES.PreferencesHandler);
 const editor: Editor = e2eContainer.get(CLASSES.Editor);
 const projectTree: ProjectTree = e2eContainer.get(CLASSES.ProjectTree);
-const workspaceNameHandler: WorkspaceNameHandler = e2eContainer.get(CLASSES.WorkspaceNameHandler);
 
 const devfileUrl: string = 'https://raw.githubusercontent.com/eclipse/che/main/tests/e2e/files/devfiles/plugins/VscodeShellcheckPlugin.yaml';
 const factoryUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devfileUrl}`;
@@ -37,7 +34,6 @@ const sampleName: string = 'nodejs-web-app';
 const subRootFolder: string = 'app';
 const pathToFile: string = `${sampleName}`;
 const fileName: string = 'test.sh';
-let workspaceName: string;
 
 suite(`The 'VscodeShellcheckPlugin' test`, async () => {
     suite('Create workspace', async () => {
@@ -52,11 +48,9 @@ suite(`The 'VscodeShellcheckPlugin' test`, async () => {
             await browserTabsUtil.navigateTo(factoryUrl);
         });
 
-        test('Wait until created workspace is started', async () => {
-            await ide.waitAndSwitchToIdeFrame();
-            workspaceName = await workspaceNameHandler.getNameFromUrl();
-            CheReporter.registerRunningWorkspace(workspaceName);
+        workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
 
+        test('Wait until created workspace is started', async () => {
             await ide.waitIde(TimeoutConstants.TS_SELENIUM_START_WORKSPACE_TIMEOUT);
             await ide.waitNotificationAndClickOnButton('Do you trust the authors of', 'Yes, I trust', 60_000);
 
@@ -96,7 +90,7 @@ suite(`The 'VscodeShellcheckPlugin' test`, async () => {
     suite('Stopping and deleting the workspace', async () => {
         test('Stop and remove workspace', async () => {
             if (TestConstants.TS_DELETE_PLUGINS_TEST_WORKSPACE === 'true') {
-                await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
+                await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
                 return;
             }
 

package/tests/plugins/VscodeValePlugin.spec.ts

@@ -16,11 +16,9 @@ import { ProjectTree } from '../../pageobjects/ide/ProjectTree';
 import { Editor } from '../../pageobjects/ide/Editor';
 import { TestConstants } from '../../TestConstants';
 import { TimeoutConstants } from '../../TimeoutConstants';
-import { WorkspaceNameHandler } from '../../utils/WorkspaceNameHandler';
 import { Terminal } from '../../pageobjects/ide/Terminal';
 import { Logger } from '../../utils/Logger';
 import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
-import CheReporter from '../../driver/CheReporter';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 
 const ide: Ide = e2eContainer.get(CLASSES.Ide);
@@ -29,14 +27,12 @@ const editor: Editor = e2eContainer.get(CLASSES.Editor);
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 const terminal: Terminal = e2eContainer.get(CLASSES.Terminal);
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
-const workspaceNameHandler: WorkspaceNameHandler = e2eContainer.get(CLASSES.WorkspaceNameHandler);
 
 const devfileUrl: string = 'https://raw.githubusercontent.com/eclipse/che/main/tests/e2e/files/devfiles/plugins/VscodeValePlugin.yaml';
 const factoryUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devfileUrl}`;
 const projectName: string = 'che-docs';
 const pathToFile: string = `${projectName}/modules/administration-guide/partials`;
 const docFileName: string = 'assembly_authenticating-users.adoc';
-let workspaceName: string = '';
 
 suite('The "VscodeValePlugin" userstory', async () => {
     suite('Create workspace', async () => {
@@ -44,11 +40,9 @@ suite('The "VscodeValePlugin" userstory', async () => {
             await browserTabsUtil.navigateTo(factoryUrl);
         });
 
-        test('Wait until created workspace is started', async () => {
-            await ide.waitAndSwitchToIdeFrame();
-            workspaceName = await workspaceNameHandler.getNameFromUrl();
-            CheReporter.registerRunningWorkspace(workspaceName);
+        workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
 
+        test('Wait until created workspace is started', async () => {
             await ide.waitIde(TimeoutConstants.TS_SELENIUM_START_WORKSPACE_TIMEOUT);
             await ide.waitNotificationAndClickOnButton('Do you trust the authors of', 'Yes, I trust', 60_000);
         });
@@ -81,7 +75,7 @@ suite('The "VscodeValePlugin" userstory', async () => {
     suite('Stopping and deleting the workspace', async () => {
         test('Stop and remove workspace', async () => {
             if (TestConstants.TS_DELETE_PLUGINS_TEST_WORKSPACE === 'true') {
-                await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
+                await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
                 return;
             }