@eclipse-che/che-e2e 7.58.1-dev-43d35ee → 7.58.1-dev-156c2d9

package/dist/utils/workspace/TestWorkspaceUtil.js

@@ -0,0 +1,357 @@
+"use strict";
+/*********************************************************************
+ * 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
+ **********************************************************************/
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TestWorkspaceUtil = void 0;
+require("reflect-metadata");
+const TestConstants_1 = require("../../TestConstants");
+const inversify_1 = require("inversify");
+const DriverHelper_1 = require("../DriverHelper");
+const WorkspaceStatus_1 = require("./WorkspaceStatus");
+const selenium_webdriver_1 = require("selenium-webdriver");
+const CheApiRequestHandler_1 = require("../requestHandlers/CheApiRequestHandler");
+const inversify_types_1 = require("../../inversify.types");
+const Logger_1 = require("../Logger");
+const axios_1 = __importDefault(require("axios"));
+const ApiUrlResolver_1 = require("./ApiUrlResolver");
+let TestWorkspaceUtil = class TestWorkspaceUtil {
+    constructor(driverHelper, processRequestHandler, apiUrlResolver) {
+        this.driverHelper = driverHelper;
+        this.processRequestHandler = processRequestHandler;
+        this.apiUrlResolver = apiUrlResolver;
+        this.attempts = TestConstants_1.TestConstants.TS_SELENIUM_WORKSPACE_STATUS_ATTEMPTS;
+        this.polling = TestConstants_1.TestConstants.TS_SELENIUM_WORKSPACE_STATUS_POLLING;
+    }
+    async waitWorkspaceStatus(workspaceName, expectedWorkspaceStatus) {
+        Logger_1.Logger.debug('TestWorkspaceUtil.waitWorkspaceStatus');
+        let workspaceStatus = '';
+        let expectedStatus = false;
+        for (let i = 0; i < this.attempts; i++) {
+            const response = await this.processRequestHandler.get(await this.apiUrlResolver.getWorkspaceApiUrl(workspaceName));
+            if (response.status !== 200) {
+                throw new Error(`Can not get status of a workspace. Code: ${response.status} Data: ${response.data}`);
+            }
+            workspaceStatus = await response.data.status.phase;
+            if (workspaceStatus === expectedWorkspaceStatus) {
+                expectedStatus = true;
+                break;
+            }
+            await this.driverHelper.wait(this.polling);
+        }
+        if (!expectedStatus) {
+            let waitTime = this.attempts * this.polling;
+            throw new selenium_webdriver_1.error.TimeoutError(`The workspace was not stopped in ${waitTime} ms. Currnet status is: ${workspaceStatus}`);
+        }
+    }
+    async stopWorkspaceByName(workspaceName) {
+        Logger_1.Logger.debug('TestWorkspaceUtil.stopWorkspaceByName');
+        const stopWorkspaceApiUrl = await this.apiUrlResolver.getWorkspaceApiUrl(workspaceName);
+        let stopWorkspaceResponse;
+        try {
+            stopWorkspaceResponse = await this.processRequestHandler.patch(stopWorkspaceApiUrl, [{ 'op': 'replace', 'path': '/spec/started', 'value': false }]);
+        }
+        catch (err) {
+            console.log(`Stop workspace call failed. URL used: ${stopWorkspaceApiUrl}`);
+            throw err;
+        }
+        if (stopWorkspaceResponse.status !== 200) {
+            throw new Error(`Cannot stop workspace. Code: ${stopWorkspaceResponse.status} Data: ${stopWorkspaceResponse.data}`);
+        }
+        await this.waitWorkspaceStatus(workspaceName, WorkspaceStatus_1.WorkspaceStatus.STOPPED);
+    }
+    // delete a worksapce without stopping phase (similar with force deleting)
+    async deleteWorkspaceByName(workspaceName) {
+        var _a, _b;
+        Logger_1.Logger.debug(`TestWorkspaceUtil.deleteWorkspaceByName ${workspaceName}`);
+        const deleteWorkspaceApiUrl = await this.apiUrlResolver.getWorkspaceApiUrl(workspaceName);
+        let deleteWorkspaceResponse;
+        let deleteWorkspaceStatus = false;
+        try {
+            deleteWorkspaceResponse = await this.processRequestHandler.delete(deleteWorkspaceApiUrl);
+        }
+        catch (error) {
+            if (axios_1.default.isAxiosError(error) && ((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 404) {
+                Logger_1.Logger.error(`The workspace :${workspaceName} not found`);
+                throw error;
+            }
+            Logger_1.Logger.error(`Delete workspace call failed. URL used: ${deleteWorkspaceStatus}`);
+            throw error;
+        }
+        if (deleteWorkspaceResponse.status !== 204) {
+            throw new Error(`Can not delete workspace. Code: ${deleteWorkspaceResponse.status} Data: ${deleteWorkspaceResponse.data}`);
+        }
+        for (let i = 0; i < this.attempts; i++) {
+            try {
+                deleteWorkspaceResponse = await this.processRequestHandler.get(deleteWorkspaceApiUrl);
+            }
+            catch (error) {
+                if (axios_1.default.isAxiosError(error) && ((_b = error.response) === null || _b === void 0 ? void 0 : _b.status) === 404) {
+                    deleteWorkspaceStatus = true;
+                    break;
+                }
+            }
+        }
+        if (!deleteWorkspaceStatus) {
+            let waitTime = this.attempts * this.polling;
+            throw new selenium_webdriver_1.error.TimeoutError(`The workspace was not stopped in ${waitTime} ms.`);
+        }
+    }
+    // stop workspace before deleting with checking stopping phase
+    async stopAndDeleteWorkspaceByName(workspaceName) {
+        Logger_1.Logger.debug('TestWorkspaceUtil.stopAndDeleteWorkspaceByName');
+        await this.stopWorkspaceByName(workspaceName);
+        await this.deleteWorkspaceByName(workspaceName);
+    }
+    // stop all run workspaces in the namespace
+    async stopAllRunningWorkspaces(namespace) {
+        Logger_1.Logger.debug('TestWorkspaceUtil.stopAllRunProjects');
+        let response = await this.processRequestHandler.get(await this.apiUrlResolver.getWorkspacesApiUrl());
+        for (let i = 0; i < response.data.items.length; i++) {
+            Logger_1.Logger.info('The project is being stopped: ' + response.data.items[i].metadata.name);
+            await this.stopWorkspaceByName(response.data.items[i].metadata.name);
+        }
+    }
+    // stop all run workspaces, check statused and remove the workspaces
+    async stopAndDeleteAllRunningWorkspaces(namespace) {
+        Logger_1.Logger.debug('TestWorkspaceUtil.stopAndDeleteAllRunProjects');
+        let response = await this.processRequestHandler.get(await this.apiUrlResolver.getWorkspacesApiUrl());
+        await this.stopAllRunningWorkspaces(namespace);
+        for (let i = 0; i < response.data.items.length; i++) {
+            Logger_1.Logger.info('The project is being deleted: ' + response.data.items[i].metadata.name);
+            await this.deleteWorkspaceByName(response.data.items[i].metadata.name);
+        }
+    }
+    // stop all run workspaces without stopping and waiting for of 'Stopped' phase
+    // similar with 'force' deleting
+    async deleteAllWorkspaces(namespace) {
+        Logger_1.Logger.debug('TestWorkspaceUtil.deleteAllRunProjects');
+        let response = await this.processRequestHandler.get(await this.apiUrlResolver.getWorkspacesApiUrl());
+        for (let i = 0; i < response.data.items.length; i++) {
+            Logger_1.Logger.info('The project is being deleted .......: ' + response.data.items[i].metadata.name);
+            await this.deleteWorkspaceByName(response.data.items[i].metadata.name);
+        }
+    }
+    /**
+     * @deprecated Method deprecated. Works with CHE server only
+     */
+    async waitPluginAdding(namespace, workspaceName, pluginName) {
+        Logger_1.Logger.debug('TestWorkspaceUtil.waitPluginAdding');
+        const workspaceStatusApiUrl = `${await this.apiUrlResolver.getWorkspacesApiUrl()}/${namespace}:${workspaceName}`;
+        const attempts = TestConstants_1.TestConstants.TS_SELENIUM_PLUGIN_PRECENCE_ATTEMPTS;
+        const polling = TestConstants_1.TestConstants.TS_SELENIUM_DEFAULT_POLLING;
+        for (let i = 0; i < attempts; i++) {
+            const response = await this.processRequestHandler.get(workspaceStatusApiUrl);
+            if (response.status !== 200) {
+                await this.driverHelper.wait(polling);
+                continue;
+            }
+            const machines = JSON.stringify(response.data.runtime.machines);
+            const isPluginPresent = machines.search(pluginName) > 0;
+            if (isPluginPresent) {
+                break;
+            }
+            if (i === attempts - 1) {
+                throw new selenium_webdriver_1.error.TimeoutError(`Exceeded maximum tries attempts, the '${pluginName}' plugin is not present in the workspace runtime.`);
+            }
+            await this.driverHelper.wait(polling);
+        }
+    }
+    /**
+     * @deprecated Method deprecated. Works with CHE server only
+     */
+    async getListOfWorkspaceId() {
+        Logger_1.Logger.debug('TestWorkspaceUtil.getListOfWorkspaceId');
+        const getAllWorkspacesResponse = await this.processRequestHandler.get(await this.apiUrlResolver.getWorkspacesApiUrl());
+        let stringified = JSON.stringify(getAllWorkspacesResponse.data);
+        let arrayOfWorkspaces = JSON.parse(stringified);
+        let wsList = [];
+        for (let entry of arrayOfWorkspaces) {
+            wsList.push(entry.id);
+        }
+        return wsList;
+    }
+    /**
+     * @deprecated Method deprecated. Works with CHE server only
+     */
+    async getIdOfRunningWorkspace(wsName) {
+        Logger_1.Logger.debug('TestWorkspaceUtil.getIdOfRunningWorkspace');
+        const getWorkspacesByNameResponse = await this.processRequestHandler.get(`${await this.apiUrlResolver.getWorkspacesApiUrl()}/:${wsName}`);
+        return getWorkspacesByNameResponse.data.id;
+    }
+    /**
+     * @deprecated Method deprecated. Works with CHE server only
+     */
+    async getIdOfRunningWorkspaces() {
+        Logger_1.Logger.debug('TestWorkspaceUtil.getIdOfRunningWorkspaces');
+        try {
+            const getAllWorkspacesResponse = await this.processRequestHandler.get(await this.apiUrlResolver.getWorkspacesApiUrl());
+            let stringified = JSON.stringify(getAllWorkspacesResponse.data);
+            let arrayOfWorkspaces = JSON.parse(stringified);
+            let idOfRunningWorkspace = new Array();
+            for (let entry of arrayOfWorkspaces) {
+                if (entry.status === 'RUNNING') {
+                    idOfRunningWorkspace.push(entry.id);
+                }
+            }
+            return idOfRunningWorkspace;
+        }
+        catch (err) {
+            console.log(`Getting id of running workspaces failed. URL used: ${await this.apiUrlResolver.getWorkspacesApiUrl()}`);
+            throw err;
+        }
+    }
+    /**
+     * @deprecated Method deprecated. Works with CHE server only
+     */
+    async removeWorkspaceById(id) {
+        Logger_1.Logger.debug('TestWorkspaceUtil.removeWorkspaceById');
+        const workspaceIdUrl = `${await this.apiUrlResolver.getWorkspacesApiUrl()}/${id}`;
+        try {
+            const deleteWorkspaceResponse = await this.processRequestHandler.delete(workspaceIdUrl);
+            if (deleteWorkspaceResponse.status !== 204) {
+                throw new Error(`Can not remove workspace. Code: ${deleteWorkspaceResponse.status} Data: ${deleteWorkspaceResponse.data}`);
+            }
+        }
+        catch (err) {
+            console.log(`Removing of workspace failed.`);
+            throw err;
+        }
+    }
+    /**
+     * @deprecated Method deprecated. Works with CHE server only
+     */
+    async stopWorkspaceById(id) {
+        Logger_1.Logger.debug('TestWorkspaceUtil.stopWorkspaceById');
+        const stopWorkspaceApiUrl = `${await this.apiUrlResolver.getWorkspacesApiUrl()}/${id}`;
+        let stopWorkspaceResponse;
+        try {
+            stopWorkspaceResponse = await this.processRequestHandler.delete(`${stopWorkspaceApiUrl}`);
+        }
+        catch (err) {
+            console.log(`Stop workspace call failed. URL used: ${stopWorkspaceApiUrl}`);
+            throw err;
+        }
+        if (stopWorkspaceResponse.status !== 200) {
+            throw new Error(`Can not stop workspace. Code: ${stopWorkspaceResponse.status} Data: ${stopWorkspaceResponse.data}`);
+        }
+        let stopped = false;
+        let wsStatus = await this.processRequestHandler.get(stopWorkspaceApiUrl);
+        for (let i = 0; i < TestConstants_1.TestConstants.TS_SELENIUM_PLUGIN_PRECENCE_ATTEMPTS; i++) {
+            wsStatus = await this.processRequestHandler.get(stopWorkspaceApiUrl);
+            if (wsStatus.data.status === WorkspaceStatus_1.WorkspaceStatus.STOPPED) {
+                stopped = true;
+                break;
+            }
+            await this.driverHelper.wait(TestConstants_1.TestConstants.TS_SELENIUM_DEFAULT_POLLING);
+        }
+        if (!stopped) {
+            let waitTime = TestConstants_1.TestConstants.TS_SELENIUM_PLUGIN_PRECENCE_ATTEMPTS * TestConstants_1.TestConstants.TS_SELENIUM_DEFAULT_POLLING;
+            throw new selenium_webdriver_1.error.TimeoutError(`The workspace was not stopped in ${waitTime} ms. Currnet status is: ${wsStatus.data.status}`);
+        }
+    }
+    /**
+     * @deprecated Method deprecated. Works with CHE server only
+     */
+    async cleanUpAllWorkspaces() {
+        Logger_1.Logger.debug('TestWorkspaceUtil.cleanUpAllWorkspaces');
+        let listOfRunningWorkspaces = await this.getIdOfRunningWorkspaces();
+        for (const entry of listOfRunningWorkspaces) {
+            await this.stopWorkspaceById(entry);
+        }
+        let listAllWorkspaces = await this.getListOfWorkspaceId();
+        for (const entry of listAllWorkspaces) {
+            await this.removeWorkspaceById(entry);
+        }
+    }
+    /**
+     * @deprecated Method deprecated. Works with CHE server only
+     */
+    async cleanUpRunningWorkspace(workspaceName) {
+        if (workspaceName === undefined || workspaceName.length === 0) {
+            Logger_1.Logger.warn(`Could nod delete workspace because workspaceName is undefined or empty`);
+            return;
+        }
+        Logger_1.Logger.debug(`TestWorkspaceUtil.cleanUpRunningWorkspace ${workspaceName}`);
+        const workspaceID = await this.getIdOfRunningWorkspace(workspaceName);
+        if (workspaceID === undefined || workspaceID.length === 0) {
+            Logger_1.Logger.error(`Could nod delete workspace with name ${workspaceName} because workspaceID is undefined or empty`);
+            return;
+        }
+        Logger_1.Logger.trace(`TestWorkspaceUtil.cleanUpRunningWorkspace Stopping workspace:${workspaceName} with ID:${workspaceID}`);
+        await this.stopWorkspaceById(workspaceID);
+        Logger_1.Logger.trace(`TestWorkspaceUtil.cleanUpRunningWorkspace Deleting workspace ${workspaceName}`);
+        await this.removeWorkspaceById(workspaceID);
+    }
+    /**
+     * @deprecated Method deprecated. Works with CHE server only
+     */
+    async createWsFromDevFile(customTemplate) {
+        Logger_1.Logger.debug('TestWorkspaceUtil.createWsFromDevFile');
+        try {
+            await this.processRequestHandler.post(await this.apiUrlResolver.getWorkspacesApiUrl() + '/devfile', customTemplate);
+        }
+        catch (error) {
+            console.error(error);
+            throw error;
+        }
+    }
+    /**
+     * @deprecated Method deprecated. Works with CHE server only
+     */
+    async getBaseDevfile() {
+        Logger_1.Logger.debug('TestWorkspaceUtil.getBaseDevfile');
+        const baseDevfile = {
+            apiVersion: '1.0.0',
+            metadata: {
+                name: 'test-workspace'
+            }
+        };
+        return baseDevfile;
+    }
+    /**
+     * @deprecated Method deprecated. Works with CHE server only
+     */
+    async startWorkspace(workspaceId) {
+        Logger_1.Logger.debug('TestWorkspaceUtil.startWorkspace');
+        try {
+            await this.processRequestHandler.post(`${await this.apiUrlResolver.getWorkspacesApiUrl()}/${workspaceId}/runtime`);
+        }
+        catch (error) {
+            console.error(error);
+            throw error;
+        }
+    }
+};
+TestWorkspaceUtil = __decorate([
+    inversify_1.injectable(),
+    __param(0, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
+    __param(1, inversify_1.inject(inversify_types_1.CLASSES.CheApiRequestHandler)),
+    __param(2, inversify_1.inject(inversify_types_1.CLASSES.ApiUrlResolver)),
+    __metadata("design:paramtypes", [DriverHelper_1.DriverHelper,
+        CheApiRequestHandler_1.CheApiRequestHandler,
+        ApiUrlResolver_1.ApiUrlResolver])
+], TestWorkspaceUtil);
+exports.TestWorkspaceUtil = TestWorkspaceUtil;
+//# sourceMappingURL=TestWorkspaceUtil.js.map

package/dist/utils/workspace/TestWorkspaceUtil.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TestWorkspaceUtil.js","sourceRoot":"","sources":["../../../utils/workspace/TestWorkspaceUtil.ts"],"names":[],"mappings":"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"}

package/dist/utils/workspace/WorkspaceStatus.js

@@ -0,0 +1,19 @@
+"use strict";
+/*********************************************************************
+ * 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
+ **********************************************************************/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WorkspaceStatus = void 0;
+var WorkspaceStatus;
+(function (WorkspaceStatus) {
+    WorkspaceStatus["RUNNING"] = "Running";
+    WorkspaceStatus["STOPPED"] = "Stopped";
+    WorkspaceStatus["STARTING"] = "Starting";
+})(WorkspaceStatus = exports.WorkspaceStatus || (exports.WorkspaceStatus = {}));
+//# sourceMappingURL=WorkspaceStatus.js.map

package/dist/utils/workspace/WorkspaceStatus.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"WorkspaceStatus.js","sourceRoot":"","sources":["../../../utils/workspace/WorkspaceStatus.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;AAExE,IAAY,eAIX;AAJD,WAAY,eAAe;IACvB,sCAAmB,CAAA;IACnB,sCAAmB,CAAA;IACnB,wCAAqB,CAAA;AACzB,CAAC,EAJW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAI1B"}

package/driver/CheReporter.ts

@@ -8,8 +8,7 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 import * as mocha from 'mocha';
-import { IDriver } from './IDriver';
-import { TYPES, CLASSES } from '..';
+import { TYPES, CLASSES } from '../inversify.types';
 import * as fs from 'fs';
 import * as rm from 'rimraf';
 import { TestConstants } from '../TestConstants';
@@ -22,7 +21,6 @@ import { Logger } from '../utils/Logger';
 import { Sanitizer } from '../utils/Sanitizer';
 import { e2eContainer } from '../inversify.config';
 
-const driver: IDriver = e2eContainer.get(TYPES.Driver);
 const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
 const screenCatcher: ScreenCatcher = e2eContainer.get(CLASSES.ScreenCatcher);
 const sanitizer: Sanitizer = e2eContainer.get(CLASSES.Sanitizer);
@@ -112,10 +110,10 @@ class CheReporter extends mocha.reporters.Spec {
 
     runner.on('end', async function (test: mocha.Test) {
       // ensure that fired events done
-      await driver.get().sleep(5000);
+      await driverHelper.wait(5000);
 
       // close driver
-      await driver.get().quit();
+      await driverHelper.getDriver().quit();
 
       // delete screencast folder if conditions matched
       if (deleteScreencast && TestConstants.DELETE_SCREENCAST_IF_TEST_PASS) {
@@ -156,13 +154,13 @@ class CheReporter extends mocha.reporters.Spec {
       }
 
       // take screenshot and write to file
-      const screenshot: string = await driver.get().takeScreenshot();
+      const screenshot: string = await driverHelper.getDriver().takeScreenshot();
       const screenshotStream = fs.createWriteStream(screenshotFileName);
       screenshotStream.write(Buffer.from(screenshot, 'base64'));
       screenshotStream.end();
 
       // take pagesource and write to file
-      const pageSource: string = await driver.get().getPageSource();
+      const pageSource: string = await driverHelper.getDriver().getPageSource();
       const pageSourceStream = fs.createWriteStream(pageSourceFileName);
       pageSourceStream.write(Buffer.from(pageSource));
       pageSourceStream.end();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-che/che-e2e",
-  "version": "7.58.1-dev-43d35ee",
+  "version": "7.58.1-dev-156c2d9",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -54,7 +54,7 @@
     "rimraf": "2.6.2",
     "selenium-webdriver": "4.4.0",
     "ts-node": "8.0.3",
-    "tslint":  "^6.1.3",
+    "tslint": "^6.1.3",
     "typed-rest-client": "1.8.5",
     "typescript": "3.9.9",
     "monaco-page-objects": "3.1.0",

package/tests/MochaHooks.ts

@@ -1,6 +1,5 @@
 
-import { IDriver } from '..';
-import { TYPES, CLASSES } from '..';
+import { CLASSES } from '../inversify.types';
 import { EditorType, TestConstants } from '../TestConstants';
 import { AskForConfirmationTypeTheia, PreferencesHandlerTheia, TerminalRendererTypeTheia } from '../utils/theia/PreferencesHandlerTheia';
 import { CheApiRequestHandler } from '../utils/requestHandlers/CheApiRequestHandler';
@@ -8,8 +7,9 @@ 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 driver: IDriver = e2eContainer.get(TYPES.Driver);
+const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
 const preferencesHandler: PreferencesHandlerTheia = e2eContainer.get(CLASSES.PreferencesHandlerTheia);
 
 exports.mochaHooks = {
@@ -33,7 +33,7 @@ exports.mochaHooks = {
         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');
+                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() {

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

@@ -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/tslint.json

@@ -98,7 +98,7 @@
       // "call-signature",
       // "member-variable-declaration",
       "parameter",
-      "property-declaration",
+      "property-declaration"
       // "variable-declaration"
     ],
     "typedef-whitespace": [

package/utils/DriverHelper.ts

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