@eclipse-che/che-e2e 7.43.0 → 7.44.1-dev-bc873f3

package/index.ts

@@ -9,7 +9,6 @@ export * from './driver/IDriver';
 export * from './utils/AnimationChecker';
 export * from './utils/BrowserTabsUtil';
 export * from './utils/DriverHelper';
-export * from './utils/KeycloackUrlHandler';
 export * from './utils/Logger';
 export * from './utils/PreferencesHandler';
 export * from './utils/requestHandlers/CheApiRequestHandler';
@@ -39,6 +38,7 @@ export * from './pageobjects/ide/LeftToolBar';
 export * from './pageobjects/ide/NavigationBar';
 export * from './pageobjects/ide/NotificationCenter';
 export * from './pageobjects/ide/OpenDialogWidget';
+export * from './pageobjects/ide/OpenEditors';
 export * from './pageobjects/ide/OpenWorkspaceWidget';
 export * from './pageobjects/ide/plugins/GitHubPullRequestPlugin';
 export * from './pageobjects/ide/plugins/GitPlugin';

package/mocha-all-factories.json

@@ -7,6 +7,7 @@
     "require": "source-map-support/register",
     "spec": [
         "dist/tests/login/Login.spec.js",
-        "dist/tests/e2e/factories/*.spec.js"
+        "dist/tests/e2e/factories/DirectUrlFactoryWithRootFolderTest.spec.js",
+        "dist/tests/e2e/factories/DirectUrlFactoryWithSpecificBranchTest.spec.js"
     ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-che/che-e2e",
-  "version": "7.43.0",
+  "version": "7.44.1-dev-bc873f3",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -26,7 +26,7 @@
     "tsc": "tsc -p .",
     "init-mocha-opts": "tsc && mocha --config mocha-single-devfile.json --spec dist/tests/login/Login.spec.js",
     "test-plugin": "./initPluginTest.sh",
-    "test-plugin-ci": "export TS_DELETE_PLUGINS_TEST_WORKSPACE=false && npm run init-mocha-opts -- --spec dist/tests/plugins/${USERSTORY}.spec.js",
+    "test-plugin-ci": "export TS_DELETE_PLUGINS_TEST_WORKSPACE=true && npm run init-mocha-opts -- --spec dist/tests/plugins/${USERSTORY}.spec.js",
     "test-all-plugins": "tsc && mocha --config mocha-all-plugins.json"
   },
   "author": "Ihor Okhrimenko (iokhrime@redhat.com)",
@@ -39,7 +39,7 @@
     "@types/selenium-webdriver": "3.0.16",
     "axios": "^0.25.0",
     "chai": "4.2.0",
-    "chromedriver": "97.0.0",
+    "chromedriver": "^99.0.0",
     "mocha": "^9.1.3",
     "rimraf": "2.6.2",
     "selenium-webdriver": "3.6.0",

package/pageobjects/dashboard/Dashboard.ts

@@ -60,7 +60,6 @@ export class Dashboard {
 
     async openDashboard() {
         Logger.debug('Dashboard.openDashboard');
-
         await this.driverHelper.getDriver().navigate().to(TestConstants.TS_SELENIUM_BASE_URL);
         await this.waitPage();
 
@@ -109,4 +108,10 @@ export class Dashboard {
         await this.driverHelper.waitPresence(By.css(Dashboard.WORKSPACE_STARTING_PAGE_CSS), timeout);
     }
 
+    async getRecentWorkspaceName(timeout: number = TimeoutConstants.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
+        Logger.debug(`Dashboard.recentWorkspaceName`);
+
+        return await this.driverHelper.waitAndGetText(By.css('[data-testid="recent-workspace-item"]'), timeout);
+    }
+
 }

package/pageobjects/dashboard/workspace-details/WorkspaceDetails.ts

@@ -85,7 +85,7 @@ export class WorkspaceDetails {
         Logger.debug(`WorkspaceDetails.openWorkspace "${namespace}/${workspaceName}"`);
 
         await this.clickOnOpenButton(timeout);
-        await this.driverHelper.waitVisibility(By.css(Ide.ACTIVATED_IDE_IFRAME_CSS), TimeoutConstants.TS_COMMON_DASHBOARD_WAIT_TIMEOUT);
+        await this.driverHelper.waitVisibility(By.css(Ide.THEIA_EDITOR_CSS), TimeoutConstants.TS_COMMON_DASHBOARD_WAIT_TIMEOUT);
         await this.testWorkspaceUtil.waitWorkspaceStatus(namespace, workspaceName, WorkspaceStatus.STARTING);
     }
 

package/pageobjects/ide/Ide.ts

@@ -29,7 +29,7 @@ export enum LeftToolbarButton {
 export class Ide {
     public static readonly EXPLORER_BUTTON_ID: string = 'shell-tab-explorer-view-container';
     public static readonly SELECTED_EXPLORER_BUTTON_CSS: string = 'li#shell-tab-explorer-view-container.theia-mod-active';
-    public static readonly ACTIVATED_IDE_IFRAME_CSS: string = '#ide-iframe-window[aria-hidden=\'false\']';
+    public static readonly THEIA_EDITOR_CSS: string = '#theia-main-content-panel';
     public static readonly SELECTED_GIT_BUTTON_XPATH: string = '(//ul[@class=\'p-TabBar-content\']//li[@title=\'Git\' and contains(@class, \'p-mod-current\')])[1]';
     private static readonly TOP_MENU_PANEL_CSS: string = '#theia-app-shell #theia-top-panel .p-MenuBar-content';
     private static readonly LEFT_CONTENT_PANEL_CSS: string = '#theia-left-content-panel';
@@ -41,21 +41,34 @@ export class Ide {
         @inject(CLASSES.NotificationCenter) private readonly notificationCenter: NotificationCenter
     ) { }
 
+    /**
+     * @deprecated Method deprecated. Iframe is not available, Replace it with waitForEditor() or waitIde() method incase for conditional wait
+     * @see Ide.waitForEditor()
+     */
     async waitAndSwitchToIdeFrame(timeout: number = TimeoutConstants.TS_SELENIUM_START_WORKSPACE_TIMEOUT) {
         Logger.debug('Ide.waitAndSwitchToIdeFrame');
         try {
             await this.driverHelper.waitAndSwitchToFrame(By.css(Ide.IDE_IFRAME_CSS), timeout);
         } catch (err) {
             if (err instanceof error.StaleElementReferenceError) {
-                Logger.warn('StaleElementException occured during waiting for IDE. Sleeping for 2 secs and retrying.');
+                Logger.warn('StaleElementException occurred during waiting for IDE. Sleeping for 2 secs and retrying.');
                 this.driverHelper.wait(2000);
-                await this.driverHelper.waitAndSwitchToFrame(By.css(Ide.IDE_IFRAME_CSS), timeout);
+                try {
+                    await this.driverHelper.waitAndSwitchToFrame(By.css(Ide.IDE_IFRAME_CSS), timeout);
+                } catch (err) {
+                    if (err instanceof error.TimeoutError) {
+                        Logger.warn(`Iframe is not available even after ${timeout} milliseconds, checking for visibility of #theia-main-content-panel.`);
+                        await this.driverHelper.isVisible(By.css('#theia-main-content-panel'));
+                        return;
+                    }
+                    throw err;
+                }
                 return;
             }
 
             if (err instanceof error.TimeoutError) {
-                Logger.error(`Switching to IDE frame failed after ${timeout} timeout.`);
-                throw err;
+                Logger.warn(`Iframe is not available even after ${timeout} milliseconds, checking for visibility of #theia-main-content-panel.`);
+                await this.driverHelper.isVisible(By.css('#theia-main-content-panel'));
             }
 
             Logger.error(`Switching to IDE frame failed.`);
@@ -63,6 +76,16 @@ export class Ide {
         }
     }
 
+    async waitForEditor(timeout: number = TimeoutConstants.TS_SELENIUM_START_WORKSPACE_TIMEOUT) {
+        Logger.debug('Ide.waitForEditor');
+        try {
+            await this.driverHelper.waitVisibility(By.css(Ide.THEIA_EDITOR_CSS), timeout);
+        } catch (err) {
+            Logger.warn(`Editor is not displayed even after ${timeout} milliseconds.`);
+            throw err;
+        }
+    }
+
     async waitNotification(notificationText: string, timeout: number = TimeoutConstants.TS_NOTIFICATION_CENTER_TIMEOUT) {
         Logger.debug(`Ide.waitNotification "${notificationText}"`);
 
@@ -157,11 +180,11 @@ export class Ide {
 
         Logger.debug('Ide.waitWorkspaceAndIde');
 
-        await this.waitAndSwitchToIdeFrame(timeout);
+        await this.waitForEditor(timeout);
         await this.waitIde(timeout);
     }
 
-    async waitIde(timeout: number = TimeoutConstants.TS_IDE_LOAD_TIMEOUT) {
+    async waitIde(timeout: number = TimeoutConstants.TS_SELENIUM_START_WORKSPACE_TIMEOUT) {
         Logger.debug('Ide.waitIde');
 
         const mainIdeParts: Array<By> = [By.css(Ide.TOP_MENU_PANEL_CSS), By.css(Ide.LEFT_CONTENT_PANEL_CSS), By.id(Ide.EXPLORER_BUTTON_ID)];

package/pageobjects/ide/PreviewWidget.ts

@@ -76,6 +76,9 @@ export class PreviewWidget {
         }, timeout);
     }
 
+    /**
+     * @deprecated Method deprecated. Iframe is not available anymore
+     */
     async waitAndSwitchToWidgetFrame() {
         Logger.debug('PreviewWidget.waitAndSwitchToWidgetFrame');
 
@@ -98,8 +101,6 @@ export class PreviewWidget {
         await this.driverHelper.getDriver().wait(async () => {
             const isApplicationTitleVisible: boolean = await this.driverHelper.isVisible(contentLocator);
             if (isApplicationTitleVisible) {
-                await this.driverHelper.getDriver().switchTo().defaultContent();
-                await this.ide.waitAndSwitchToIdeFrame();
                 return true;
             }
 
@@ -125,6 +126,9 @@ export class PreviewWidget {
         await this.driverHelper.waitAndClick(PreviewWidget.WIDGET_REFRESH_BUTTON_LOCATOR);
     }
 
+    /**
+     * @deprecated Method deprecated. Iframe is not available.
+     */
     async switchBackToIdeFrame() {
         Logger.debug('PreviewWidget.switchBackToIdeFrame');
 

package/pageobjects/ide/ProjectTree.ts

@@ -18,6 +18,7 @@ import { By, error } from 'selenium-webdriver';
 import { Editor } from './Editor';
 import { Logger } from '../../utils/Logger';
 import { TimeoutConstants } from '../../TimeoutConstants';
+import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 
 @injectable()
 export class ProjectTree {
@@ -26,7 +27,8 @@ export class ProjectTree {
     constructor(
         @inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper,
         @inject(CLASSES.Ide) private readonly ide: Ide,
-        @inject(CLASSES.Editor) private readonly editor: Editor) { }
+        @inject(CLASSES.Editor) private readonly editor: Editor,
+        @inject(CLASSES.BrowserTabsUtil) private readonly browserTabsUtil: BrowserTabsUtil) { }
 
     async clickCollapseAllButton() {
         Logger.debug('ProjectTree.clickCollapseAllButton');
@@ -237,9 +239,8 @@ export class ProjectTree {
 
             if (!isProjectFolderVisible) {
                 Logger.trace(`ProjectTree.waitProjectImported project not located, reloading page.`);
-                await this.driverHelper.reloadPage();
-                await this.ide.waitAndSwitchToIdeFrame();
-                await this.ide.waitIde();
+                await this.browserTabsUtil.refreshPage();
+                await this.ide.waitWorkspaceAndIde();
                 await this.openProjectTreeContainer();
                 continue;
             }
@@ -253,13 +254,11 @@ export class ProjectTree {
 
             if (!isRootSubItemVisible) {
                 Logger.trace(`ProjectTree.waitProjectImported sub-items not found, reloading page.`);
-                await this.driverHelper.reloadPage();
-                await this.ide.waitAndSwitchToIdeFrame();
-                await this.ide.waitIde();
+                await this.browserTabsUtil.refreshPage();
+                await this.ide.waitWorkspaceAndIde();
                 await this.openProjectTreeContainer();
                 continue;
             }
-
             return;
         }
 
@@ -281,10 +280,9 @@ export class ProjectTree {
 
             if (!isProjectFolderVisible) {
                 Logger.trace(`ProjectTree.waitProjectImportedNoSubfolder project not located, reloading page.`);
-                await this.driverHelper.reloadPage();
+                await this.browserTabsUtil.refreshPage();
                 await this.driverHelper.wait(triesPolling);
-                await this.ide.waitAndSwitchToIdeFrame();
-                await this.ide.waitIde();
+                await this.ide.waitWorkspaceAndIde();
                 await this.openProjectTreeContainer();
                 continue;
             }

package/tests/devfiles/DotNetCore.spec.ts

@@ -27,7 +27,7 @@ const workspaceSampleName: string = 'dotnet-web-simple';
 const fileFolderPath: string = `${workspaceSampleName}`;
 const tabTitle: string = 'Program.cs';
 // const codeNavigationClassName: string = '[metadata] Console.cs';
-const stack : string = '.NET Core';
+const stack : string = 'ASP.NET Core Web Application';
 const updateDependenciesTaskName: string = 'update dependencies';
 const buildTaskName: string = 'build';
 const runTaskName: string = 'run';

package/tests/devfiles/Go.spec.ts

@@ -25,32 +25,30 @@ const codeExecutionTests: CodeExecutionTests = e2eContainer.get(CLASSES.CodeExec
 const preferencesHandler: PreferencesHandler = e2eContainer.get(CLASSES.PreferencesHandler);
 
 const workspaceStack: string = 'Go';
-const workspaceSampleName: string = 'example';
-const workspaceSubfolderName: string = 'outyet';
+const workspaceSampleName: string = 'golang-example';
+const workspaceSubfolderName: string = 'template';
 const fileFolderPath: string = `${workspaceSampleName}/${workspaceSubfolderName}`;
 const fileName: string = `main.go`;
 
-const taskRunServer: string = '1.1 Run outyet';
-const taskStopServer: string = '1.2 Stop outyet';
-const taskTestOutyet: string = '1.3 Test outyet';
+const taskRunServer: string = 'run-outyet';
+const taskStopServer: string = 'stop-outyet';
+const taskTestOutyet: string = 'test-outyet';
 const notificationText: string = 'Process 8080-tcp is now listening on port 8080. Open it ?';
 let workspaceName: string;
 
 suite(`${workspaceStack} test`, async () => {
 
     suite(`Create ${workspaceStack} workspace`, async () => {
-        test('Workaround for issue #16113', async () => {
-            Logger.warn(`Manually setting a preference for golang devfile LS based on issue: https://github.com/eclipse/che/issues/16113`);
-            await preferencesHandler.setUseGoLanaguageServer();
-        });
         workspaceHandlingTests.createAndOpenWorkspace(workspaceStack);
-
         test('Register running workspace', async () => {
             workspaceName = WorkspaceHandlingTests.getWorkspaceName();
             CheReporter.registerRunningWorkspace(workspaceName);
         });
-
         projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceSubfolderName, false);
+        test('Workaround for issue #16113', async () => {
+            Logger.warn(`Manually setting a preference for golang devFile LS based on issue: https://github.com/eclipse/che/issues/16113`);
+            await preferencesHandler.setPreferenceUsingUI('go.useLanguageServer', true);
+        });
     });
 
     suite('Test opening file', async () => {
@@ -59,24 +57,24 @@ suite(`${workspaceStack} test`, async () => {
     });
 
     suite('Test golang example', async () => {
-        codeExecutionTests.runTask(taskTestOutyet, 60_000);
+        codeExecutionTests.runTask(taskTestOutyet, 80_000);
         codeExecutionTests.closeTerminal(taskTestOutyet);
     });
 
     suite('Run golang example server', async () => {
         codeExecutionTests.runTaskWithNotification(taskRunServer, notificationText, 40_000);
-        codeExecutionTests.runTask(taskStopServer, 5_000);
+        codeExecutionTests.runTask(taskStopServer, 8_000);
     });
 
     suite(`'Language server validation'`, async () => {
-        commonLanguageServerTests.suggestionInvoking(fileName, 42, 10, 'Parse');
-        commonLanguageServerTests.autocomplete(fileName, 42, 10, 'Parse');
-        commonLanguageServerTests.errorHighlighting(fileName, 'error;\n', 42);
+        commonLanguageServerTests.suggestionInvoking(fileName, 41, 49, 'Parse');
+        commonLanguageServerTests.autocomplete(fileName, 41, 49, 'Parse');
+        commonLanguageServerTests.errorHighlighting(fileName, 'error;\n', 41);
         // commonLanguageServerTests.goToImplementations(fileName, 42, 10, 'flag.go'); // codenavigation is inconsistent https://github.com/eclipse/che/issues/16929
     });
 
     suite('Stop and remove workspace', async() => {
-        test(`Stop and remowe workspace`, async () => {
+        test(`Stop and remove workspace`, async () => {
             await workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
         });
     });

package/tests/e2e/OpenshiftConnector.spec.ts

@@ -59,14 +59,14 @@ suite('Openshift connector user story', async () => {
           'location': 'https://github.com/maxura/nodejs-hello-world.git',
           'type': 'git'
         }
-      }
+      },
     ],
 
       wsConfig.components = [
         {
           'id': 'redhat/vscode-openshift-connector/latest',
           'type': 'chePlugin'
-        }
+        },
       ];
 
     await browserTabsUtil.navigateTo(TestConstants.TS_SELENIUM_BASE_URL);

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

@@ -1,5 +1,5 @@
 // /*********************************************************************
-//  * Copyright (c) 2020 Red Hat, Inc.
+//  * Copyright (c) 2022 Red Hat, Inc.
 //  *
 //  * This program and the accompanying materials are made
 //  * available under the terms of the Eclipse Public License 2.0
@@ -9,18 +9,18 @@
 //  **********************************************************************/
 
 import { e2eContainer } from '../../../inversify.config';
-import { CLASSES, TYPES } from '../../../inversify.types';
+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 { WorkspaceNameHandler } from '../../../utils/WorkspaceNameHandler';
-import { TestWorkspaceUtil } from '../../../utils/workspace/TestWorkspaceUtil';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import { PreferencesHandler } from '../../../utils/PreferencesHandler';
 
+const preferencesHandler: PreferencesHandler = e2eContainer.get(CLASSES.PreferencesHandler);
+const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.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 factoryUrl : string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=https://github.com/che-samples/console-java-simple/tree/master/src`;
 const workspaceSampleName: string = 'console-java-simple';
@@ -28,9 +28,8 @@ 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;
+let workspaceName: string = 'console-java-simple';
 
-// the suite expect user to be logged in
 suite('Workspace creation via factory url', async () => {
     suite('Open factory URL', async () => {
         test(`Navigating to factory URL`, async () => {
@@ -39,7 +38,13 @@ suite('Workspace creation via factory url', async () => {
     });
 
     suite('Wait workspace readyness', async () => {
-        projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceRootFolderName, true, true);
+        projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceRootFolderName);
+
+        test('Set confirmExit preference to never', async () => {
+            CheReporter.registerRunningWorkspace(workspaceName);
+
+            await preferencesHandler.setPreferenceUsingUI('application.confirmExit', 'never');
+        });
     });
 
     suite('Check imported project', async () => {
@@ -51,10 +56,7 @@ suite('Workspace creation via factory url', async () => {
 
     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 workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
         });
     });
 

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

@@ -1,5 +1,5 @@
 // /*********************************************************************
-//  * Copyright (c) 2020 Red Hat, Inc.
+//  * Copyright (c) 2022 Red Hat, Inc.
 //  *
 //  * This program and the accompanying materials are made
 //  * available under the terms of the Eclipse Public License 2.0
@@ -9,27 +9,26 @@
 //  **********************************************************************/
 
 import { e2eContainer } from '../../../inversify.config';
-import { CLASSES, TYPES } from '../../../inversify.types';
+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 { WorkspaceNameHandler } from '../../../utils/WorkspaceNameHandler';
-import { TestWorkspaceUtil } from '../../../utils/workspace/TestWorkspaceUtil';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import { PreferencesHandler } from '../../../utils/PreferencesHandler';
 
+const preferencesHandler: PreferencesHandler = e2eContainer.get(CLASSES.PreferencesHandler);
+const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.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 factoryUrl : string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=https://github.com/che-samples/console-java-simple`;
 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;
+let workspaceName: string = 'console-java-simple';
 
-// the suite expect user to be logged in
 suite('Workspace creation via factory url', async () => {
     suite('Open factory URL', async () => {
         test(`Navigating to factory URL`, async () => {
@@ -38,21 +37,23 @@ suite('Workspace creation via factory url', async () => {
     });
 
     suite('Wait workspace readyness', async () => {
-        projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceRootFolderName, true, true);
+        projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceRootFolderName);
+
+        test('Set confirmExit preference to never', async () => {
+            CheReporter.registerRunningWorkspace(workspaceName);
+
+            await preferencesHandler.setPreferenceUsingUI('application.confirmExit', 'never');
+        });
     });
 
     suite('Check imported project', async () => {
         projectAndFileTests.openFile(fileFolderPath, tabTitle);
-
         projectAndFileTests.checkProjectBranchName('master');
     });
 
     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 workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
         });
     });
 

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

@@ -1,5 +1,5 @@
 // /*********************************************************************
-//  * Copyright (c) 2020 Red Hat, Inc.
+//  * Copyright (c) 2022 Red Hat, Inc.
 //  *
 //  * This program and the accompanying materials are made
 //  * available under the terms of the Eclipse Public License 2.0
@@ -9,30 +9,27 @@
 //  **********************************************************************/
 
 import { e2eContainer } from '../../../inversify.config';
-import { CLASSES, TYPES } from '../../../inversify.types';
+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 { WorkspaceNameHandler } from '../../../utils/WorkspaceNameHandler';
-import { TestWorkspaceUtil } from '../../../utils/workspace/TestWorkspaceUtil';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import { PreferencesHandler } from '../../../utils/PreferencesHandler';
 
+const preferencesHandler: PreferencesHandler = e2eContainer.get(CLASSES.PreferencesHandler);
+const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.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);
 
-let workspaceName: string;
+let factoryUrl : string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=https://github.com/che-samples/console-java-simple/tree/java1.11`;
+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';
 
-// the suite expect user to be logged in
 suite('Workspace creation via factory url', async () => {
-
-    let factoryUrl : string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=https://github.com/che-samples/console-java-simple/tree/java1.11`;
-    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';
-
     suite('Open factory URL', async () => {
         test(`Navigating to factory URL`, async () => {
             await browserTabsUtil.navigateTo(factoryUrl);
@@ -40,8 +37,13 @@ suite('Workspace creation via factory url', async () => {
     });
 
     suite('Wait workspace readyness', async () => {
-        projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceRootFolderName, true, true);
+        projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceRootFolderName);
+
+        test('Set confirmExit preference to never', async () => {
+            CheReporter.registerRunningWorkspace(workspaceName);
 
+            await preferencesHandler.setPreferenceUsingUI('application.confirmExit', 'never');
+        });
     });
 
     suite('Check imported project', async () => {
@@ -51,10 +53,7 @@ suite('Workspace creation via factory url', async () => {
 
     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 workspaceHandlingTests.stopAndRemoveWorkspace(workspaceName);
         });
     });