@eclipse-che/che-e2e 7.58.0-dev-185cda8 → 7.58.0-dev-cefb185

package/inversify.types.ts

@@ -48,7 +48,7 @@ const CLASSES = {
     CheGitApi: 'CheGitApi',
     GitPlugin: 'GitPlugin',
     NotificationCenter: 'NotificationCenter',
-    PreferencesHandler: 'PreferencesHandler',
+    PreferencesHandlerTheia: 'PreferencesHandlerTheia',
     CheApiRequestHandler: 'CheApiRequestHandler',
     CreateWorkspace: 'CreateWorkspace',
     OpenDialogWidget: 'OpenDialogWidget',
@@ -56,9 +56,9 @@ const CLASSES = {
     KubernetesPlugin: 'KubernetesPlugin',
     BrowserTabsUtil: 'BrowserTabsUtil',
     PluginsView: 'PluginsView',
-    LanguageServerTests: 'LanguageServerTests',
-    CodeExecutionTests: 'CodeExecutionTests',
-    ProjectAndFileTests: 'ProjectAndFileTests',
+    LanguageServerTestsTheia: 'LanguageServerTestsTheia',
+    CodeExecutionTestsTheia: 'CodeExecutionTestsTheia',
+    ProjectAndFileTestsTheia: 'ProjectAndFileTestsTheia',
     WorkspaceHandlingTests: 'WorkspaceHandlingTests',
     WorkspaceNameHandler: 'WorkspaceNameHandler',
     GitHubPullRequestPlugin: 'GitHubPullRequestPlugin',

package/{mocha-all-devfiles.json → mocha-all-devfiles-theia.json}

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

package/{mocha-git-ssh.json → mocha-all-factories-code.json}

@@ -6,6 +6,6 @@
     "full-trace": true,
     "require": "source-map-support/register",
     "spec": [
-        "dist/tests/e2e/GitSsh.spec.js"
+        "dist/tests/login/Login.spec.js"
     ]
 }

package/{mocha-all-factories.json → mocha-all-factories-theia.json}

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

package/mocha-all-plugins-code.json

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

package/{mocha-all-plugins.json → mocha-all-plugins-theia.json}

@@ -6,7 +6,7 @@
     "require": "source-map-support/register",
     "spec": [
         "dist/tests/login/Login.spec.js",
-        "dist/tests/plugins/VscodeXmlPlugin.spec.js",
-        "dist/tests/plugins/VscodeYamlPlugin.spec.js"
+        "dist/tests/plugins/theia/VscodeXmlPlugin.spec.js",
+        "dist/tests/plugins/theia/VscodeYamlPlugin.spec.js"
     ]
 }

package/{mocha.json → mocha-code.json}

@@ -4,5 +4,5 @@
     "ui": "tdd",
     "bail": true,
     "full-trace": true,
-    "spec": ["dist/tests/login/Login.spec.js", "dist/tests/e2e/*.spec.js"]
+    "spec": ["dist/tests/login/Login.spec.js", "dist/tests/e2e/code/*.spec.js"]
 }

package/{mocha-connector.json → mocha-connector-theia.json}

@@ -5,5 +5,5 @@
     "bail": true,
     "full-trace": true,
     "require": "source-map-support/register",
-    "spec": "dist/tests/e2e/OpenshiftConnector.spec.js"
+    "spec": "dist/tests/e2e/theia/OpenshiftConnector.spec.js"
 }

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

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

package/{mocha-devworkspace-happy-path.json → mocha-devworkspace-happy-path-theia.json}

@@ -6,6 +6,6 @@
     "require": "source-map-support/register",
     "spec": [
         "dist/tests/login/Login.spec.js",
-        "dist/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.js"
+        "dist/tests/e2e_happy_path/theia/DevWorkspaceHappyPath.spec.js"
     ]
 }

package/mocha-factory-code.json

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

package/{mocha-factory.json → mocha-factory-theia.json}

@@ -6,6 +6,6 @@
     "require": "source-map-support/register",
     "spec": [
         "dist/tests/login/Login.spec.js",
-        "dist/tests/e2e/FactoryUrl.spec.js"
+        "dist/tests/e2e/theia/FactoryUrl.spec.js"
     ]
 }

package/mocha-git-publish-branch-theia.json

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

package/mocha-git-self-sign-cert-theia.json

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

package/{mocha-git-self-sign-cert.json → mocha-git-ssh-theia.json}

@@ -6,6 +6,6 @@
     "full-trace": true,
     "require": "source-map-support/register",
     "spec": [
-        "dist/tests/e2e/GitSelfSignCert.spec.js"
+        "dist/tests/e2e/theia/GitSsh.spec.js"
     ]
 }

package/{mocha-git-publish-branch.json → mocha-happy-path-code.json}

@@ -6,6 +6,6 @@
     "full-trace": true,
     "require": "source-map-support/register",
     "spec": [
-        "dist/tests/e2e/GitPublishBranch.spec.js"
+        "dist/tests/login/Login.spec.js"
     ]
 }

package/{mocha-happy-path.json → mocha-happy-path-theia.json}

@@ -7,6 +7,6 @@
     "require": "source-map-support/register",
     "spec": [
         "dist/tests/login/Login.spec.js",
-        "dist/tests/e2e_happy_path/HappyPath.spec.js"
+        "dist/tests/e2e_happy_path/theia/HappyPath.spec.js"
     ]
 }

package/{mocha-java-vertx.json → mocha-java-maven.json}

@@ -5,5 +5,5 @@
     "bail": true,
     "full-trace": true,
     "support": "source-map-support/register",
-    "spec": ["dist/tests/login/Login.spec.js", "dist/tests/devfiles/JavaVertx.spec.js"]
+    "spec": ["dist/tests/login/Login.spec.js", "dist/tests/devfiles/JavaMaven.spec.js"]
 }

package/{mocha-load.json → mocha-java-springboot-code.json}

@@ -5,5 +5,5 @@
     "bail": true,
     "full-trace": true,
     "support": "source-map-support/register",
-    "spec": ["dist/tests/load_test/LoadTest.spec.js"]
+    "spec": ["dist/tests/login/Login.spec.js"]
 }

package/mocha-java-springboot-theia.json

@@ -0,0 +1,9 @@
+{
+    "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"]
+}

package/{mocha-wkspc-creation-and-ls.json → mocha-java-vertx-code.json}

@@ -5,5 +5,5 @@
     "bail": true,
     "full-trace": true,
     "support": "source-map-support/register",
-    "spec": ["dist/tests/e2e/WorkspaceCreationAndLsInitialization.spec.js"]
+    "spec": ["dist/tests/login/Login.spec.js"]
 }

package/mocha-java-vertx-theia.json

@@ -0,0 +1,9 @@
+{
+    "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"]
+}

package/mocha-load-theia.json

@@ -0,0 +1,9 @@
+{
+    "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"]
+}

package/mocha-scala.json

@@ -0,0 +1,9 @@
+{
+    "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"]
+}

package/mocha-theia.json

@@ -0,0 +1,8 @@
+{
+    "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"]
+}

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

@@ -0,0 +1,9 @@
+{
+    "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"]
+}

package/package.json

@@ -1,33 +1,43 @@
 {
   "name": "@eclipse-che/che-e2e",
-  "version": "7.58.0-dev-185cda8",
+  "version": "7.58.0-dev-cefb185",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
+    "lint": "tslint --fix -p .",
+    "tsc": "tsc -p .",
     "cleanup-docker": "if [ $(docker ps -a | grep -c selenium-e2e) -gt 0 ]; then docker rm -f $(docker ps --filter \"name=selenium-e2e\" -aq); fi;",
+    "init-mocha-opts": "tsc && mocha --config mocha-single-devfile.json --spec dist/tests/login/Login.spec.js",
     "test-docker": "npm run cleanup-docker && docker run -it --shm-size=2g -p 5920:5920 --name selenium-e2e -e TS_SELENIUM_BASE_URL=$TS_SELENIUM_BASE_URL eclipse/che-e2e:nightly",
     "test-docker-mount-e2e": "npm run cleanup-docker && docker run -it --shm-size=2g -p 5920:5920 --name selenium-e2e -e TS_SELENIUM_BASE_URL=$TS_SELENIUM_BASE_URL -v $(pwd):/tmp/e2e:Z eclipse/che-e2e:nightly",
-    "test": "./generateIndex.sh && npm run lint && npm run tsc && mocha --config mocha.json",
-    "load-test": "./generateIndex.sh && npm run lint && npm run tsc && mocha --config mocha-load.json",
-    "test-happy-path": "./generateIndex.sh && npm run lint && npm run tsc && mocha --config mocha-happy-path.json",
-    "test-devworkspace-happy-path": "./generateIndex.sh && npm run lint && npm run tsc && mocha --config mocha-devworkspace-happy-path.json",
-    "test-wkspc-creation-and-ls": "./generateIndex.sh && npm run lint && npm run tsc && mocha --config mocha-wkspc-creation-and-ls",
-    "test-java-vertx": "./generateIndex.sh && npm run lint && npm run tsc && mocha --config mocha-java-vertx.json",
-    "test-git-ssh": "./generateIndex.sh &&  npm run lint && npm run tsc && mocha --config mocha-git-ssh.json",
-    "test-git-self-sign-cert": "./generateIndex.sh && npm run lint && npm run tsc && mocha --config mocha-git-self-sign-cert.json",
-    "test-git-publish-branch": "./generateIndex.sh &&  npm run lint && npm run tsc && mocha --config mocha-git-publish-branch.json",
-    "test-openshift-connector": "./generateIndex.sh &&  npm run lint && npm run tsc && mocha --config mocha-connector.json",
-    "test-all-devfiles": "./generateIndex.sh && ./initDevfileTests.sh",
-    "test-factory": "./generateIndex.sh && npm run lint && npm run tsc && mocha --config mocha-factory.json",
-    "test-all-factories": "./generateIndex.sh && npm run lint && npm run tsc && mocha --config mocha-all-factories.json",
-    "test-intelij": "tsc && mocha --config mocha.intelij.json",
     "test-oauth": "tsc && mocha --config mocha.ocp.link.json",
-    "lint": "tslint --fix -p .",
-    "tsc": "tsc -p .",
-    "init-mocha-opts": "tsc && mocha --config mocha-single-devfile.json --spec dist/tests/login/Login.spec.js",
+    "test-intelij": "tsc && mocha --config mocha.intelij.json",
     "test-plugin": "./initPluginTest.sh",
-    "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"
+    "test-all-devfiles": "./generateIndex.sh && ./initDevfileTests.sh",
+    "test-theia": "./generateIndex.sh && npm run lint && npm run tsc && mocha --config mocha-theia.json",
+    "load-test-theia": "./generateIndex.sh && npm run lint && npm run tsc && mocha --config mocha-load-theia.json",
+    "test-happy-path-theia": "./generateIndex.sh && npm run lint && npm run tsc && mocha --config mocha-happy-path-theia.json",
+    "test-devworkspace-happy-path-theia": "./generateIndex.sh && npm run lint && npm run tsc && mocha --config mocha-devworkspace-happy-path-theia.json",
+    "test-ws-creation-and-ls-theia": "./generateIndex.sh && npm run lint && npm run tsc && mocha --config mocha-ws-creation-and-ls-theia.json",
+    "test-java-vertx-theia": "./generateIndex.sh && npm run lint && npm run tsc && mocha --config mocha-java-vertx-theia.json",
+    "test-java-springboot-theia": "./generateIndex.sh && npm run lint && npm run tsc && mocha --config mocha-java-springboot-theia.json",
+    "test-git-ssh-theia": "./generateIndex.sh &&  npm run lint && npm run tsc && mocha --config mocha-git-ssh-theia.json",
+    "test-git-self-sign-cert-theia": "./generateIndex.sh && npm run lint && npm run tsc && mocha --config mocha-git-self-sign-cert-theia.json",
+    "test-git-publish-branch-theia": "./generateIndex.sh &&  npm run lint && npm run tsc && mocha --config mocha-git-publish-branch-theia.json",
+    "test-openshift-connector-theia": "./generateIndex.sh &&  npm run lint && npm run tsc && mocha --config mocha-connector-theia.json",
+    "test-factory-theia": "./generateIndex.sh && npm run lint && npm run tsc && mocha --config mocha-factory-theia.json",
+    "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-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"
   },
   "author": "Ihor Okhrimenko (iokhrime@redhat.com)",
   "license": "ISC",
@@ -36,17 +46,19 @@
     "@types/mocha": "5.2.6",
     "@types/node": "11.13.4",
     "@types/rimraf": "2.0.2",
-    "@types/selenium-webdriver": "3.0.16",
+    "@types/selenium-webdriver": "4.1.3",
     "axios": "^0.25.0",
     "chai": "4.2.0",
-    "chromedriver": "^101.0.0",
+    "chromedriver": "^103.0.0",
     "mocha": "^9.1.3",
     "rimraf": "2.6.2",
-    "selenium-webdriver": "3.6.0",
+    "selenium-webdriver": "4.4.0",
     "ts-node": "8.0.3",
     "tslint": "5.10.0",
     "typed-rest-client": "1.8.5",
-    "typescript": "3.9.9"
+    "typescript": "3.9.9",
+    "monaco-page-objects": "3.1.0",
+    "vscode-extension-tester-locators": "3.1.0"
   },
   "dependencies": {
     "@eclipse-che/api": "latest",

package/pageobjects/dashboard/CreateWorkspace.ts

@@ -11,12 +11,14 @@
 import { injectable, inject } from 'inversify';
 import { CLASSES } from '../../inversify.types';
 import { DriverHelper } from '../../utils/DriverHelper';
-import { By } from 'selenium-webdriver';
+import { By, Key } from 'selenium-webdriver';
 import { Logger } from '../../utils/Logger';
 import { TimeoutConstants } from '../../TimeoutConstants';
 
 @injectable()
 export class CreateWorkspace {
+    static readonly FACTORY_URL_LOCATOR: By = By.xpath(`//input[@id="git-repo-url"]`);
+
     constructor(@inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) { }
 
     async waitTitleContains(expectedText: string, timeout: number = TimeoutConstants.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
@@ -49,6 +51,12 @@ export class CreateWorkspace {
         await this.driverHelper.waitAndClick(sampleLocator, timeout);
     }
 
+    async startWorkspaceUsingFactory(factoryUrl: string, timeout: number = TimeoutConstants.TS_CLICK_DASHBOARD_ITEM_TIMEOUT) {
+        Logger.debug(`CreateWorkspace.startWorkspaceUsingFactory factoryUrl: "${factoryUrl}"`);
+        await this.driverHelper.waitVisibility(CreateWorkspace.FACTORY_URL_LOCATOR, timeout);
+        await this.driverHelper.type(CreateWorkspace.FACTORY_URL_LOCATOR, Key.chord(factoryUrl, Key.ENTER), timeout);
+    }
+
     private getSampleLocator(sampleName: string): By {
         Logger.trace(`CreateWorkspace.getSampleLocator sampleName: ${sampleName}`);
 

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

@@ -13,7 +13,7 @@ import { CLASSES, TYPES } from '../../../inversify.types';
 import 'reflect-metadata';
 import { TestConstants } from '../../../TestConstants';
 import { By } from 'selenium-webdriver';
-import { Ide } from '../../ide/Ide';
+import { Ide } from '../../ide/theia/Ide';
 import { WorkspaceStatus } from '../../../utils/workspace/WorkspaceStatus';
 import { Logger } from '../../../utils/Logger';
 import { TimeoutConstants } from '../../../TimeoutConstants';

package/pageobjects/ide/{ContextMenu.ts → theia/ContextMenu.ts}

@@ -10,11 +10,11 @@
 
 import 'reflect-metadata';
 import { injectable, inject } from 'inversify';
-import { DriverHelper } from '../../utils/DriverHelper';
-import { CLASSES } from '../../inversify.types';
-import { WebElement, Button, By, Key } from 'selenium-webdriver';
-import { Logger } from '../../utils/Logger';
-import { TimeoutConstants } from '../../TimeoutConstants';
+import { DriverHelper } from '../../../utils/DriverHelper';
+import { CLASSES } from '../../../inversify.types';
+import { By, Key, WebElement } from 'selenium-webdriver';
+import { Logger } from '../../../utils/Logger';
+import { TimeoutConstants } from '../../../TimeoutConstants';
 
 @injectable()
 export class ContextMenu {
@@ -27,7 +27,7 @@ export class ContextMenu {
           Logger.debug(`ContextMenu.invokeContextMenuOnTheElementWithMouse ${elementLocator}`);
 
           const webElement: WebElement = await this.driverHelper.waitVisibility(elementLocator, TimeoutConstants.TS_CONTEXT_MENU_TIMEOUT);
-          await this.driverHelper.getAction().click(webElement, Button.RIGHT).perform();
+          await this.driverHelper.getAction().contextClick(webElement).perform();
           this.waitContextMenu();
      }
 

package/pageobjects/ide/{DebugView.ts → theia/DebugView.ts}

@@ -9,14 +9,14 @@
  **********************************************************************/
 
 import { inject, injectable } from 'inversify';
-import { CLASSES } from '../../inversify.types';
-import { TestConstants } from '../../TestConstants';
-import { DriverHelper } from '../../utils/DriverHelper';
+import { CLASSES } from '../../../inversify.types';
+import { TestConstants } from '../../../TestConstants';
+import { DriverHelper } from '../../../utils/DriverHelper';
 import { By, Key, WebElement, error } from 'selenium-webdriver';
 import { Ide } from './Ide';
-import { Logger } from '../../utils/Logger';
-import { TimeoutConstants } from '../../TimeoutConstants';
-import { AnimationChecker } from '../../utils/AnimationChecker';
+import { Logger } from '../../../utils/Logger';
+import { TimeoutConstants } from '../../../TimeoutConstants';
+import { AnimationChecker } from '../../../utils/AnimationChecker';
 
 @injectable()
 export class DebugView {

package/pageobjects/ide/{DialogWindow.ts → theia/DialogWindow.ts}

@@ -9,12 +9,12 @@
  **********************************************************************/
 
 import { injectable, inject } from 'inversify';
-import { CLASSES } from '../../inversify.types';
-import { DriverHelper } from '../../utils/DriverHelper';
+import { CLASSES } from '../../../inversify.types';
+import { DriverHelper } from '../../../utils/DriverHelper';
 import { By } from 'selenium-webdriver';
-import { Logger } from '../../utils/Logger';
+import { Logger } from '../../../utils/Logger';
 import { Ide } from './Ide';
-import { TimeoutConstants } from '../../TimeoutConstants';
+import { TimeoutConstants } from '../../../TimeoutConstants';
 
 @injectable()
 export class DialogWindow {

package/pageobjects/ide/{Editor.ts → theia/Editor.ts}

@@ -10,12 +10,12 @@
 
 import 'reflect-metadata';
 import { injectable, inject } from 'inversify';
-import { DriverHelper } from '../../utils/DriverHelper';
-import { CLASSES } from '../../inversify.types';
-import { TestConstants } from '../../TestConstants';
-import { By, Key, error, ActionSequence, Button } from 'selenium-webdriver';
-import { Logger } from '../../utils/Logger';
-import { TimeoutConstants } from '../../TimeoutConstants';
+import { DriverHelper } from '../../../utils/DriverHelper';
+import { CLASSES } from '../../../inversify.types';
+import { TestConstants } from '../../../TestConstants';
+import { By, Key, error } from 'selenium-webdriver';
+import { Logger } from '../../../utils/Logger';
+import { TimeoutConstants } from '../../../TimeoutConstants';
 
 @injectable()
 export class Editor {
@@ -429,34 +429,33 @@ export class Editor {
         const yPosition: number = await this.getLineYCoordinates(line, fileName) + Editor.ADDITIONAL_SHIFTING_TO_Y;
         const xPosition: number = char + Editor.ADDITIONAL_SHIFTING_TO_X;
 
-        new ActionSequence(this.driverHelper.getDriver()).
-            mouseMove({ x: xPosition, y: yPosition }).
-            click().
-            perform();
+        this.driverHelper.getAction().move({ x: xPosition, y: yPosition }).click().perform();
     }
 
     async goToDefinitionWithMouseClicking(line: number, char: number, fileName: string) {
         Logger.debug(`Editor.goToDefinitionWithMouseClicking line: "${line}" char: "${char}"`);
 
         const yPosition: number = await this.getLineYCoordinates(line, fileName) + Editor.ADDITIONAL_SHIFTING_TO_Y;
+        const xPosition: number = char + Editor.ADDITIONAL_SHIFTING_TO_X;
 
-        new ActionSequence(this.driverHelper.getDriver()).
-            keyDown(Key.CONTROL).
-            mouseMove({ x: char + Editor.ADDITIONAL_SHIFTING_TO_X, y: yPosition }).
-            click().
-            keyDown(Key.CONTROL).
-            perform();
+        this.driverHelper.getAction()
+            .keyDown(Key.CONTROL)
+            .move({ x: xPosition, y: yPosition})
+            .click()
+            .keyDown(Key.CONTROL)
+            .perform();
     }
 
     async mouseRightButtonClick(line: number, char: number, fileName: string) {
         Logger.debug(`Editor.mouseRightButtonClick line: "${line}" char: "${char}"`);
 
         const yPosition: number = await this.getLineYCoordinates(line, fileName) + Editor.ADDITIONAL_SHIFTING_TO_Y;
+        const xPosition: number = char + Editor.ADDITIONAL_SHIFTING_TO_X;
 
-        new ActionSequence(this.driverHelper.getDriver()).
-            mouseMove({ x: char + Editor.ADDITIONAL_SHIFTING_TO_X, y: yPosition }).
-            click(Button.RIGHT).
-            perform();
+        this.driverHelper.getAction()
+            .move({ x: xPosition, y: yPosition})
+            .contextClick()
+            .perform();
     }
 
     private async scrollAndSearchSuggestion(editorTabTitle: string, suggestionLocator: By, timeout: number = 10000) {

package/pageobjects/ide/{Ide.ts → theia/Ide.ts}

@@ -9,14 +9,14 @@
  **********************************************************************/
 
 import axios from 'axios';
-import { DriverHelper } from '../../utils/DriverHelper';
+import { DriverHelper } from '../../../utils/DriverHelper';
 import { injectable, inject } from 'inversify';
-import { CLASSES } from '../../inversify.types';
-import { TestConstants } from '../../TestConstants';
+import { CLASSES } from '../../../inversify.types';
+import { TestConstants } from '../../../TestConstants';
 import { By, error } from 'selenium-webdriver';
-import { Logger } from '../../utils/Logger';
+import { Logger } from '../../../utils/Logger';
 import { NotificationCenter } from './NotificationCenter';
-import { TimeoutConstants } from '../../TimeoutConstants';
+import { TimeoutConstants } from '../../../TimeoutConstants';
 
 export enum LeftToolbarButton {
     Explorer = 'Explorer',

package/pageobjects/ide/{LeftToolBar.ts → theia/LeftToolBar.ts}

@@ -9,11 +9,11 @@
  **********************************************************************/
 
 import { injectable, inject } from 'inversify';
-import { CLASSES } from '../../inversify.types';
-import { DriverHelper } from '../../utils/DriverHelper';
+import { CLASSES } from '../../../inversify.types';
+import { DriverHelper } from '../../../utils/DriverHelper';
 import { By } from 'selenium-webdriver';
-import { Logger } from '../../utils/Logger';
-import { TimeoutConstants } from '../../TimeoutConstants';
+import { Logger } from '../../../utils/Logger';
+import { TimeoutConstants } from '../../../TimeoutConstants';
 
 @injectable()
 export class LeftToolBar {

package/pageobjects/ide/{NavigationBar.ts → theia/NavigationBar.ts}

@@ -7,14 +7,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
- import { injectable, inject } from 'inversify';
- import { DriverHelper } from '../../utils/DriverHelper';
- import { CLASSES } from '../../inversify.types';
- import { Logger } from '../../utils/Logger';
- import { By } from 'selenium-webdriver';
+import { injectable, inject } from 'inversify';
+import { DriverHelper } from '../../../utils/DriverHelper';
+import { CLASSES } from '../../../inversify.types';
+import { Logger } from '../../../utils/Logger';
+import { By } from 'selenium-webdriver';
 
- @injectable()
- export class NavigationBar {
+@injectable()
+export class NavigationBar {
     constructor(@inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) { }
 
     async clickOnShowNavigationBar() {

package/pageobjects/ide/{NotificationCenter.ts → theia/NotificationCenter.ts}

@@ -9,11 +9,11 @@
  **********************************************************************/
 
 import { injectable, inject } from 'inversify';
-import { CLASSES } from '../../inversify.types';
-import { DriverHelper } from '../../utils/DriverHelper';
-import { Logger } from '../../utils/Logger';
+import { CLASSES } from '../../../inversify.types';
+import { DriverHelper } from '../../../utils/DriverHelper';
+import { Logger } from '../../../utils/Logger';
 import { By } from 'selenium-webdriver';
-import { TimeoutConstants } from '../../TimeoutConstants';
+import { TimeoutConstants } from '../../../TimeoutConstants';
 
 @injectable()
 export class NotificationCenter {