@eclipse-che/che-e2e 7.58.0-dev-185cda8 → 7.58.0-dev-3ddca79

package/index.ts

@@ -10,7 +10,7 @@ export * from './utils/AnimationChecker';
 export * from './utils/BrowserTabsUtil';
 export * from './utils/DriverHelper';
 export * from './utils/Logger';
-export * from './utils/PreferencesHandler';
+export * from './utils/theia/PreferencesHandlerTheia';
 export * from './utils/requestHandlers/CheApiRequestHandler';
 export * from './utils/requestHandlers/headers/CheMultiuserAuthorizationHeaderHandler';
 export * from './utils/requestHandlers/headers/IAuthorizationHeaderHandler';
@@ -30,28 +30,28 @@ export * from './pageobjects/dashboard/Dashboard';
 export * from './pageobjects/dashboard/workspace-details/WorkspaceDetailsPlugins';
 export * from './pageobjects/dashboard/workspace-details/WorkspaceDetails';
 export * from './pageobjects/dashboard/Workspaces';
-export * from './pageobjects/ide/ContextMenu';
-export * from './pageobjects/ide/DebugView';
-export * from './pageobjects/ide/DialogWindow';
-export * from './pageobjects/ide/Editor';
-export * from './pageobjects/ide/Ide';
-export * from './pageobjects/ide/LeftToolBar';
-export * from './pageobjects/ide/NavigationBar';
-export * from './pageobjects/ide/NotificationCenter';
-export * from './pageobjects/ide/OpenDialogWidget';
-export * from './pageobjects/ide/OpenEditors';
-export * from './pageobjects/ide/OpenWorkspaceWidget';
-export * from './pageobjects/ide/plugins/GitHubPullRequestPlugin';
-export * from './pageobjects/ide/plugins/GitPlugin';
-export * from './pageobjects/ide/plugins/KubernetesPlugin';
-export * from './pageobjects/ide/plugins/OpenshiftPlugin';
-export * from './pageobjects/ide/plugins/PluginsView';
-export * from './pageobjects/ide/PreviewWidget';
-export * from './pageobjects/ide/ProjectTree';
-export * from './pageobjects/ide/QuickOpenContainer';
-export * from './pageobjects/ide/RightToolBar';
-export * from './pageobjects/ide/Terminal';
-export * from './pageobjects/ide/TopMenu';
+export * from './pageobjects/ide/theia/ContextMenu';
+export * from './pageobjects/ide/theia/DebugView';
+export * from './pageobjects/ide/theia/DialogWindow';
+export * from './pageobjects/ide/theia/Editor';
+export * from './pageobjects/ide/theia/Ide';
+export * from './pageobjects/ide/theia/LeftToolBar';
+export * from './pageobjects/ide/theia/NavigationBar';
+export * from './pageobjects/ide/theia/NotificationCenter';
+export * from './pageobjects/ide/theia/OpenDialogWidget';
+export * from './pageobjects/ide/theia/OpenEditors';
+export * from './pageobjects/ide/theia/OpenWorkspaceWidget';
+export * from './pageobjects/ide/theia/plugins/GitHubPullRequestPlugin';
+export * from './pageobjects/ide/theia/plugins/GitPlugin';
+export * from './pageobjects/ide/theia/plugins/KubernetesPlugin';
+export * from './pageobjects/ide/theia/plugins/OpenshiftPlugin';
+export * from './pageobjects/ide/theia/plugins/PluginsView';
+export * from './pageobjects/ide/theia/PreviewWidget';
+export * from './pageobjects/ide/theia/ProjectTree';
+export * from './pageobjects/ide/theia/QuickOpenContainer';
+export * from './pageobjects/ide/theia/RightToolBar';
+export * from './pageobjects/ide/theia/Terminal';
+export * from './pageobjects/ide/theia/TopMenu';
 export * from './pageobjects/login/ICheLoginPage';
 export * from './pageobjects/login/IOcpLoginPage';
 export * from './pageobjects/login/MultiUserLoginPage';
@@ -62,7 +62,7 @@ export * from './pageobjects/openshift/CheLoginPage';
 export * from './pageobjects/openshift/OcpLoginPage';
 export * from './pageobjects/third-parties/GitLoginPage';
 export * from './pageobjects/third-parties/GitOauthAppsSettings';
-export * from './testsLibrary/CodeExecutionTests';
-export * from './testsLibrary/LanguageServerTests';
-export * from './testsLibrary/ProjectAndFileTests';
+export * from './testsLibrary/theia/CodeExecutionTestsTheia';
+export * from './testsLibrary/theia/LanguageServerTestsTheia';
+export * from './testsLibrary/theia/ProjectAndFileTestsTheia';
 export * from './testsLibrary/WorkspaceHandlingTests';

package/initDefaultValues.sh

@@ -8,6 +8,7 @@ export TS_SELENIUM_PASSWORD=${TS_SELENIUM_PASSWORD:-"admin"}
 export TS_SELENIUM_MULTIUSER=${TS_SELENIUM_MULTIUSER:-"true"}
 export TS_SELENIUM_W3C_CHROME_OPTION=${TS_SELENIUM_W3C_CHROME_OPTION:-"true"}
 export NODE_TLS_REJECT_UNAUTHORIZED=${NODE_TLS_REJECT_UNAUTHORIZED:-0}
+export TS_SELENIUM_EDITOR=${TS_SELENIUM_EDITOR:-"che-code"}
 
 if [ "$E2E_OCP_CLUSTER_VERSION" = "3.x" ] ; then
     unset TS_OCP_LOGIN_PAGE_PROVIDER_TITLE
@@ -25,3 +26,4 @@ echo "TS_SELENIUM_PASSWORD =                ${TS_SELENIUM_PASSWORD}"
 echo "TS_SELENIUM_MULTIUSER =               ${TS_SELENIUM_MULTIUSER}"
 echo "TS_SELENIUM_W3C_CHROME_OPTION =       ${TS_SELENIUM_W3C_CHROME_OPTION}"
 echo "NODE_TLS_REJECT_UNAUTHORIZED =        ${NODE_TLS_REJECT_UNAUTHORIZED}"
+echo "TS_SELENIUM_EDITOR =                  ${TS_SELENIUM_EDITOR}"

package/initDevfileTests.sh

@@ -9,7 +9,7 @@ launchAllUserstories(){
     echo "Launching all userstories";
     echo ""
 
-    npm run lint && npm run tsc && mocha --config mocha-all-devfiles.json ;
+    npm run lint && npm run tsc && mocha --config mocha-all-devfiles-${TS_SELENIUM_EDITOR}.json ;
 }
 
 launchSingleUserstory(){
@@ -17,11 +17,11 @@ launchSingleUserstory(){
     echo "Launching the \"${USERSTORY}\" userstory";
     echo ""
 
-    tsc && mocha --config mocha-single-devfile.json --spec dist/tests/login/Login.spec.js --spec dist/tests/devfiles/${USERSTORY}.spec.js ;
+    tsc && mocha --config mocha-single-devfile.json --spec dist/tests/login/Login.spec.js --spec dist/tests/devfiles/${TS_SELENIUM_EDITOR}/${USERSTORY}.spec.js ;
 }
 
 checkUserstoryName(){
-    local checkedName="$(ls tests/devfiles | grep ${USERSTORY}.spec.ts)";
+    local checkedName="$(ls tests/devfiles/${TS_SELENIUM_EDITOR} | grep ${USERSTORY}.spec.ts)";
 
     if [ -z "$checkedName" ]; then
         echo ""

package/initPluginTest.sh

@@ -6,4 +6,4 @@ echo ""
 echo "Launching the \"${USERSTORY}\" userstory";
 echo ""
 
-npm run init-mocha-opts -- --spec dist/tests/plugins/${USERSTORY}.spec.js
+npm run init-mocha-opts -- --spec dist/tests/plugins/${TS_SELENIUM_EDITOR}/${USERSTORY}.spec.js

package/inversify.config.ts

@@ -19,30 +19,30 @@ import { TestConstants } from './TestConstants';
 import { ICheLoginPage } from './pageobjects/login/ICheLoginPage';
 import { RegularUserOcpCheLoginPage } from './pageobjects/login/RegularUserOcpCheLoginPage';
 import { MultiUserLoginPage } from './pageobjects/login/MultiUserLoginPage';
-import { ContextMenu } from './pageobjects/ide/ContextMenu';
+import { ContextMenu } from './pageobjects/ide/theia/ContextMenu';
 import { DriverHelper } from './utils/DriverHelper';
 import { Dashboard } from './pageobjects/dashboard/Dashboard';
 import { Workspaces } from './pageobjects/dashboard/Workspaces';
 import { WorkspaceDetails } from './pageobjects/dashboard/workspace-details/WorkspaceDetails';
 import { WorkspaceDetailsPlugins } from './pageobjects/dashboard/workspace-details/WorkspaceDetailsPlugins';
-import { Ide } from './pageobjects/ide/Ide';
-import { ProjectTree } from './pageobjects/ide/ProjectTree';
-import { OpenEditors } from './pageobjects/ide/OpenEditors';
-import { Editor } from './pageobjects/ide/Editor';
-import { TopMenu } from './pageobjects/ide/TopMenu';
-import { QuickOpenContainer } from './pageobjects/ide/QuickOpenContainer';
-import { PreviewWidget } from './pageobjects/ide/PreviewWidget';
-import { GitPlugin } from './pageobjects/ide/plugins/GitPlugin';
-import { RightToolBar } from './pageobjects/ide/RightToolBar';
-import { Terminal } from './pageobjects/ide/Terminal';
-import { DebugView } from './pageobjects/ide/DebugView';
-import { DialogWindow } from './pageobjects/ide/DialogWindow';
+import { Ide } from './pageobjects/ide/theia/Ide';
+import { ProjectTree } from './pageobjects/ide/theia/ProjectTree';
+import { OpenEditors } from './pageobjects/ide/theia/OpenEditors';
+import { Editor } from './pageobjects/ide/theia/Editor';
+import { TopMenu } from './pageobjects/ide/theia/TopMenu';
+import { QuickOpenContainer } from './pageobjects/ide/theia/QuickOpenContainer';
+import { PreviewWidget } from './pageobjects/ide/theia/PreviewWidget';
+import { GitPlugin } from './pageobjects/ide/theia/plugins/GitPlugin';
+import { RightToolBar } from './pageobjects/ide/theia/RightToolBar';
+import { Terminal } from './pageobjects/ide/theia/Terminal';
+import { DebugView } from './pageobjects/ide/theia/DebugView';
+import { DialogWindow } from './pageobjects/ide/theia/DialogWindow';
 import { ScreenCatcher } from './utils/ScreenCatcher';
 import { OcpLoginPage } from './pageobjects/openshift/OcpLoginPage';
-import { OpenWorkspaceWidget } from './pageobjects/ide/OpenWorkspaceWidget';
+import { OpenWorkspaceWidget } from './pageobjects/ide/theia/OpenWorkspaceWidget';
 import { CheLoginPage } from './pageobjects/openshift/CheLoginPage';
-import { NotificationCenter } from './pageobjects/ide/NotificationCenter';
-import { PreferencesHandler } from './utils/PreferencesHandler';
+import { NotificationCenter } from './pageobjects/ide/theia/NotificationCenter';
+import { PreferencesHandlerTheia } from './utils/theia/PreferencesHandlerTheia';
 import { IAuthorizationHeaderHandler } from './utils/requestHandlers/headers/IAuthorizationHeaderHandler';
 import { CheMultiuserAuthorizationHeaderHandler } from './utils/requestHandlers/headers/CheMultiuserAuthorizationHeaderHandler';
 import { CheMultiuserTokenHandler } from './utils/requestHandlers/tokens/CheMultiuserTokenHandler';
@@ -51,24 +51,24 @@ import { CheApiRequestHandler } from './utils/requestHandlers/CheApiRequestHandl
 import { CheGitApi } from './utils/VCS/CheGitApi';
 import { GitHubUtil } from './utils/VCS/github/GitHubUtil';
 import { CreateWorkspace } from './pageobjects/dashboard/CreateWorkspace';
-import { OpenshiftPlugin } from './pageobjects/ide/plugins/OpenshiftPlugin';
-import { OpenDialogWidget } from './pageobjects/ide/OpenDialogWidget';
+import { OpenshiftPlugin } from './pageobjects/ide/theia/plugins/OpenshiftPlugin';
+import { OpenDialogWidget } from './pageobjects/ide/theia/OpenDialogWidget';
 import { UpdateAccountInformationPage } from './pageobjects/login/UpdateAccountInformationPage';
-import { LeftToolBar } from './pageobjects/ide/LeftToolBar';
-import { KubernetesPlugin } from './pageobjects/ide/plugins/KubernetesPlugin';
+import { LeftToolBar } from './pageobjects/ide/theia/LeftToolBar';
+import { KubernetesPlugin } from './pageobjects/ide/theia/plugins/KubernetesPlugin';
 import { BrowserTabsUtil } from './utils/BrowserTabsUtil';
-import { PluginsView } from './pageobjects/ide/plugins/PluginsView';
-import { LanguageServerTests } from './testsLibrary/LanguageServerTests';
-import { CodeExecutionTests } from './testsLibrary/CodeExecutionTests';
-import { ProjectAndFileTests } from './testsLibrary/ProjectAndFileTests';
+import { PluginsView } from './pageobjects/ide/theia/plugins/PluginsView';
+import { LanguageServerTestsTheia } from './testsLibrary/theia/LanguageServerTestsTheia';
+import { CodeExecutionTestsTheia } from './testsLibrary/theia/CodeExecutionTestsTheia';
+import { ProjectAndFileTestsTheia } from './testsLibrary/theia/ProjectAndFileTestsTheia';
 import { WorkspaceHandlingTests } from './testsLibrary/WorkspaceHandlingTests';
-import { GitHubPullRequestPlugin } from './pageobjects/ide/plugins/GitHubPullRequestPlugin';
+import { GitHubPullRequestPlugin } from './pageobjects/ide/theia/plugins/GitHubPullRequestPlugin';
 import { GitLoginPage } from './pageobjects/third-parties/GitLoginPage';
 import { GitOauthAppsSettings } from './pageobjects/third-parties/GitOauthAppsSettings';
 import { AnimationChecker } from './utils/AnimationChecker';
 import { WorkspaceNameHandler } from './utils/WorkspaceNameHandler';
 import { Sanitizer } from './utils/Sanitizer';
-import { NavigationBar } from './pageobjects/ide/NavigationBar';
+import { NavigationBar } from './pageobjects/ide/theia/NavigationBar';
 import { ApiUrlResolver } from './utils/workspace/ApiUrlResolver';
 import { ITestWorkspaceUtil } from './utils/workspace/ITestWorkspaceUtil';
 
@@ -112,7 +112,7 @@ e2eContainer.bind<OcpLoginPage>(CLASSES.OcpLoginPage).to(OcpLoginPage);
 e2eContainer.bind<OpenWorkspaceWidget>(CLASSES.OpenWorkspaceWidget).to(OpenWorkspaceWidget);
 e2eContainer.bind<CheLoginPage>(CLASSES.CheLoginPage).to(CheLoginPage);
 e2eContainer.bind<NotificationCenter>(CLASSES.NotificationCenter).to(NotificationCenter);
-e2eContainer.bind<PreferencesHandler>(CLASSES.PreferencesHandler).to(PreferencesHandler);
+e2eContainer.bind<PreferencesHandlerTheia>(CLASSES.PreferencesHandlerTheia).to(PreferencesHandlerTheia);
 e2eContainer.bind<CheApiRequestHandler>(CLASSES.CheApiRequestHandler).to(CheApiRequestHandler);
 e2eContainer.bind<CheGitApi>(CLASSES.CheGitApi).to(CheGitApi);
 e2eContainer.bind<GitHubUtil>(CLASSES.GitHubUtil).to(GitHubUtil);
@@ -122,9 +122,9 @@ e2eContainer.bind<OpenDialogWidget>(CLASSES.OpenDialogWidget).to(OpenDialogWidge
 e2eContainer.bind<UpdateAccountInformationPage>(CLASSES.UpdateAccountInformationPage).to(UpdateAccountInformationPage);
 e2eContainer.bind<KubernetesPlugin>(CLASSES.KubernetesPlugin).to(KubernetesPlugin);
 e2eContainer.bind<PluginsView>(CLASSES.PluginsView).to(PluginsView);
-e2eContainer.bind<LanguageServerTests>(CLASSES.LanguageServerTests).to(LanguageServerTests);
-e2eContainer.bind<CodeExecutionTests>(CLASSES.CodeExecutionTests).to(CodeExecutionTests);
-e2eContainer.bind<ProjectAndFileTests>(CLASSES.ProjectAndFileTests).to(ProjectAndFileTests);
+e2eContainer.bind<LanguageServerTestsTheia>(CLASSES.LanguageServerTestsTheia).to(LanguageServerTestsTheia);
+e2eContainer.bind<CodeExecutionTestsTheia>(CLASSES.CodeExecutionTestsTheia).to(CodeExecutionTestsTheia);
+e2eContainer.bind<ProjectAndFileTestsTheia>(CLASSES.ProjectAndFileTestsTheia).to(ProjectAndFileTestsTheia);
 e2eContainer.bind<WorkspaceHandlingTests>(CLASSES.WorkspaceHandlingTests).to(WorkspaceHandlingTests);
 e2eContainer.bind<WorkspaceNameHandler>(CLASSES.WorkspaceNameHandler).to(WorkspaceNameHandler);
 e2eContainer.bind<GitHubPullRequestPlugin>(CLASSES.GitHubPullRequestPlugin).to(GitHubPullRequestPlugin);

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-3ddca79",
   "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",