@eclipse-che/che-e2e 7.56.1-dev-9775650 → 7.56.1-dev-6dff8fe

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.56.1-dev-9775650",
+  "version": "7.56.1-dev-6dff8fe",
   "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,57 @@
+/*********************************************************************
+ * Copyright (c) 2023 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 { CLASSES } from '../inversify.types';
+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';
+import { DriverHelper } from '../utils/DriverHelper';
+
+const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
+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(), driverHelper.getDriver(), '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
@@ -106,7 +106,7 @@ suite('Language server validation', async () => {
     });
 
     test('Error highlighting', async () => {
-        await driverHelper.getDriver().sleep(TimeoutConstants.TS_SUGGESTION_TIMEOUT);   // workaround https://github.com/eclipse/che/issues/19004
+        await driverHelper.wait(TimeoutConstants.TS_SUGGESTION_TIMEOUT);   // workaround https://github.com/eclipse/che/issues/19004
 
         const textForErrorDisplaying: string = '$';
         await editor.type(javaFileName, textForErrorDisplaying, 30);
@@ -242,7 +242,7 @@ async function switchAppWindowAndCheck(contentLocator: By) {
             break;
         } else {
             console.log(`----------- The Spring app is not available. Attempt # ${index}. Waiting ${TimeoutConstants.TS_SELENIUM_DIALOG_WIDGET_TIMEOUT}s`);
-            await driverHelper.getDriver().sleep(TimeoutConstants.TS_SELENIUM_DIALOG_WIDGET_TIMEOUT);
+            await driverHelper.wait(TimeoutConstants.TS_SELENIUM_DIALOG_WIDGET_TIMEOUT);
             await driverHelper.getDriver().navigate().refresh();
         }
     }

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

@@ -119,7 +119,7 @@ suite('Language server validation', async () => {
     });
 
     test('Error highlighting', async () => {
-        await driverHelper.getDriver().sleep(TimeoutConstants.TS_SUGGESTION_TIMEOUT);   // workaround https://github.com/eclipse/che/issues/19004
+        await driverHelper.wait(TimeoutConstants.TS_SUGGESTION_TIMEOUT);   // workaround https://github.com/eclipse/che/issues/19004
 
         const textForErrorDisplaying: string = '$';
         await editor.type(javaFileName, textForErrorDisplaying, 30);

package/testsLibrary/WorkspaceHandlingTests.ts

@@ -19,7 +19,7 @@ import { Logger } from '../utils/Logger';
 import { ApiUrlResolver } from '../utils/workspace/ApiUrlResolver';
 import { TimeoutConstants } from '../TimeoutConstants';
 import { DriverHelper } from '../utils/DriverHelper';
-import { By } from 'selenium-webdriver';
+import { By, error } from 'selenium-webdriver';
 import { TestConstants } from '../TestConstants';
 
 @injectable()
@@ -33,8 +33,7 @@ export class WorkspaceHandlingTests {
         WorkspaceHandlingTests.workspaceName = workspaceName;
     }
 
-    private static START_WORKSPACE_PAGE_NAME_LOCATOR: By = By.xpath(`//div[@class="ui-container"]/div[@class="pf-c-page"]//div[@class="pf-c-content"]/h1`);
-    private static READY_TO_READ_WORKSPACE_NAME_LOCATOR: By = By.xpath(`//div[@class="ui-container"]/div[@class="pf-c-page"]//div[@class="pf-c-content"]/h1[contains(.,'Starting workspace ')]`);
+    private static WORKSPACE_NAME_LOCATOR: By = By.xpath(`//h1[contains(.,'Starting workspace ')]`);
     private static workspaceName: string = 'undefined';
     private static parentGUID: string;
 
@@ -80,31 +79,39 @@ export class WorkspaceHandlingTests {
 
     public obtainWorkspaceNameFromStartingPage(): void {
         test('Obtain workspace name from workspace loader page', async() => {
-            try {
-                Logger.info('Waiting for workspace name on workspace loader page');
-                await this.driverHelper.waitVisibility(WorkspaceHandlingTests.READY_TO_READ_WORKSPACE_NAME_LOCATOR, TimeoutConstants.TS_WAIT_LOADER_PRESENCE_TIMEOUT);
-
-                const timeout: number = TimeoutConstants.TS_IDE_LOAD_TIMEOUT;
-                const polling: number = TestConstants.TS_SELENIUM_DEFAULT_POLLING;
-                const attempts: number = Math.ceil(timeout / polling);
-                let startingWorkspaceLineContent: string;
-
-                for (let i: number = 0; i < attempts; i++) {
-                    startingWorkspaceLineContent = await this.driverHelper.getDriver().findElement(WorkspaceHandlingTests.START_WORKSPACE_PAGE_NAME_LOCATOR).getAttribute('innerHTML');
-
+            const timeout: number = TimeoutConstants.TS_IDE_LOAD_TIMEOUT;
+            const polling: number = TestConstants.TS_SELENIUM_DEFAULT_POLLING;
+            const attempts: number = Math.ceil(timeout / polling);
+
+            for (let i: number = 0; i < attempts; i++) {
+                try {
+                    let startingWorkspaceLineContent: string = await this.driverHelper.getDriver().findElement(WorkspaceHandlingTests.WORKSPACE_NAME_LOCATOR).getText();
+                    Logger.trace(`WorkspaceHandlingTests.obtainWorkspaceNameFromStartingPage obtained starting workspace getText():${startingWorkspaceLineContent}`);
                     // cutting away leading text
                     WorkspaceHandlingTests.workspaceName = startingWorkspaceLineContent.substring('Starting workspace '.length).trim();
-                    if (WorkspaceHandlingTests.workspaceName !== '') {
-                        Logger.info(`Obtained workspace name from workspace loader page: ${WorkspaceHandlingTests.workspaceName}`);
-                        break;
+                    Logger.trace(`WorkspaceHandlingTests.obtainWorkspaceNameFromStartingPage trimmed workspace name from getText():${WorkspaceHandlingTests.workspaceName}`);
+                    break;
+                } catch (err) {
+                    if (err instanceof error.StaleElementReferenceError) {
+                        Logger.warn(`WorkspaceHandlingTests.obtainWorkspaceNameFromStartingPage Failed to obtain name from workspace start page, element possibly detached from DOM. Retrying.`);
+                        await this.driverHelper.wait(polling);
+                        continue;
                     }
-
-                    this.driverHelper.sleep(polling);
+                    if (err instanceof error.NoSuchElementError) {
+                        Logger.warn(`WorkspaceHandlingTests.obtainWorkspaceNameFromStartingPage Failed to obtain name from workspace start page, element not visible yet. Retrying.`);
+                        await this.driverHelper.wait(polling);
+                        continue;
+                    }
+                    Logger.error(`WorkspaceHandlingTests.obtainWorkspaceNameFromStartingPage Obtaining workspace name failed with an unexpected error:${err}`);
+                    throw err;
                 }
-            } catch (err) {
-                Logger.error(`Failed to obtain workspace name from workspace loader page: ${err}`);
-                throw err;
             }
+            if (WorkspaceHandlingTests.workspaceName !== '' && WorkspaceHandlingTests.workspaceName !== undefined) {
+                Logger.info(`Obtained workspace name from workspace loader page: ${WorkspaceHandlingTests.workspaceName}`);
+                return;
+            }
+            Logger.error(`WorkspaceHandlingTests.obtainWorkspaceNameFromSartingPage failed to obtain workspace name:${WorkspaceHandlingTests.workspaceName}`);
+            throw new error.InvalidArgumentError(`WorkspaceHandlingTests.obtainWorkspaceNameFromSartingPage failed to obtain workspace name:${WorkspaceHandlingTests.workspaceName}`);
         });
     }
 

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);

package/testsLibrary/theia/ProjectAndFileTestsTheia.ts

@@ -55,7 +55,7 @@ export class ProjectAndFileTestsTheia {
             });
         }
 
-    public waitWorkspaceReadiness(sampleName : string, folder: string, checkNotification: boolean = true, restartWorkspaceDialogIsExpected: boolean = false) {
+    public waitWorkspaceReadiness(sampleName: string, folder: string, checkNotification: boolean = true, restartWorkspaceDialogIsExpected: boolean = false) {
         test('Wait for workspace readiness', async () => {
             await this.ide.waitIde(TimeoutConstants.TS_SELENIUM_START_WORKSPACE_TIMEOUT);
 
@@ -72,7 +72,7 @@ export class ProjectAndFileTestsTheia {
         });
     }
 
-    public waitWorkspaceReadinessNoSubfolder(sampleName : string, checkNotification: boolean = true) {
+    public waitWorkspaceReadinessNoSubfolder(sampleName: string, checkNotification: boolean = true) {
         test('Wait for workspace readiness', async () => {
             await this.ide.waitIde(TimeoutConstants.TS_SELENIUM_START_WORKSPACE_TIMEOUT);
             if (checkNotification) {

package/tslint.json

@@ -26,7 +26,7 @@
     "forin": true,
     "indent": [
       true,
-     "spaces"
+      "spaces"
     ],
     "interface-name": true,
     "jsdoc-format": true,
@@ -59,15 +59,18 @@
     "no-eval": true,
     "no-string-literal": true,
     "no-switch-case-fall-through": true,
-    "trailing-comma": [true, {
-      "singleline": "never",
-      "multiline": {
-        "objects": "ignore",
-        "arrays": "always",
-        "functions": "never",
-        "typeLiterals": "ignore"
+    "trailing-comma": [
+      true,
+      {
+        "singleline": "never",
+        "multiline": {
+          "objects": "ignore",
+          "arrays": "always",
+          "functions": "never",
+          "typeLiterals": "ignore"
+        }
       }
-    }],
+    ],
     "no-trailing-whitespace": true,
     "no-unused-expression": true,
     "no-unused-variable": true,
@@ -92,11 +95,11 @@
     ],
     "typedef": [
       true,
-      "call-signature",
-      "member-variable-declaration",
+      // "call-signature",
+      // "member-variable-declaration",
       "parameter",
-      "property-declaration",
-      "variable-declaration"
+      "property-declaration"
+      // "variable-declaration"
     ],
     "typedef-whitespace": [
       true,

package/utils/DriverHelper.ts

@@ -746,8 +746,4 @@ export class DriverHelper {
 
         return this.driver;
     }
-
-    public sleep(time: number) {
-        this.driver.sleep(time);
-    }
 }

package/utils/VCS/github/GitHubUtil.ts

@@ -82,7 +82,7 @@ export class GitHubUtil {
       const arrayOfPublicKeys = JSON.parse(stringified);
       for (let entry of arrayOfPublicKeys) {
         if (entry.title === keyName) {
-          this.removePublicSshKey(authToken, entry.id);
+          await this.removePublicSshKey(authToken, entry.id);
           break;
         }
       }
@@ -97,7 +97,7 @@ export class GitHubUtil {
     try {
       const idList: string[] = await this.getPublicSshKeys(authToken);
       for (let id of idList) {
-        this.removePublicSshKey(authToken, id);
+        await this.removePublicSshKey(authToken, id);
       }
 
     } catch (error) {

package/utils/workspace/ApiUrlResolver.ts

@@ -34,7 +34,7 @@ export class ApiUrlResolver {
         return ApiUrlResolver.KUBERNETES_API_URL;
     }
 
-    private async obtainUserNamespace() : Promise<string> {
+    private async obtainUserNamespace(): Promise<string> {
         Logger.debug(`ApiUrlResolver.obtainUserNamespace ${this.userNamespace}`);
         if (this.userNamespace.length === 0) {
             Logger.trace(`ApiUrlResolver.obtainUserNamespace USER_NAMESPACE.length = 0, calling kubernetes API`);