@eclipse-che/che-e2e 7.59.0-dev-d1fb082 → 7.59.0-dev-a4c539f

package/mocha-happy-path-che-code.json

@@ -0,0 +1,14 @@
+{
+  "timeout": "2200000",
+  "reporter": "dist/driver/CheReporter.js",
+  "ui": "tdd",
+  "bail": true,
+  "full-trace": true,
+  "require": [
+    "source-map-support/register",
+    "./dist/tests/MochaHooks.js"
+  ],
+  "spec": [
+    "dist/tests/login/Login.spec.js"
+  ]
+}

package/mocha-happy-path-theia.json

@@ -1,12 +1,15 @@
 {
-    "timeout": "2200000",
-    "reporter": "dist/driver/CheReporter.js",
-    "ui": "tdd",
-    "bail": true,
-    "full-trace": true,
-    "require": "source-map-support/register",
-    "spec": [
-        "dist/tests/login/Login.spec.js",
-        "dist/tests/e2e_happy_path/theia/HappyPath.spec.js"
-    ]
+  "timeout": "2200000",
+  "reporter": "dist/driver/CheReporter.js",
+  "ui": "tdd",
+  "bail": true,
+  "full-trace": true,
+  "require": [
+    "source-map-support/register",
+    "./dist/tests/MochaHooks.js"
+  ],
+  "spec": [
+    "dist/tests/login/Login.spec.js",
+    "dist/tests/e2e_happy_path/theia/HappyPath.spec.js"
+  ]
 }

package/mocha-java-maven.json

@@ -1,9 +1,13 @@
 {
-    "timeout": "1200000",
-    "reporter": "dist/driver/CheReporter.js",
-    "ui": "tdd",
-    "bail": true,
-    "full-trace": true,
-    "support": "source-map-support/register",
-    "spec": ["dist/tests/login/Login.spec.js", "dist/tests/devfiles/JavaMaven.spec.js"]
+  "timeout": "1200000",
+  "reporter": "dist/driver/CheReporter.js",
+  "require": "./dist/tests/MochaHooks.js",
+  "ui": "tdd",
+  "bail": true,
+  "full-trace": true,
+  "support": "source-map-support/register",
+  "spec": [
+    "dist/tests/login/Login.spec.js",
+    "dist/tests/devfiles/JavaMaven.spec.js"
+  ]
 }

package/mocha-java-springboot-che-code.json

@@ -0,0 +1,12 @@
+{
+  "timeout": "1200000",
+  "require": "./dist/tests/MochaHooks.js",
+  "reporter": "dist/driver/CheReporter.js",
+  "ui": "tdd",
+  "bail": true,
+  "full-trace": true,
+  "support": "source-map-support/register",
+  "spec": [
+    "dist/tests/login/Login.spec.js"
+  ]
+}

package/mocha-java-springboot-theia.json

@@ -1,9 +1,13 @@
 {
-    "timeout": "1200000",
-    "reporter": "dist/driver/CheReporter.js",
-    "ui": "tdd",
-    "bail": true,
-    "full-trace": true,
-    "support": "source-map-support/register",
-    "spec": ["dist/tests/login/Login.spec.js", "dist/tests/devfiles/theia/JavaSpringBoot.spec.js"]
+  "timeout": "1200000",
+  "require": "./dist/tests/MochaHooks.js",
+  "reporter": "dist/driver/CheReporter.js",
+  "ui": "tdd",
+  "bail": true,
+  "full-trace": true,
+  "support": "source-map-support/register",
+  "spec": [
+    "dist/tests/login/Login.spec.js",
+    "dist/tests/devfiles/theia/JavaSpringBoot.spec.js"
+  ]
 }

package/mocha-java-vertx-che-code.json

@@ -0,0 +1,12 @@
+{
+  "timeout": "1200000",
+  "require": "./dist/tests/MochaHooks.js",
+  "reporter": "dist/driver/CheReporter.js",
+  "ui": "tdd",
+  "bail": true,
+  "full-trace": true,
+  "support": "source-map-support/register",
+  "spec": [
+    "dist/tests/login/Login.spec.js"
+  ]
+}

package/mocha-java-vertx-theia.json

@@ -1,9 +1,13 @@
 {
-    "timeout": "1200000",
-    "reporter": "dist/driver/CheReporter.js",
-    "ui": "tdd",
-    "bail": true,
-    "full-trace": true,
-    "support": "source-map-support/register",
-    "spec": ["dist/tests/login/Login.spec.js", "dist/tests/devfiles/theia/JavaVertx.spec.js"]
+  "timeout": "1200000",
+  "require": "./dist/tests/MochaHooks.js",
+  "reporter": "dist/driver/CheReporter.js",
+  "ui": "tdd",
+  "bail": true,
+  "full-trace": true,
+  "support": "source-map-support/register",
+  "spec": [
+    "dist/tests/login/Login.spec.js",
+    "dist/tests/devfiles/theia/JavaVertx.spec.js"
+  ]
 }

package/mocha-load-theia.json

@@ -1,9 +1,12 @@
 {
-    "timeout": "1200000",
-    "reporter": "dist/driver/CheReporter.js",
-    "ui": "tdd",
-    "bail": true,
-    "full-trace": true,
-    "support": "source-map-support/register",
-    "spec": ["dist/tests/load_test/theia/LoadTest.spec.js"]
+  "timeout": "1200000",
+  "require": "./dist/tests/MochaHooks.js",
+  "reporter": "dist/driver/CheReporter.js",
+  "ui": "tdd",
+  "bail": true,
+  "full-trace": true,
+  "support": "source-map-support/register",
+  "spec": [
+    "dist/tests/load_test/theia/LoadTest.spec.js"
+  ]
 }

package/mocha-scala.json

@@ -1,9 +1,13 @@
 {
-    "timeout": "1200000",
-    "reporter": "dist/driver/CheReporter.js",
-    "ui": "tdd",
-    "bail": true,
-    "full-trace": true,
-    "support": "source-map-support/register",
-    "spec": ["dist/tests/login/Login.spec.js", "dist/tests/devfiles/Scala.spec.js"]
+  "timeout": "1200000",
+  "require": "./dist/tests/MochaHooks.js",
+  "reporter": "dist/driver/CheReporter.js",
+  "ui": "tdd",
+  "bail": true,
+  "full-trace": true,
+  "support": "source-map-support/register",
+  "spec": [
+    "dist/tests/login/Login.spec.js",
+    "dist/tests/devfiles/Scala.spec.js"
+  ]
 }

package/mocha-single-devfile.json

@@ -1,8 +1,11 @@
 {
-    "timeout": "2200000",
-    "reporter": "dist/driver/CheReporter.js",
-    "ui": "tdd",
-    "bail": true,
-    "full-trace": true,
-    "require": "source-map-support/register"
+  "timeout": "2200000",
+  "reporter": "dist/driver/CheReporter.js",
+  "ui": "tdd",
+  "bail": true,
+  "full-trace": true,
+  "require": [
+    "source-map-support/register",
+    "./dist/tests/MochaHooks.js"
+  ]
 }

package/mocha-theia.json

@@ -1,8 +1,12 @@
 {
-    "timeout": "1200000",
-    "reporter": "dist/driver/CheReporter.js",
-    "ui": "tdd",
-    "bail": true,
-    "full-trace": true,
-    "spec": ["dist/tests/login/Login.spec.js", "dist/tests/e2e/theia/*.spec.js"]
+  "timeout": "1200000",
+  "reporter": "dist/driver/CheReporter.js",
+  "ui": "tdd",
+  "bail": true,
+  "full-trace": true,
+  "require": "./dist/tests/MochaHooks.js",
+  "spec": [
+    "dist/tests/login/Login.spec.js",
+    "dist/tests/e2e/theia/*.spec.js"
+  ]
 }

package/mocha-ws-creation-and-ls-theia.json

@@ -1,9 +1,12 @@
 {
-    "timeout": "1200000",
-    "reporter": "dist/driver/CheReporter.js",
-    "ui": "tdd",
-    "bail": true,
-    "full-trace": true,
-    "support": "source-map-support/register",
-    "spec": ["dist/tests/e2e/theia/WorkspaceCreationAndLsInitialization.spec.js"]
+  "timeout": "1200000",
+  "reporter": "dist/driver/CheReporter.js",
+  "require": "./dist/tests/MochaHooks.js",
+  "ui": "tdd",
+  "bail": true,
+  "full-trace": true,
+  "support": "source-map-support/register",
+  "spec": [
+    "dist/tests/e2e/theia/WorkspaceCreationAndLsInitialization.spec.js"
+  ]
 }

package/mocha.intelij.json

@@ -1,9 +1,13 @@
 {
-    "timeout": "1200000",
-    "reporter": "dist/driver/CheReporter.js",
-    "ui": "tdd",
-    "bail": true,
-    "full-trace": true,
-    "support": "source-map-support/register",
-    "spec": ["./dist/tests/login/Login.spec.js", "./dist/tests/intelij/IntelijOpenWorkspace.spec.js"]
+  "timeout": "1200000",
+  "reporter": "dist/driver/CheReporter.js",
+  "require": "./dist/tests/MochaHooks.js",
+  "ui": "tdd",
+  "bail": true,
+  "full-trace": true,
+  "support": "source-map-support/register",
+  "spec": [
+    "./dist/tests/login/Login.spec.js",
+    "./dist/tests/intelij/IntelijOpenWorkspace.spec.js"
+  ]
 }

package/mocha.ocp.link.json

@@ -1,8 +1,11 @@
 {
-    "timeout": "1200000",
-    "reporter": "dist/driver/CheReporter.js",
-    "ui": "tdd",
-    "bail": true,
-    "full-trace": true,
-    "spec": ["./dist/tests/login/LinkCheAndOcpUsers.spec.js"]
+  "timeout": "1200000",
+  "reporter": "dist/driver/CheReporter.js",
+  "require": "./dist/tests/MochaHooks.js",
+  "ui": "tdd",
+  "bail": true,
+  "full-trace": true,
+  "spec": [
+    "./dist/tests/login/LinkCheAndOcpUsers.spec.js"
+  ]
 }

package/mocha.single.plugin.json

@@ -1,7 +1,8 @@
 {
-    "timeout": "1200000",
-    "reporter": "dist/driver/CheReporter.js",
-    "ui": "tdd",
-    "bail": true,
-    "full-trace": true
+  "timeout": "1200000",
+  "reporter": "dist/driver/CheReporter.js",
+  "require": "./dist/tests/MochaHooks.js",
+  "ui": "tdd",
+  "bail": true,
+  "full-trace": true
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-che/che-e2e",
-  "version": "7.59.0-dev-d1fb082",
+  "version": "7.59.0-dev-a4c539f",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -29,15 +29,15 @@
     "test-all-factories-theia": "./generateIndex.sh && npm run lint && npm run tsc && mocha --config mocha-all-factories-theia.json",
     "test-plugin-ci-theia": "export TS_DELETE_PLUGINS_TEST_WORKSPACE=true && npm run init-mocha-opts -- --spec dist/tests/plugins/theia/${USERSTORY}.spec.js",
     "test-all-plugins-theia": "tsc && mocha --config mocha-all-plugins-theia.json",
-    "test-code": "./generateIndex.sh && npm run lint && npm run tsc && mocha --config mocha-code.json",
-    "test-happy-path-code": "./generateIndex.sh && npm run lint && npm run tsc && mocha --config mocha-happy-path-code.json",
-    "test-devworkspace-happy-path-code": "./generateIndex.sh && npm run lint && npm run tsc && mocha --config mocha-devworkspace-happy-path-code.json",
-    "test-java-vertx-code": "./generateIndex.sh && npm run lint && npm run tsc && mocha --config mocha-java-vertx-code.json",
-    "test-java-springboot-code": "./generateIndex.sh && npm run lint && npm run tsc && mocha --config mocha-java-springboot-code.json",
-    "test-factory-code": "./generateIndex.sh && npm run lint && npm run tsc && mocha --config mocha-factory-code.json",
-    "test-all-factories-code": "./generateIndex.sh && npm run lint && npm run tsc && mocha --config mocha-all-factories-code.json",
+    "test-code": "./generateIndex.sh && npm run lint && npm run tsc && mocha --config mocha-che-code.json",
+    "test-happy-path-code": "./generateIndex.sh && npm run lint && npm run tsc && mocha --config mocha-happy-path-che-code.json",
+    "test-devworkspace-happy-path-code": "./generateIndex.sh && npm run lint && npm run tsc && mocha --config mocha-devworkspace-happy-path-che-code.json",
+    "test-java-vertx-code": "./generateIndex.sh && npm run lint && npm run tsc && mocha --config mocha-java-vertx-che-code.json",
+    "test-java-springboot-code": "./generateIndex.sh && npm run lint && npm run tsc && mocha --config mocha-java-springboot-che-code.json",
+    "test-factory-code": "./generateIndex.sh && npm run lint && npm run tsc && mocha --config mocha-factory-che-code.json",
+    "test-all-factories-code": "./generateIndex.sh && npm run lint && npm run tsc && mocha --config mocha-all-factories-che-code.json",
     "test-plugin-ci-code": "export TS_DELETE_PLUGINS_TEST_WORKSPACE=true && npm run init-mocha-opts -- --spec dist/tests/plugins/code/${USERSTORY}.spec.js",
-    "test-all-plugins-code": "tsc && mocha --config mocha-all-plugins-code.json"
+    "test-all-plugins-code": "tsc && mocha --config mocha-all-plugins-che-code.json"
   },
   "author": "Ihor Okhrimenko (iokhrime@redhat.com)",
   "license": "ISC",
@@ -49,12 +49,12 @@
     "@types/selenium-webdriver": "4.1.3",
     "axios": "^0.25.0",
     "chai": "4.2.0",
-    "chromedriver": "^103.0.0",
+    "chromedriver": "^107.0.0",
     "mocha": "^9.1.3",
     "rimraf": "2.6.2",
     "selenium-webdriver": "4.4.0",
     "ts-node": "8.0.3",
-    "tslint": "5.10.0",
+    "tslint":  "^6.1.3",
     "typed-rest-client": "1.8.5",
     "typescript": "3.9.9",
     "monaco-page-objects": "3.1.0",

package/pageobjects/dashboard/Workspaces.ts

@@ -86,12 +86,11 @@ export class Workspaces {
         Logger.debug(`Workspaces.waitActionsPopup of the '${workspaceName}' list item`);
 
         await this.driverHelper.waitVisibility(this.getExpandedActionsLocator(workspaceName), timeout);
-        await this.driverHelper.wait(5000);
+        await this.driverHelper.wait(2000);
     }
 
     async openActionsPopup(workspaceName: string, timeout: number = TimeoutConstants.TS_CONTEXT_MENU_TIMEOUT) {
         Logger.debug(`Workspaces.openActionsPopup for the '${workspaceName}' list item`);
-
         await this.clickActionsButton(workspaceName);
         await this.waitActionsPopup(workspaceName, timeout);
     }
@@ -104,8 +103,15 @@ export class Workspaces {
 
     async clickActionsStopWorkspaceButton(workspaceName: string) {
         Logger.debug(`Workspaces.clickActionsStopWorkspaceButton for the '${workspaceName}' list item`);
-
-        await this.driverHelper.waitAndClick(this.getActionsPopupButtonLocator(workspaceName, 'Stop Workspace'));
+        // workaround because of issue CRW-3649
+        try {
+            await this.driverHelper.waitAndClick(this.getActionsPopupButtonLocator(workspaceName, 'Stop Workspace'));
+        } catch (e) {
+            Logger.warn(`Workspaces.clickActionsStopWorkspaceButton for the '${workspaceName}' list item - popup was missed, try to click one more time (issue CRW-3649).`);
+
+            await this.driverHelper.waitAndClick(this.getActionsLocator(workspaceName));
+            await this.driverHelper.waitAndClick(this.getActionsPopupButtonLocator(workspaceName, 'Stop Workspace'));
+        }
     }
 
     async waitDeleteWorkspaceConfirmationWindow(timeout: number = TimeoutConstants.TS_DASHBOARD_WORKSPACE_STOP_TIMEOUT) {

package/pageobjects/ide/theia/Ide.ts

@@ -52,7 +52,7 @@ export class Ide {
         } catch (err) {
             if (err instanceof error.StaleElementReferenceError) {
                 Logger.warn('StaleElementException occurred during waiting for IDE. Sleeping for 2 secs and retrying.');
-                this.driverHelper.wait(2000);
+                await this.driverHelper.wait(2000);
                 try {
                     await this.driverHelper.waitAndSwitchToFrame(By.css(Ide.IDE_IFRAME_CSS), timeout);
                 } catch (err) {

package/pageobjects/ide/theia/OpenEditors.ts

@@ -56,7 +56,7 @@ export class OpenEditors {
         Logger.trace('OpenEditors.waitAndClickExpansionToggle expansion toggle clicked.');
     }
 
-    async isExpansionToggleCollapsed(timeout: number = TimeoutConstants.TS_OPEN_EDITORS_CLICK_ON_ITEM_TIMEOUT) : Promise<boolean> {
+    async isExpansionToggleCollapsed(timeout: number = TimeoutConstants.TS_OPEN_EDITORS_CLICK_ON_ITEM_TIMEOUT): Promise<boolean> {
         Logger.debug('OpenEditors.isExpansionToggleCollapsed');
         return await this.driverHelper.waitVisibilityBoolean(OpenEditors.OPEN_EDITORS_EXPANSION_TOGGLE_COLLAPSED_LOCATOR, 1, timeout);
     }

package/tests/MochaHooks.ts

@@ -0,0 +1,47 @@
+
+import { IDriver } from '..';
+import { TYPES, CLASSES } from '..';
+import { EditorType, TestConstants } from '../TestConstants';
+import { AskForConfirmationTypeTheia, PreferencesHandlerTheia, TerminalRendererTypeTheia } from '../utils/theia/PreferencesHandlerTheia';
+import { CheApiRequestHandler } from '../utils/requestHandlers/CheApiRequestHandler';
+import { TimeoutConstants } from '../TimeoutConstants';
+import * as monacoPageObjects from 'monaco-page-objects';
+import * as vscodeExtensionTesterLocators from 'vscode-extension-tester-locators';
+import { e2eContainer } from '../inversify.config';
+
+const driver: IDriver = e2eContainer.get(TYPES.Driver);
+const preferencesHandler: PreferencesHandlerTheia = e2eContainer.get(CLASSES.PreferencesHandlerTheia);
+
+exports.mochaHooks = {
+    beforeAll: [
+        async function enableRequestInterceptor() {
+            if (TestConstants.TS_SELENIUM_REQUEST_INTERCEPTOR) {
+                CheApiRequestHandler.enableRequestInteceptor();
+            }
+        },
+        async function enableResponseInterceptor() {
+            if (TestConstants.TS_SELENIUM_RESPONSE_INTERCEPTOR) {
+                CheApiRequestHandler.enableResponseInterceptor();
+            }
+        },
+        async function setTheiaSpecificPreferences() {
+            if (TestConstants.TS_SELENIUM_EDITOR === EditorType.THEIA) {
+                await preferencesHandler.setConfirmExit(AskForConfirmationTypeTheia.never);
+                await preferencesHandler.setTerminalType(TerminalRendererTypeTheia.dom);
+            }
+        },
+        async function initMonacoPageObjects() {
+            if (TestConstants.TS_SELENIUM_EDITOR === EditorType.CHE_CODE) {
+                // init vscode-extension-tester monaco-page-objects
+                monacoPageObjects.initPageObjects(TestConstants.TS_SELENIUM_MONACO_PAGE_OBJECTS_USE_VERSION, TestConstants.TS_SELENIUM_MONACO_PAGE_OBJECTS_BASE_VERSION, vscodeExtensionTesterLocators.getLocatorsPath(), driver.get(), 'google-chrome');
+            }
+        },
+        async function prolongTimeoutConstantsInDebugMode() {
+            if (TestConstants.TS_DEBUG_MODE === true) {
+                for (let [timeout, seconds] of Object.entries(TimeoutConstants)) {
+                    Object.defineProperty(TimeoutConstants, timeout, {value: seconds * 100});
+                }
+            }
+        },
+    ]
+};

package/tests/devfiles/che-code/EmptyWorkspace.spec.ts

@@ -7,19 +7,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
-import 'reflect-metadata';
-import { CLASSES } from '../../../inversify.types';
 import { e2eContainer } from '../../../inversify.config';
+import { ActivityBar, ViewControl, Workbench } from 'monaco-page-objects';
+import { CLASSES } from '../../../inversify.types';
 import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
-import CheReporter from '../../../driver/CheReporter';
 import { Logger } from '../../../utils/Logger';
-import { DriverHelper } from '../../../utils/DriverHelper';
-import { By, until } from 'selenium-webdriver';
-import { Workbench } from 'monaco-page-objects';
+import CheReporter from '../../../driver/CheReporter';
+import { ProjectAndFileTestsCheCode } from '../../../testsLibrary/che-code/ProjectAndFileTestsCheCode';
 
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
-const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
-
+const projectAndFileTests: ProjectAndFileTestsCheCode = e2eContainer.get(CLASSES.ProjectAndFileTestsCheCode);
 const stackName: string = 'Empty Workspace';
 
 suite(`${stackName} test`, async () => {
@@ -30,28 +27,21 @@ suite(`${stackName} test`, async () => {
             CheReporter.registerRunningWorkspace(WorkspaceHandlingTests.getWorkspaceName());
         });
         test('Wait workspace readiness', async() => {
-            try {
-                await driverHelper.getDriver().wait(until.elementLocated(By.className('monaco-workbench')));
-            } catch (err) {
-                if ((err as Error).name === 'WebDriverError') {
-                    await new Promise(res => setTimeout(res, 3000));
-                } else {
-                    throw err;
-                }
-            }
-            let workbench = new Workbench();
-            let activityBar = workbench.getActivityBar();
-            let activityBarControls = await activityBar.getViewControls();
+            await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
+
+            const workbench: Workbench = new Workbench();
+            const activityBar: ActivityBar = workbench.getActivityBar();
+            const activityBarControls: ViewControl[] = await activityBar.getViewControls();
+
             Logger.debug(`Editor sections:`);
-            activityBarControls.forEach(async control => {
+            for (const control of activityBarControls) {
                 Logger.debug(`${await control.getTitle()}`);
-            });
+            }
         });
-        // projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceRootFolderName, false);
     });
 
     suite('Stopping and deleting the workspace', async () => {
-        test(`Stop and remowe workspace`, async () => {
+        test(`Stop and remove workspace`, async () => {
             await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
         });
     });

package/tests/devfiles/theia/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 = 'ASP.NET Core Web Application';
+const stack: string = 'ASP.NET Core Web Application';
 const updateDependenciesTaskName: string = 'update dependencies';
 const buildTaskName: string = 'build';
 const runTaskName: string = 'run';

package/tests/e2e/theia/FactoryUrl.spec.ts

@@ -21,7 +21,7 @@ const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUti
 const testWorkspaceUtils: ITestWorkspaceUtil = e2eContainer.get<ITestWorkspaceUtil>(TYPES.WorkspaceUtil);
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(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 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';
 

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

@@ -21,7 +21,7 @@ const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.
 const projectAndFileTests: ProjectAndFileTestsTheia = e2eContainer.get(CLASSES.ProjectAndFileTestsTheia);
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 
-const factoryUrl : string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=https://github.com/che-samples/console-java-simple/tree/master/src`;
+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';
 const workspaceRootFolderName: string = 'src';
 const fileName: string = 'pom.xml';

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

@@ -21,7 +21,7 @@ const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.
 const projectAndFileTests: ProjectAndFileTestsTheia = e2eContainer.get(CLASSES.ProjectAndFileTestsTheia);
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 
-const factoryUrl : string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=https://github.com/che-samples/console-java-simple`;
+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`;

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

@@ -21,7 +21,7 @@ const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.
 const projectAndFileTests: ProjectAndFileTestsTheia = e2eContainer.get(CLASSES.ProjectAndFileTestsTheia);
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 
-let factoryUrl : string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=https://github.com/che-samples/console-java-simple/tree/java1.11`;
+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`;

package/tests/e2e_happy_path/theia/DevWorkspaceHappyPath.spec.ts

@@ -55,7 +55,7 @@ const SpringAppLocators = {
 
 // this test checks only workspace created from "web-nodejs-sample" https://github.com/devfile/devworkspace-operator/blob/main/samples/flattened_theia-next.yaml.
 suite('Workspace creation via factory url', async () => {
-    let factoryUrl : string = `${TestConstants.TS_SELENIUM_DEVWORKSPACE_URL}`;
+    let factoryUrl: string = `${TestConstants.TS_SELENIUM_DEVWORKSPACE_URL}`;
 
     suite('Open factory URL', async () => {
         // this is DevWorkspace test specific - we create the test ws. using factory instead of chectl

package/testsLibrary/che-code/ProjectAndFileTestsCheCode.ts

@@ -0,0 +1,34 @@
+/*********************************************************************
+ * Copyright (c) 2019 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ **********************************************************************/
+
+import 'reflect-metadata';
+import { inject, injectable } from 'inversify';
+import { By, until } from 'selenium-webdriver';
+import { DriverHelper } from '../../utils/DriverHelper';
+import { CLASSES } from '../../inversify.types';
+
+@injectable()
+export class ProjectAndFileTestsCheCode {
+
+    constructor(
+        @inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) {}
+
+    public async waitWorkspaceReadinessForCheCodeEditor(): Promise<void> {
+        try {
+            await this.driverHelper.getDriver().wait(until.elementLocated(By.className('monaco-workbench')));
+        } catch (err) {
+            if ((err as Error).name === 'WebDriverError') {
+                await new Promise(res => setTimeout(res, 3000));
+            } else {
+                throw err;
+            }
+        }
+    }
+}

package/testsLibrary/theia/LanguageServerTestsTheia.ts

@@ -97,7 +97,7 @@ export class LanguageServerTestsTheia {
         });
     }
 
-    public goToDefinition(openedFile: string, line: number, char: number, codeNavigationClassName: string, timeout : number = TimeoutConstants.TS_EDITOR_TAB_INTERACTION_TIMEOUT) {
+    public goToDefinition(openedFile: string, line: number, char: number, codeNavigationClassName: string, timeout: number = TimeoutConstants.TS_EDITOR_TAB_INTERACTION_TIMEOUT) {
         test('Go to Definition', async () => {
             try {
                 await this.editor.moveCursorToLineAndChar(openedFile, line, char);
@@ -123,7 +123,7 @@ export class LanguageServerTestsTheia {
         });
     }
 
-    public goToImplementations(openedFile: string, line: number, char: number, codeNavigationClassName: string, timeout : number = TimeoutConstants.TS_EDITOR_TAB_INTERACTION_TIMEOUT) {
+    public goToImplementations(openedFile: string, line: number, char: number, codeNavigationClassName: string, timeout: number = TimeoutConstants.TS_EDITOR_TAB_INTERACTION_TIMEOUT) {
         test('Go to Implementations', async () => {
             try {
                 await this.editor.moveCursorToLineAndChar(openedFile, line, char);