@eclipse-che/che-e2e 7.74.0-dev-1d09cb7 → 7.74.0-dev-aace77a

package/.eslintignore

@@ -0,0 +1,10 @@
+build
+**report
+**results**
+dist
+node-modules
+load**
+resources
+**/*.html
+**/**/*.sh
+index.ts

package/.eslintrc.js

@@ -0,0 +1,197 @@
+/** *******************************************************************
+ * 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
+ **********************************************************************/
+module.exports = {
+	env: {
+		browser: true,
+		es6: true,
+		node: true
+	},
+	extends: ['plugin:@typescript-eslint/recommended-type-checked', 'prettier'],
+	parser: '@typescript-eslint/parser',
+	parserOptions: {
+		project: 'tsconfig.json',
+		sourceType: 'module'
+	},
+	plugins: ['eslint-plugin-jsdoc', '@typescript-eslint', '@typescript-eslint/tslint', 'header', 'prettier'],
+	root: true,
+	rules: {
+		'prettier/prettier': 'error',
+		'@typescript-eslint/dot-notation': 'error',
+		'@typescript-eslint/no-misused-promises': [
+			'error',
+			{
+				checksVoidReturn: {
+					arguments: false
+				}
+			}
+		],
+		'@typescript-eslint/member-ordering': [
+			'error',
+			{
+				default: [
+					'static-field',
+					'public-field',
+					'instance-field',
+					'protected-field',
+					'private-field',
+					'abstract-field',
+					'constructor',
+					'public-static-method',
+					'protected-static-method',
+					'private-static-method',
+					'public-method',
+					'protected-method',
+					'private-method'
+				]
+			}
+		],
+		'@typescript-eslint/explicit-function-return-type': [
+			'error',
+			{
+				allowExpressions: false,
+				allowTypedFunctionExpressions: false,
+				allowHigherOrderFunctions: false,
+				allowDirectConstAssertionInArrowFunctions: true,
+				allowConciseArrowFunctionExpressionsStartingWithVoid: true
+			}
+		],
+		'@typescript-eslint/explicit-module-boundary-types': [
+			'error',
+			{
+				allowArgumentsExplicitlyTypedAsAny: true,
+				allowDirectConstAssertionInArrowFunctions: true,
+				allowHigherOrderFunctions: false,
+				allowTypedFunctionExpressions: false
+			}
+		],
+		'@typescript-eslint/member-delimiter-style': 'error',
+		'@typescript-eslint/naming-convention': [
+			'error',
+			{
+				selector: 'variable',
+				format: ['camelCase', 'UPPER_CASE'],
+				leadingUnderscore: 'forbid',
+				trailingUnderscore: 'forbid'
+			}
+		],
+		'@typescript-eslint/no-empty-function': 'error',
+		'@typescript-eslint/no-parameter-properties': 'off',
+		'@typescript-eslint/no-explicit-any': 'off',
+		'@typescript-eslint/no-unsafe-member-access': 'off',
+		'@typescript-eslint/no-unsafe-argument': 'off',
+		'@typescript-eslint/no-unsafe-assignment': 'off',
+		'@typescript-eslint/no-unsafe-enum-comparison': 'off',
+		'@typescript-eslint/restrict-template-expressions': 'off',
+		'@typescript-eslint/no-unsafe-return': 'off',
+		'@typescript-eslint/no-unsafe-call': 'off',
+		'@typescript-eslint/restrict-plus-operands': 'off',
+		'@typescript-eslint/no-namespace': 'off',
+		'@typescript-eslint/no-unused-expressions': 'error',
+		'@typescript-eslint/no-unused-vars': 'error',
+		'@typescript-eslint/no-use-before-define': 'error',
+		'@typescript-eslint/no-var-requires': 'off',
+		'@typescript-eslint/quotes': ['error', 'single'],
+		'@typescript-eslint/type-annotation-spacing': 'error',
+		'@typescript-eslint/typedef': [
+			'error',
+			{
+				parameter: true,
+				propertyDeclaration: true,
+				variableDeclaration: true,
+				memberVariableDeclaration: true
+			}
+		],
+		'brace-style': ['error', '1tbs'],
+		'capitalized-comments': ['error', 'never'],
+		'comma-dangle': ['error', 'never'],
+		curly: 'error',
+		'dot-notation': 'off',
+		'eol-last': 'error',
+		eqeqeq: ['error', 'smart'],
+		'guard-for-in': 'error',
+		'id-denylist': 'off',
+		'id-match': 'off',
+		indent: 'off',
+		'jsdoc/check-alignment': 'error',
+		'jsdoc/check-indentation': 'error',
+		'max-len': [
+			'off',
+			{
+				code: 140
+			}
+		],
+		'no-bitwise': 'error',
+		'no-caller': 'error',
+		'no-console': [
+			'error',
+			{
+				allow: [
+					'log',
+					'warn',
+					'dir',
+					'timeLog',
+					'assert',
+					'clear',
+					'count',
+					'countReset',
+					'group',
+					'groupEnd',
+					'table',
+					'dirxml',
+					'error',
+					'groupCollapsed',
+					'Console',
+					'profile',
+					'profileEnd',
+					'timeStamp',
+					'context'
+				]
+			}
+		],
+		'header/header': [
+			'error',
+			'block',
+			[
+				'* *******************************************************************',
+				{ pattern: ' \\* copyright \\(c\\) [0-9-]{4,9} Red Hat, Inc\\.', template: '* 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',
+				' *********************************************************************'
+			]
+		],
+		'no-debugger': 'error',
+		'no-empty': 'error',
+		'no-empty-function': 'off',
+		'no-eval': 'error',
+		'no-fallthrough': 'error',
+		'no-new-wrappers': 'error',
+		'no-redeclare': 'error',
+		'no-trailing-spaces': 'error',
+		'no-underscore-dangle': 'off',
+		'no-unused-expressions': 'off',
+		'no-unused-labels': 'error',
+		'no-unused-vars': 'off',
+		'no-use-before-define': 'off',
+		quotes: 'off',
+		radix: 'error',
+		semi: 'off',
+		'spaced-comment': [
+			'error',
+			'always',
+			{
+				markers: ['/']
+			}
+		]
+	}
+};

package/.prettierignore

@@ -0,0 +1,10 @@
+build
+**report
+**results**
+dist
+node-modules
+load**
+resources
+**/*.html
+**/**/*.sh
+index.ts

package/.prettierrc.json

@@ -0,0 +1,10 @@
+{
+	"trailingComma": "none",
+	"tabWidth": 4,
+	"printWidth": 140,
+	"semi": true,
+	"singleQuote": true,
+	"useTabs": true,
+	"endOfLine": "lf",
+	"jsxSingleQuote": true
+}

package/CODE_STYLE.md

@@ -0,0 +1,144 @@
+# Coding Standards and Conventions
+
+### Introducing
+
+#### Why are coding standards important?
+
+Coding standards offer several advantages, including:
+
+1. Increase Code Quality: By adhering to coding standards, developers can create code that is more secure, efficient,
+   maintainable, and uniform. This, in turn, can result in fewer errors and improved overall performance.
+
+2. Improved Readability and Maintainability: Coding standards contribute to code that is more comprehensible and easier
+   to maintain. Consistently formatted code aids other developers in comprehending and modifying it, saving time and
+   reducing the likelihood of introducing errors.
+
+3. Accelerated Development: The adherence to coding standards can expedite the development process. When developers
+   adhere to a predefined set of guidelines, they can produce code more swiftly and with fewer mistakes. Additionally,
+   uniform code formatting facilitates the identification and resolution of issues.
+
+4. Better Scalability: Coding standards facilitate the creation of scalable code, simplifying the incorporation of new
+   features or updates. Consistent coding practices also streamline code maintenance as the codebase expands.
+
+5. Elevated Collaboration and Communication: Uniform guidelines encourage better understanding and manipulation of code
+   written by fellow developers. This fosters smoother teamwork and facilitates the sharing of code.
+
+6. Consistency Across Projects: The adoption of coding standards guarantees a consistent coding approach across various
+   projects. This simplifies the task of upholding code quality, transitioning between tasks, and fostering
+   collaborative work.
+
+### Automated tools
+
+Automated lint checking and code format performs with ESLint and Prettier tools before every commit using Husky
+pre-commit hook.
+Full set of rules can be found:
+
+-   [.eslintrc](.eslintrc.js)
+-   [.prettierrc](.prettierrc.json)
+
+### Preferable code style
+
+1. Page-object and util classes
+
+    1. ✔ Class declaration using dependency injection (inversify library)
+
+        ```
+          @injectable()
+          export class BrowserTabsUtil {
+              constructor(@inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) { }
+        ```
+
+    2. Public methods
+
+        - ✔ Declare public methods without "public "keyword
+        - ✔ Add Logger.debug() inside method to log its name (with optional message)
+
+        ```
+         async switchToWindow(windowHandle: string): Promise<void> {
+             Logger.debug(); // logs BrowserUtils.sswitchToWindow
+
+             await this.driverHelper.getDriver().switchTo().window(windowHandle);
+         }
+        ```
+
+    3. Locators
+
+        - ✔ For static locators - private static readonly fields type of By
+
+        ```
+        private static readonly FACTORY_URL_LOCATOR: By = By.xpath('//input[@id="git-repo-url"]');
+        ```
+
+        - ✔ For dynamic locators - private methods which returns By
+
+        ```
+        private getExpandedActionsLocator(workspaceName: string): By {
+            return By.xpath(`${this.getWorkspaceListItemLocator(workspaceName)}//button[@aria-label='Actions' and @aria-expanded='true']`);
+        }
+        ```
+
+        - ✗ Avoid to declare locators as constant in methods
+
+        ```
+        async waitTitleContains(expectedText: string, timeout: number = TimeoutConstants.TS_COMMON_DASHBOARD_WAIT_TIMEOUT): Promise<void> {
+             Logger.debug();
+
+             const pageTitleLocator: By = By.xpath(`//h1[contains(text(), '${expectedText}')]`);
+             await this.driverHelper.waitVisibility(pageTitleLocator, timeout);
+         }
+        ```
+
+        #### Page object sample:
+
+        ```
+        import { e2eContainer } from '../../configs/inversify.config';
+
+        @injectable()
+        export class OcpMainPage {
+
+            private static readonly MAIN_PAGE_HEADER_LOCATOR: By = By.id('page-main-header');
+            private static readonly SELECT_ROLE_BUTTON_LOCATOR: By = By.xpath('//*[@data-test-id="perspective-switcher-toggle"]');
+
+            constructor(
+                @inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) { }
+
+            async waitOpenMainPage(): Promise<void> {
+                Logger.debug();
+
+                await this.driverHelper.waitVisibility(OcpMainPage.MAIN_PAGE_HEADER_LOCATOR, TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
+            }
+
+            private getProjectDropdownItemLocator(projectName: string): By {
+                return By.xpath(`//button//*[text()="${projectName}"]`);
+            }
+        }
+
+        ```
+
+2. Mocha framework
+
+    - ✔ TDD framework (`suit()`, `test()`)
+    - ✔ Inject class instances, declare all test data inside test `suit()` function to avoid unnecessary code execution if test suit will not be run
+
+    ```
+    suite('name', function(): void {
+        const webCheCodeLocators: Locators = e2eContainer.get(CLASSES.CheCodeLocatorLoader);
+        // test specific data
+        const gitImportReference: string = 'pipeline';
+    ```
+
+    - ✗ Don`t use arrow functions in test declaration https://mochajs.org/#arrow-functions
+    - ✔ Specs which don`t use browser should have API in name ending (like EmptyWorkspaceAPI.spec)
+    - ✗ Don\`t create scripts in package.json for each test. Instead of it use [dynamic config](configs/mocharc.ts), `mocha --spec` or `mocha --grep` flags to run specific test.
+    - ✔ Use test [./constants](constants) to make test flexible
+
+3. Packages
+
+    1. Add packages as dev dependencies
+    2. If any changes re-create package-lock.json before push
+
+4. Comments
+    1. If some code commented or added as workaround mark it as `//todo` with number of issue to get possibility to find it quickly
+    ```
+    // todo commented due to issue crw-1010
+    ```

package/README.md

@@ -1,87 +1,87 @@
-
 # Module for launch E2E tests related to Che 7
 
 ## Requirements
 
-- node 16.x
-- "Chrome" browser 114.x or later
-- deployed Che 7 with accessible URL
+-   node 16.x
+-   "Chrome" browser 114.x or later
+-   deployed Che 7 with accessible URL
 
 ## Before launch
 
 **Perform commands:**
 
-- ```export TS_SELENIUM_BASE_URL=<Che7 URL>```
-- ```npm ci```
+-   `export TS_SELENIUM_BASE_URL=<Che7 URL>`
+-   `npm ci`
 
 Note: If there is any modifications in package.json, manually execute the `npm install` to update the package-lock.json. So that errors can be avoided while executing npm ci
 
 ## Default launch
 
-- Provide connection credentials:
-  - ```export TS_SELENIUM_OCP_USERNAME=<username>```
-  - ```export TS_SELENIUM_OCP_PASSWORD=<password>```
-  - ```npm run test```
+-   Provide connection credentials:
+    -   `export TS_SELENIUM_OCP_USERNAME=<username>`
+    -   `export TS_SELENIUM_OCP_PASSWORD=<password>`
+    -   `npm run test`
 
 ## Custom launch
 
-- Use environment variables which described in the "constants" folder
-- Use environment variables for setting timeouts if needed. You can see the list in **```'TimeoutConstants.ts'```**. You can see the list of those variables and their value if you set the ```'TS_SELENIUM_PRINT_TIMEOUT_VARIABLES = true'```
-- To test one specification export file name as ```export USERSTORY=<spec-file-name-without-extension> && npm run test``` (example: ```-e USERSTORY=Quarkus```)
-- To run test without Selenium WebDriver (API tests etc.) use ```export USERSTORY=<spec-file-name-without-extension> && npm run driver-less-test``` (example: ```-e USERSTORY=CloneGitRepoAPI```)
-- This project support application testing deployed on Kubernetes or Openshift platform. Openshift is default value. To switch into Kubernetes, please, use `TS_PLATFORM=kubernetes` environmental variable and `TS_SELENIUM_K8S_PASSWORD`, `TS_SELENIUM_K8S_USERNAME` to provide credentials. The sample of test command in this case:
-  ```
-  export TS_PLATFORM=kubernetes && \
-  export TS_SELENIUM_K8S_USERNAME=<username> && \
-  export TS_SELENIUM_K8S_PASSWORD=<password> && \
-  export TS_SELENIUM_BASE_URL=<ingress-url> && \
-  npm run test
-  ```
-  Also, environmental variables can be set in files in "constants" folder.
-  
+-   Use environment variables which described in the "constants" folder
+-   Use environment variables for setting timeouts if needed. You can see the list in **`'TimeoutConstants.ts'`**. You can see the list of those variables and their value if you set the `'TS_SELENIUM_PRINT_TIMEOUT_VARIABLES = true'`
+-   To test one specification export file name as `export USERSTORY=<spec-file-name-without-extension> && npm run test` (example: `-e USERSTORY=Quarkus`)
+-   To run test without Selenium WebDriver (API tests etc.) use `export USERSTORY=<spec-file-name-without-extension> && npm run driver-less-test` (example: `-e USERSTORY=CloneGitRepoAPI`)
+-   This project support application testing deployed on Kubernetes or Openshift platform. Openshift is default value. To switch into Kubernetes, please, use `TS_PLATFORM=kubernetes` environmental variable and `TS_SELENIUM_K8S_PASSWORD`, `TS_SELENIUM_K8S_USERNAME` to provide credentials. The sample of test command in this case:
+    ```
+    export TS_PLATFORM=kubernetes && \
+    export TS_SELENIUM_K8S_USERNAME=<username> && \
+    export TS_SELENIUM_K8S_PASSWORD=<password> && \
+    export TS_SELENIUM_BASE_URL=<ingress-url> && \
+    npm run test
+    ```
+    Also, environmental variables can be set in files in "constants" folder.
+
 ## Docker launch
 
-- open terminal and go to the "e2e" directory
-- export the ```"TS_SELENIUM_BASE_URL"``` variable with "Che" url
-- run command ```"npm run test-docker"```
+-   open terminal and go to the "e2e" directory
+-   export the `"TS_SELENIUM_BASE_URL"` variable with "Che" url
+-   run command `"npm run test-docker"`
 
 ## Docker launch with changed tests
 
 **For launching tests with local changes perform next steps:**
 
-- open terminal and go to the "e2e" directory
-- export the ```"TS_SELENIUM_BASE_URL"``` variable with "Che" url
-- run command ```"npm run test-docker-mount-e2e"```
+-   open terminal and go to the "e2e" directory
+-   export the `"TS_SELENIUM_BASE_URL"` variable with "Che" url
+-   run command `"npm run test-docker-mount-e2e"`
 
 ## Debug docker launch
 
-The ```'eclipse/che-e2e'``` docker image has VNC server installed inside. For connecting use ```'0.0.0.0:5920'``` address.
+The `'eclipse/che-e2e'` docker image has VNC server installed inside. For connecting use `'0.0.0.0:5920'` address.
 
 ## The "Happy Path" scenario launching
 
 **The easiest way to do that is to perform steps which are described in the "Docker launch" paragraph.
 For running tests without docker, please perform next steps:**
 
-- Deploy Che on Kubernetes infrastructure by using 'Minikube' and 'Chectl' <https://github.com/eclipse-che/che-server/blob/HEAD/deploy/kubernetes/README.md>
-- Create workspace by using 'Chectl' and devfile
-  - link to 'Chectl' manual <https://github.com/che-incubator/chectl#chectl-workspacestart>
-  - link to devfile ( **```For successfull test passing, exactly provided devfile should be used```** )
-    <https://gist.githubusercontent.com/Ohrimenko1988/93f5426f4ebc1705c55feb8ff0396a49/raw/cbea89ad145ba33ed34a151a12c50f045f9f3b78/yaml-ls-bug.yaml>
-- Provide the **```'TS_SELENIUM_BASE_URL'```** environment variable as described above
-- export TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME=EmptyWorkspace (default value, see BaseTestConstants.ts)
-- perform command **```export USERSTORY=$TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME && npm run test-all-devfiles```**
+-   Deploy Che on Kubernetes infrastructure by using 'Minikube' and 'Chectl' <https://github.com/eclipse-che/che-server/blob/HEAD/deploy/kubernetes/README.md>
+-   Create workspace by using 'Chectl' and devfile
+    -   link to 'Chectl' manual <https://github.com/che-incubator/chectl#chectl-workspacestart>
+    -   link to devfile ( **`For successfull test passing, exactly provided devfile should be used`** )
+        <https://gist.githubusercontent.com/Ohrimenko1988/93f5426f4ebc1705c55feb8ff0396a49/raw/cbea89ad145ba33ed34a151a12c50f045f9f3b78/yaml-ls-bug.yaml>
+-   Provide the **`'TS_SELENIUM_BASE_URL'`** environment variable as described above
+-   export TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME=EmptyWorkspace (default value, see BASE_TEST_CONSTANTS.ts)
+-   perform command **`export USERSTORY=$TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME && npm run test-all-devfiles`**
 
 ## Launching the DevWorkspaceHappyPath spec file using Che with oauth authentication
 
 **Setup next environment variables:**
 
-- export TS_SELENIUM_BASE_URL=\<Che-URL\>
-- export TS_SELENIUM_OCP_USERNAME=\<cluster-username\>
-- export TS_SELENIUM_OCP_PASSWORD=\<cluster-password\>
-- export TS_SELENIUM_VALUE_OPENSHIFT_OAUTH="true"
-- export TS_OCP_LOGIN_PAGE_PROVIDER_TITLE=\<login-provide-title\>
-- export TS_SELENIUM_DEVWORKSPACE_URL=\<devworkspace-url\>
-- export TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME=EmptyWorkspace (default value, see BaseTestConstants.ts)
+-   export TS_SELENIUM_BASE_URL=\<Che-URL\>
+-   export TS_SELENIUM_OCP_USERNAME=\<cluster-username\>
+-   export TS_SELENIUM_OCP_PASSWORD=\<cluster-password\>
+-   export TS_SELENIUM_VALUE_OPENSHIFT_OAUTH="true"
+-   export TS_OCP_LOGIN_PAGE_PROVIDER_TITLE=\<login-provide-title\>
+-   export TS_SELENIUM_DEVWORKSPACE_URL=\<devworkspace-url\>
+-   export TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME=EmptyWorkspace (default value, see BASE_TEST_CONSTANTS.ts)
 
 **Execute the npm command:**
-- perform command ```export USERSTORY=$TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME && npm run test-all-devfiles```
+
+-   perform command `export USERSTORY=$TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME && npm run test-all-devfiles`

package/configs/inversify.config.ts

@@ -1,5 +1,5 @@
-/*********************************************************************
- * Copyright (c) 2019-2023 Red Hat, Inc.
+/** *******************************************************************
+ * copyright (c) 2019-2023 Red Hat, Inc.
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -9,10 +9,10 @@
  **********************************************************************/
 
 import 'reflect-metadata';
-import { Container } from 'inversify';
+import { Container, decorate, injectable, unmanaged } from 'inversify';
 import { IDriver } from '../driver/IDriver';
 import { ChromeDriver } from '../driver/ChromeDriver';
-import { CLASSES, TYPES } from './inversify.types';
+import { CLASSES, EXTERNAL_CLASSES, TYPES } from './inversify.types';
 import { TestWorkspaceUtil } from '../utils/workspace/TestWorkspaceUtil';
 import { IOcpLoginPage } from '../pageobjects/login/interfaces/IOcpLoginPage';
 import { OcpUserLoginPage } from '../pageobjects/login/openshift/OcpUserLoginPage';
@@ -42,10 +42,23 @@ import { OcpApplicationPage } from '../pageobjects/openshift/OcpApplicationPage'
 import { StringUtil } from '../utils/StringUtil';
 import { KubernetesLoginPage } from '../pageobjects/login/kubernetes/KubernetesLoginPage';
 import { DexLoginPage } from '../pageobjects/login/kubernetes/DexLoginPage';
-import { OAuthConstants } from '../constants/OAuthConstants';
-import { BaseTestConstants, Platform } from '../constants/BaseTestConstants';
+import { OAUTH_CONSTANTS } from '../constants/OAUTH_CONSTANTS';
+import { BASE_TEST_CONSTANTS, Platform } from '../constants/BASE_TEST_CONSTANTS';
+import { CheCodeLocatorLoader } from '../pageobjects/ide/CheCodeLocatorLoader';
+import { LocatorLoader } from 'monaco-page-objects/out/locators/loader';
+import { OauthPage } from '../pageobjects/git-providers/OauthPage';
+import { DevfilesRegistryHelper } from '../utils/DevfilesRegistryHelper';
+import { Main as Generator } from '@eclipse-che/che-devworkspace-generator/lib/main';
+import { ContainerTerminal, KubernetesCommandLineToolsExecutor } from '../utils/KubernetesCommandLineToolsExecutor';
+import { ShellExecutor } from '../utils/ShellExecutor';
 
-const e2eContainer: Container = new Container({ defaultScope: 'Transient' });
+decorate(injectable(), Generator);
+decorate(injectable(), LocatorLoader);
+decorate(unmanaged(), LocatorLoader, 0);
+decorate(unmanaged(), LocatorLoader, 1);
+decorate(unmanaged(), LocatorLoader, 2);
+
+const e2eContainer: Container = new Container({ defaultScope: 'Transient', skipBaseClassChecks: true });
 
 e2eContainer.bind<IDriver>(TYPES.Driver).to(ChromeDriver).inSingletonScope();
 e2eContainer.bind<ITestWorkspaceUtil>(TYPES.WorkspaceUtil).to(TestWorkspaceUtil);
@@ -59,11 +72,12 @@ e2eContainer.bind<WorkspaceDetails>(CLASSES.WorkspaceDetails).to(WorkspaceDetail
 e2eContainer.bind<ScreenCatcher>(CLASSES.ScreenCatcher).to(ScreenCatcher);
 e2eContainer.bind<OcpLoginPage>(CLASSES.OcpLoginPage).to(OcpLoginPage);
 e2eContainer.bind<DexLoginPage>(CLASSES.DexLoginPage).to(DexLoginPage);
-
+e2eContainer.bind<CheCodeLocatorLoader>(CLASSES.CheCodeLocatorLoader).to(CheCodeLocatorLoader);
+e2eContainer.bind<LocatorLoader>(CLASSES.LocatorLoader).to(LocatorLoader);
+e2eContainer.bind<OauthPage>(CLASSES.OauthPage).to(OauthPage);
 e2eContainer.bind<OcpMainPage>(CLASSES.OcpMainPage).to(OcpMainPage);
 e2eContainer.bind<OcpImportFromGitPage>(CLASSES.OcpImportFromGitPage).to(OcpImportFromGitPage);
 e2eContainer.bind<OcpApplicationPage>(CLASSES.OcpApplicationPage).to(OcpApplicationPage);
-
 e2eContainer.bind<CheApiRequestHandler>(CLASSES.CheApiRequestHandler).to(CheApiRequestHandler);
 e2eContainer.bind<CreateWorkspace>(CLASSES.CreateWorkspace).to(CreateWorkspace);
 e2eContainer.bind<ProjectAndFileTests>(CLASSES.ProjectAndFileTests).to(ProjectAndFileTests);
@@ -72,11 +86,22 @@ e2eContainer.bind<StringUtil>(CLASSES.StringUtil).to(StringUtil);
 e2eContainer.bind<ApiUrlResolver>(CLASSES.ApiUrlResolver).to(ApiUrlResolver);
 e2eContainer.bind<WorkspaceHandlingTests>(CLASSES.WorkspaceHandlingTests).to(WorkspaceHandlingTests);
 e2eContainer.bind<RedHatLoginPage>(CLASSES.RedHatLoginPage).to(RedHatLoginPage);
+e2eContainer.bind<DevfilesRegistryHelper>(CLASSES.DevfilesRegistryHelper).to(DevfilesRegistryHelper);
+e2eContainer.bind<KubernetesCommandLineToolsExecutor>(CLASSES.KubernetesCommandLineToolsExecutor).to(KubernetesCommandLineToolsExecutor);
+e2eContainer.bind<ShellExecutor>(CLASSES.ShellExecutor).to(ShellExecutor);
+e2eContainer.bind<ContainerTerminal>(CLASSES.ContainerTerminal).to(ContainerTerminal);
+
+e2eContainer.bind<Generator>(EXTERNAL_CLASSES.Generator).to(Generator);
+e2eContainer.bind<LocatorLoader>(EXTERNAL_CLASSES.LocatorLoader).to(LocatorLoader);
 
-BaseTestConstants.TS_PLATFORM === Platform.OPENSHIFT ?
-  OAuthConstants.TS_SELENIUM_VALUE_OPENSHIFT_OAUTH ?
-    e2eContainer.bind<ICheLoginPage>(TYPES.CheLogin).to(RegularUserOcpCheLoginPage) :
-    e2eContainer.bind<ICheLoginPage>(TYPES.CheLogin).to(OcpRedHatLoginPage) :
-  e2eContainer.bind<ICheLoginPage>(TYPES.CheLogin).to(KubernetesLoginPage);
+if (BASE_TEST_CONSTANTS.TS_PLATFORM === Platform.OPENSHIFT) {
+	if (OAUTH_CONSTANTS.TS_SELENIUM_VALUE_OPENSHIFT_OAUTH) {
+		e2eContainer.bind<ICheLoginPage>(TYPES.CheLogin).to(RegularUserOcpCheLoginPage);
+	} else {
+		e2eContainer.bind<ICheLoginPage>(TYPES.CheLogin).to(OcpRedHatLoginPage);
+	}
+} else {
+	e2eContainer.bind<ICheLoginPage>(TYPES.CheLogin).to(KubernetesLoginPage);
+}
 
 export { e2eContainer };