@eclipse-che/che-e2e 7.70.0-dev-e748965 → 7.70.0-dev-6d2f86b

package/pageobjects/dashboard/Dashboard.ts

@@ -12,10 +12,11 @@ import 'reflect-metadata';
 import { CLASSES } from '../../configs/inversify.types';
 import { By } from 'selenium-webdriver';
 import { DriverHelper } from '../../utils/DriverHelper';
-import { TestConstants } from '../../constants/TestConstants';
 import { TimeoutConstants } from '../../constants/TimeoutConstants';
 import { Workspaces } from './Workspaces';
 import { Logger } from '../../utils/Logger';
+import { OAuthConstants } from '../../constants/OAuthConstants';
+import { BaseTestConstants } from '../../constants/BaseTestConstants';
 
 @injectable()
 export class Dashboard {
@@ -29,7 +30,7 @@ export class Dashboard {
     private static getUserDropdownMenuButtonLocator(): By {
         Logger.debug(`Dashboard.getUserDropdownMenuButtonLocator: get current user.`);
 
-        const currentUser: string = TestConstants.TS_SELENIUM_OCP_USERNAME;
+        const currentUser: string = OAuthConstants.TS_SELENIUM_OCP_USERNAME;
         Logger.debug(`Dashboard.getUserDropdownMenuButtonLocator: ${currentUser}.`);
 
         return By.xpath(`//*[text()="${currentUser}"]//parent::button`);
@@ -60,7 +61,7 @@ export class Dashboard {
         await this.workspaces.waitWorkspaceListItem(workspaceName);
         await this.workspaces.deleteWorkspaceByActionsButton(workspaceName);
         await this.workspaces.waitPage();
-        await this.workspaces.waitWorkspaceListItemAbcence(workspaceName);
+        await this.workspaces.waitWorkspaceListItemAbsence(workspaceName);
     }
 
     async stopAndRemoveWorkspaceByUI(workspaceName: string): Promise<void> {
@@ -68,12 +69,12 @@ export class Dashboard {
 
         await this.stopWorkspaceByUI(workspaceName);
         await this.workspaces.deleteWorkspaceByActionsButton(workspaceName);
-        await this.workspaces.waitWorkspaceListItemAbcence(workspaceName);
+        await this.workspaces.waitWorkspaceListItemAbsence(workspaceName);
     }
 
     async openDashboard(): Promise<void> {
         Logger.debug('Dashboard.openDashboard');
-        await this.driverHelper.getDriver().navigate().to(TestConstants.TS_SELENIUM_BASE_URL);
+        await this.driverHelper.getDriver().navigate().to(BaseTestConstants.TS_SELENIUM_BASE_URL);
         await this.waitPage();
 
     }
@@ -125,7 +126,7 @@ export class Dashboard {
         Logger.debug(`Dashboard.waitStartingPageLoaderDisappearance`);
 
         await this.driverHelper.waitDisappearance(By.css(Dashboard.STARTING_PAGE_LOADER_CSS), timeout);
-        await this.driverHelper.wait(TestConstants.TS_SELENIUM_DEFAULT_POLLING);
+        await this.driverHelper.wait(TimeoutConstants.TS_SELENIUM_DEFAULT_POLLING);
     }
 
     async getRecentWorkspaceName(timeout: number = TimeoutConstants.TS_COMMON_DASHBOARD_WAIT_TIMEOUT): Promise<string> {

package/pageobjects/dashboard/Workspaces.ts

@@ -14,7 +14,6 @@ import { CLASSES } from '../../configs/inversify.types';
 import { By, WebElement } from 'selenium-webdriver';
 import { Logger } from '../../utils/Logger';
 import { TimeoutConstants } from '../../constants/TimeoutConstants';
-import { TestConstants } from '../../constants/TestConstants';
 
 export enum WorkspaceStatusUI {
     Running = 'green',
@@ -160,10 +159,10 @@ export class Workspaces {
         await this.clickActionsStopWorkspaceButton(workspaceName);
     }
 
-    async waitWorkspaceListItemAbcence(workspaceName: string, timeout: number = TimeoutConstants.TS_COMMON_DASHBOARD_WAIT_TIMEOUT): Promise<void> {
-        Logger.debug(`Workspaces.waitWorkspaceListItemAbcence "${workspaceName}"`);
+    async waitWorkspaceListItemAbsence(workspaceName: string, timeout: number = TimeoutConstants.TS_DASHBOARD_WORKSPACE_STOP_TIMEOUT): Promise<void> {
+        Logger.debug(`Workspaces.waitWorkspaceListItemAbsence "${workspaceName}"`);
 
-        const polling: number = TestConstants.TS_SELENIUM_DEFAULT_POLLING;
+        const polling: number = TimeoutConstants.TS_SELENIUM_DEFAULT_POLLING;
         const attempts: number = Math.ceil(timeout / polling);
 
         const workspaceListItemLocator: By = By.xpath(this.getWorkspaceListItemLocator(workspaceName));

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

@@ -11,7 +11,6 @@ import { DriverHelper } from '../../../utils/DriverHelper';
 import { injectable, inject } from 'inversify';
 import { CLASSES, TYPES } from '../../../configs/inversify.types';
 import 'reflect-metadata';
-import { TestConstants } from '../../../constants/TestConstants';
 import { By } from 'selenium-webdriver';
 import { WorkspaceStatus } from '../../../utils/workspace/WorkspaceStatus';
 import { Logger } from '../../../utils/Logger';
@@ -31,7 +30,7 @@ export class WorkspaceDetails {
                 @inject(TYPES.WorkspaceUtil) private readonly testWorkspaceUtil: ITestWorkspaceUtil,
                 @inject(CLASSES.ProjectAndFileTests) private readonly testProjectAndFileCheCode: ProjectAndFileTests) { }
 
-    async waitLoaderDisappearance(attempts: number = TestConstants.TS_SELENIUM_DEFAULT_ATTEMPTS, polling: number = TestConstants.TS_SELENIUM_DEFAULT_POLLING): Promise<void> {
+    async waitLoaderDisappearance(attempts: number = TimeoutConstants.TS_SELENIUM_DEFAULT_ATTEMPTS, polling: number = TimeoutConstants.TS_SELENIUM_DEFAULT_POLLING): Promise<void> {
         Logger.debug('WorkspaceDetails.waitLoaderDisappearance');
 
         await this.driverHelper.waitDisappearance(By.css(WorkspaceDetails.WORKSPACE_DETAILS_LOADER_CSS), attempts, polling);
@@ -125,7 +124,7 @@ export class WorkspaceDetails {
         await this.driverHelper.waitVisibility(By.css(WorkspaceDetails.ENABLED_SAVE_BUTTON_CSS), timeout);
     }
 
-    private async waitSaveButtonDisappearance(attempts: number = TestConstants.TS_SELENIUM_DEFAULT_ATTEMPTS, polling: number = TestConstants.TS_SELENIUM_DEFAULT_POLLING): Promise<void> {
+    private async waitSaveButtonDisappearance(attempts: number = TimeoutConstants.TS_SELENIUM_DEFAULT_ATTEMPTS, polling: number = TimeoutConstants.TS_SELENIUM_DEFAULT_POLLING): Promise<void> {
         await this.driverHelper.waitDisappearance(By.css(WorkspaceDetails.SAVE_BUTTON_CSS), attempts, polling);
     }
 

package/pageobjects/git-providers/OauthPage.ts

@@ -11,9 +11,10 @@ import { inject, injectable } from 'inversify';
 import { By } from 'selenium-webdriver';
 import { CLASSES } from '../../configs/inversify.types';
 import { DriverHelper } from '../../utils/DriverHelper';
-import { GitProviderType, TestConstants } from '../../constants/TestConstants';
 import { Logger } from '../../utils/Logger';
 import { TimeoutConstants } from '../../constants/TimeoutConstants';
+import { FactoryTestConstants, GitProviderType } from '../../constants/FactoryTestConstants';
+import { OAuthConstants } from '../../constants/OAuthConstants';
 
 @injectable()
 export class OauthPage {
@@ -24,7 +25,7 @@ export class OauthPage {
     private readonly denyAccessButton: By;
 
     constructor(@inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) {
-        switch (TestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER) {
+        switch (FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER) {
             case GitProviderType.BITBUCKET : {
                 this.loginForm = By.id('j_username');
                 this.passwordForm = By.id('j_password');
@@ -34,9 +35,9 @@ export class OauthPage {
             }
                 break;
             case GitProviderType.GITLAB: {
-                this.loginForm = TestConstants.TS_SELENIUM_GIT_PROVIDER_IS_LDAP_LOGIN ? By.id('username') : By.id('user_login');
-                this.passwordForm = TestConstants.TS_SELENIUM_GIT_PROVIDER_IS_LDAP_LOGIN ? By.id('password') : By.id('user_password');
-                this.submitButton = TestConstants.TS_SELENIUM_GIT_PROVIDER_IS_LDAP_LOGIN ? By.xpath('//input[@data-qa-selector="sign_in_button"]') : By.xpath('//button[@data-qa-selector="sign_in_button"]');
+                this.loginForm = By.id('user_login');
+                this.passwordForm = By.id('user_password');
+                this.submitButton = By.xpath('//button[@data-qa-selector="sign_in_button"]');
                 this.approveButton = By.xpath('//*[@value="Authorize"]');
                 this.denyAccessButton = By.xpath('//input[@value="Deny"]');
             }
@@ -58,15 +59,6 @@ export class OauthPage {
     async waitLoginPage(): Promise<void> {
         Logger.debug('OauthPage.waitLoginPage');
 
-        // for gitlab server https://gitlab.cee.redhat.com
-        if (!TestConstants.TS_SELENIUM_GIT_PROVIDER_IS_LDAP_LOGIN &&
-            TestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER === GitProviderType.GITLAB) {
-            {
-                Logger.debug(`OauthPage.login - go to ${TestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER} Standard login section`);
-                await this.driverHelper.waitAndClick(By.xpath('//a[@data-qa-selector="standard_tab"]'));
-            }
-        }
-
         await this.driverHelper.waitVisibility(this.loginForm, TimeoutConstants.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM * 3);
     }
 
@@ -122,8 +114,8 @@ export class OauthPage {
         Logger.debug('OauthPage.login');
 
         await this.waitLoginPage();
-        await this.enterUserName(TestConstants.TS_SELENIUM_GIT_PROVIDER_USERNAME);
-        await this.enterPassword(TestConstants.TS_SELENIUM_GIT_PROVIDER_PASSWORD);
+        await this.enterUserName(OAuthConstants.TS_SELENIUM_GIT_PROVIDER_USERNAME);
+        await this.enterPassword(OAuthConstants.TS_SELENIUM_GIT_PROVIDER_PASSWORD);
         await this.clickOnLoginButton();
         await this.waitClosingLoginPage();
     }

package/pageobjects/ide/CheCodeLocatorLoader.ts

@@ -12,7 +12,7 @@ import { getLocatorsPath } from 'vscode-extension-tester-locators';
 import { LocatorDiff, Locators } from 'monaco-page-objects';
 import { By } from 'selenium-webdriver';
 import clone from 'clone-deep';
-import { TestConstants } from '../../constants/TestConstants';
+import { MonacoConstants } from '../../constants/MonacoConstants';
 
 /**
  * This class allows us to change or add some specific locators base on "monaco-page-object" and "vscode-extension-tester-locators".
@@ -24,7 +24,7 @@ export class CheCodeLocatorLoader extends LocatorLoader {
     readonly webCheCodeLocators: Locators;
 
     constructor() {
-        super(TestConstants.TS_SELENIUM_MONACO_PAGE_OBJECTS_BASE_VERSION, TestConstants.TS_SELENIUM_MONACO_PAGE_OBJECTS_BASE_VERSION, getLocatorsPath());
+        super(MonacoConstants.TS_SELENIUM_MONACO_PAGE_OBJECTS_BASE_VERSION, MonacoConstants.TS_SELENIUM_MONACO_PAGE_OBJECTS_BASE_VERSION, getLocatorsPath());
         this.webCheCodeLocators = this.mergeLocators() as Locators;
     }
 

package/pageobjects/login/kubernetes/DexLoginPage.ts

@@ -0,0 +1,58 @@
+/*********************************************************************
+ * 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
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ **********************************************************************/
+import 'reflect-metadata';
+import { injectable, inject } from 'inversify';
+import { CLASSES } from '../../../configs/inversify.types';
+import { Logger } from '../../../utils/Logger';
+import { By } from 'selenium-webdriver';
+import { TimeoutConstants } from '../../../constants/TimeoutConstants';
+import { DriverHelper } from '../../../utils/DriverHelper';
+
+@injectable()
+export class DexLoginPage {
+
+    private static readonly dexPageContentContainer: By = By.className('dex-container');
+    private static readonly loginInput: By = By.id('login');
+    private static readonly passwordInput: By = By.id('password');
+    private static readonly submitButton: By = By.id('submit-login');
+
+    constructor(
+        @inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) { }
+
+    async waitDexLoginPage(): Promise<void> {
+        Logger.debug(`${this.constructor.name}.${this.waitDexLoginPage.name}`);
+
+        await this.driverHelper.waitVisibility(DexLoginPage.dexPageContentContainer, TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
+    }
+
+    async clickOnLoginButton(): Promise<void> {
+        Logger.debug(`${this.constructor.name}.${this.clickOnLoginButton.name}`);
+
+        await this.driverHelper.waitAndClick(DexLoginPage.submitButton);
+    }
+
+    async enterUserNameKubernetes(userName: string): Promise<void> {
+        Logger.debug(`${this.constructor.name}.${this.enterUserNameKubernetes.name}`);
+
+        await this.driverHelper.enterValue(DexLoginPage.loginInput, userName);
+    }
+
+    async enterPasswordKubernetes(password: string): Promise<void> {
+        Logger.debug(`${this.constructor.name}.${this.enterPasswordKubernetes.name}`);
+
+        await this.driverHelper.enterValue(DexLoginPage.passwordInput, password);
+    }
+
+    async waitDexLoginPageDisappearance(): Promise<void> {
+        Logger.debug(`${this.constructor.name}.${this.waitDexLoginPageDisappearance.name}`);
+
+        await this.driverHelper.waitDisappearance(DexLoginPage.dexPageContentContainer, TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
+    }
+}

package/pageobjects/login/kubernetes/KubernetesLoginPage.ts

@@ -0,0 +1,33 @@
+/*********************************************************************
+ * 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
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ **********************************************************************/
+import 'reflect-metadata';
+import { injectable, inject } from 'inversify';
+import { CLASSES } from '../../../configs/inversify.types';
+import { Logger } from '../../../utils/Logger';
+import { ICheLoginPage } from '../interfaces/ICheLoginPage';
+import { DexLoginPage } from './DexLoginPage';
+import { OAuthConstants } from '../../../constants/OAuthConstants';
+
+@injectable()
+export class KubernetesLoginPage implements ICheLoginPage {
+
+    constructor(
+        @inject(CLASSES.DexLoginPage) private readonly dexLoginPage: DexLoginPage) { }
+
+    async login(): Promise<void> {
+        Logger.debug(`${this.constructor.name}.${this.login.name}`);
+
+        await this.dexLoginPage.waitDexLoginPage();
+        await this.dexLoginPage.enterUserNameKubernetes(OAuthConstants.TS_SELENIUM_K8S_USERNAME);
+        await this.dexLoginPage.enterPasswordKubernetes(OAuthConstants.TS_SELENIUM_K8S_PASSWORD);
+        await this.dexLoginPage.clickOnLoginButton();
+        await this.dexLoginPage.waitDexLoginPageDisappearance();
+    }
+}

package/pageobjects/{openshift → login/openshift}/OcpLoginPage.ts

@@ -9,12 +9,12 @@
  **********************************************************************/
 import 'reflect-metadata';
 import { injectable, inject } from 'inversify';
-import { DriverHelper } from '../../utils/DriverHelper';
-import { CLASSES } from '../../configs/inversify.types';
+import { DriverHelper } from '../../../utils/DriverHelper';
+import { CLASSES } from '../../../configs/inversify.types';
 import { By } from 'selenium-webdriver';
-import { Logger } from '../../utils/Logger';
-import { TestConstants } from '../../constants/TestConstants';
-import { TimeoutConstants } from '../../constants/TimeoutConstants';
+import { Logger } from '../../../utils/Logger';
+import { TimeoutConstants } from '../../../constants/TimeoutConstants';
+import { OAuthConstants } from '../../../constants/OAuthConstants';
 
 @injectable()
 export class OcpLoginPage {
@@ -33,14 +33,14 @@ export class OcpLoginPage {
     async clickOnLoginProviderTitle(): Promise<void> {
         Logger.debug('OcpLoginPage.clickOnLoginProviderTitle');
 
-        const loginProviderTitleLocator: By = By.xpath(`//a[text()=\'${TestConstants.TS_OCP_LOGIN_PAGE_PROVIDER_TITLE}\']`);
+        const loginProviderTitleLocator: By = By.xpath(`//a[text()=\'${OAuthConstants.TS_OCP_LOGIN_PAGE_PROVIDER_TITLE}\']`);
         await this.driverHelper.waitAndClick(loginProviderTitleLocator, TimeoutConstants.TS_SELENIUM_WAIT_FOR_URL);
     }
 
     async isIdentityProviderLinkVisible(): Promise<boolean> {
         Logger.debug('OcpLoginPage.isIdentityProviderLinkVisible');
 
-        const loginWithHtpaswdLocator: By = By.xpath(`//a[text()=\'${TestConstants.TS_OCP_LOGIN_PAGE_PROVIDER_TITLE}\']`);
+        const loginWithHtpaswdLocator: By = By.xpath(`//a[text()=\'${OAuthConstants.TS_OCP_LOGIN_PAGE_PROVIDER_TITLE}\']`);
         return await this.driverHelper.waitVisibilityBoolean(loginWithHtpaswdLocator, 3, 5000);
     }
 

package/pageobjects/login/{OcpRedHatLoginPage.ts → openshift/OcpRedHatLoginPage.ts}

@@ -10,13 +10,13 @@
 import 'reflect-metadata';
 import { injectable, inject } from 'inversify';
 import { RedHatLoginPage } from './RedHatLoginPage';
-import { CLASSES } from '../../configs/inversify.types';
+import { CLASSES } from '../../../configs/inversify.types';
 import { By } from 'selenium-webdriver';
-import { TimeoutConstants } from '../../constants/TimeoutConstants';
-import { ICheLoginPage } from './ICheLoginPage';
-import { OcpLoginPage } from '../openshift/OcpLoginPage';
-import { DriverHelper } from '../../utils/DriverHelper';
-import { Logger } from '../../utils/Logger';
+import { TimeoutConstants } from '../../../constants/TimeoutConstants';
+import { ICheLoginPage } from '../interfaces/ICheLoginPage';
+import { OcpLoginPage } from './OcpLoginPage';
+import { DriverHelper } from '../../../utils/DriverHelper';
+import { Logger } from '../../../utils/Logger';
 
 @injectable()
 export class OcpRedHatLoginPage implements ICheLoginPage {

package/pageobjects/login/{OcpUserLoginPage.ts → openshift/OcpUserLoginPage.ts}

@@ -8,12 +8,12 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 import 'reflect-metadata';
-import { IOcpLoginPage } from './IOcpLoginPage';
+import { IOcpLoginPage } from '../interfaces/IOcpLoginPage';
 import { injectable, inject } from 'inversify';
-import { OcpLoginPage } from '../openshift/OcpLoginPage';
-import { CLASSES } from '../../configs/inversify.types';
-import { TestConstants } from '../../constants/TestConstants';
-import { Logger } from '../../utils/Logger';
+import { OcpLoginPage } from './OcpLoginPage';
+import { CLASSES } from '../../../configs/inversify.types';
+import { Logger } from '../../../utils/Logger';
+import { OAuthConstants } from '../../../constants/OAuthConstants';
 
 @injectable()
 export class OcpUserLoginPage implements IOcpLoginPage {
@@ -24,13 +24,13 @@ export class OcpUserLoginPage implements IOcpLoginPage {
     async login(): Promise<void> {
         Logger.debug('OcpUserLoginPage.login');
 
-        if (TestConstants.TS_OCP_LOGIN_PAGE_PROVIDER_TITLE !== '') {
+        if (OAuthConstants.TS_OCP_LOGIN_PAGE_PROVIDER_TITLE !== '') {
             await this.ocpLogin.clickOnLoginProviderTitle();
         }
 
         await this.ocpLogin.waitOpenShiftLoginWelcomePage();
-        await this.ocpLogin.enterUserNameOpenShift(TestConstants.TS_SELENIUM_OCP_USERNAME);
-        await this.ocpLogin.enterPasswordOpenShift(TestConstants.TS_SELENIUM_OCP_PASSWORD);
+        await this.ocpLogin.enterUserNameOpenShift(OAuthConstants.TS_SELENIUM_OCP_USERNAME);
+        await this.ocpLogin.enterPasswordOpenShift(OAuthConstants.TS_SELENIUM_OCP_PASSWORD);
         await this.ocpLogin.clickOnLoginButton();
         await this.ocpLogin.waitDisappearanceOpenShiftLoginWelcomePage();
     }

package/pageobjects/login/{RedHatLoginPage.ts → openshift/RedHatLoginPage.ts}

@@ -10,10 +10,10 @@
 import 'reflect-metadata';
 import { injectable, inject } from 'inversify';
 import { By } from 'selenium-webdriver';
-import { CLASSES } from '../../configs/inversify.types';
-import { DriverHelper } from '../../utils/DriverHelper';
-import { Logger } from '../../utils/Logger';
-import { TestConstants } from '../../constants/TestConstants';
+import { CLASSES } from '../../../configs/inversify.types';
+import { DriverHelper } from '../../../utils/DriverHelper';
+import { Logger } from '../../../utils/Logger';
+import { OAuthConstants } from '../../../constants/OAuthConstants';
 
 @injectable()
 export class RedHatLoginPage {
@@ -34,7 +34,7 @@ export class RedHatLoginPage {
         Logger.debug('RedHatLoginPage.enterPasswordRedHat');
         const passwordFieldLocator: By = By.id(this.PASSWORD_INPUT_ID);
         await this.driverHelper.waitVisibility(passwordFieldLocator, 3000);
-        await this.driverHelper.enterValue(passwordFieldLocator, TestConstants.TS_SELENIUM_OCP_PASSWORD);
+        await this.driverHelper.enterValue(passwordFieldLocator, OAuthConstants.TS_SELENIUM_OCP_PASSWORD);
     }
     async clickOnLoginButton(): Promise<void> {
         Logger.debug('RedHatLoginPage.clickOnLoginButton');
@@ -49,7 +49,7 @@ export class RedHatLoginPage {
         Logger.debug('RedHatLoginPage.enterUserNameRedHat');
         const usernameFieldLocator: By = By.id(this.USERNAME_INPUT_ID);
         await this.driverHelper.waitVisibility(usernameFieldLocator, 20000);
-        await this.driverHelper.enterValue(usernameFieldLocator, TestConstants.TS_SELENIUM_OCP_USERNAME);
+        await this.driverHelper.enterValue(usernameFieldLocator, OAuthConstants.TS_SELENIUM_OCP_USERNAME);
     }
 
     async clickNextButton(): Promise<void> {

package/pageobjects/login/{RegularUserOcpCheLoginPage.ts → openshift/RegularUserOcpCheLoginPage.ts}

@@ -8,15 +8,15 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 import 'reflect-metadata';
-import { ICheLoginPage } from './ICheLoginPage';
-import { OcpLoginPage } from '../openshift/OcpLoginPage';
+import { ICheLoginPage } from '../interfaces/ICheLoginPage';
+import { OcpLoginPage } from './OcpLoginPage';
 import { injectable, inject } from 'inversify';
-import { CLASSES } from '../../configs/inversify.types';
-import { TestConstants } from '../../constants/TestConstants';
-import { Logger } from '../../utils/Logger';
-import { TimeoutConstants } from '../../constants/TimeoutConstants';
+import { CLASSES } from '../../../configs/inversify.types';
+import { Logger } from '../../../utils/Logger';
+import { TimeoutConstants } from '../../../constants/TimeoutConstants';
 import { By } from 'selenium-webdriver';
-import { DriverHelper } from '../../utils/DriverHelper';
+import { DriverHelper } from '../../../utils/DriverHelper';
+import { OAuthConstants } from '../../../constants/OAuthConstants';
 
 @injectable()
 export class RegularUserOcpCheLoginPage implements ICheLoginPage {
@@ -40,8 +40,8 @@ export class RegularUserOcpCheLoginPage implements ICheLoginPage {
         }
 
         await this.ocpLogin.waitOpenShiftLoginWelcomePage();
-        await this.ocpLogin.enterUserNameOpenShift(TestConstants.TS_SELENIUM_OCP_USERNAME);
-        await this.ocpLogin.enterPasswordOpenShift(TestConstants.TS_SELENIUM_OCP_PASSWORD);
+        await this.ocpLogin.enterUserNameOpenShift(OAuthConstants.TS_SELENIUM_OCP_USERNAME);
+        await this.ocpLogin.enterPasswordOpenShift(OAuthConstants.TS_SELENIUM_OCP_PASSWORD);
         await this.ocpLogin.clickOnLoginButton();
         await this.ocpLogin.waitDisappearanceOpenShiftLoginWelcomePage();
 

package/specs/MochaHooks.ts

@@ -10,7 +10,6 @@
 
 import 'reflect-metadata';
 import { CLASSES, TYPES } from '../configs/inversify.types';
-import { TestConstants } from '../constants/TestConstants';
 import { CheApiRequestHandler } from '../utils/request-handlers/CheApiRequestHandler';
 import { TimeoutConstants } from '../constants/TimeoutConstants';
 import * as monacoPageObjects from 'monaco-page-objects';
@@ -19,6 +18,9 @@ import { e2eContainer } from '../configs/inversify.config';
 import { DriverHelper } from '../utils/DriverHelper';
 import { ITestWorkspaceUtil } from '../utils/workspace/ITestWorkspaceUtil';
 import { Logger } from '../utils/Logger';
+import { BaseTestConstants } from '../constants/BaseTestConstants';
+import { ChromeDriverConstants } from '../constants/ChromeDriverConstants';
+import { MonacoConstants } from '../constants/MonacoConstants';
 
 const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
 const testWorkspaceUtil: ITestWorkspaceUtil = e2eContainer.get(TYPES.WorkspaceUtil);
@@ -33,21 +35,21 @@ export function registerRunningWorkspace(workspaceName: string): void {
 exports.mochaHooks = {
     beforeAll: [
         async function enableRequestInterceptor(): Promise<void> {
-            if (TestConstants.TS_SELENIUM_REQUEST_INTERCEPTOR) {
+            if (BaseTestConstants.TS_SELENIUM_REQUEST_INTERCEPTOR) {
                 CheApiRequestHandler.enableRequestInterceptor();
             }
         },
         async function enableResponseInterceptor(): Promise<void> {
-            if (TestConstants.TS_SELENIUM_RESPONSE_INTERCEPTOR) {
+            if (BaseTestConstants.TS_SELENIUM_RESPONSE_INTERCEPTOR) {
                 CheApiRequestHandler.enableResponseInterceptor();
             }
         },
         async function initMonacoPageObjects(): Promise<void> {
             // init vscode-extension-tester monaco-page-objects
-            monacoPageObjects.initPageObjects(TestConstants.TS_SELENIUM_MONACO_PAGE_OBJECTS_USE_VERSION, TestConstants.TS_SELENIUM_MONACO_PAGE_OBJECTS_BASE_VERSION, vscodeExtensionTesterLocators.getLocatorsPath(), driverHelper.getDriver(), 'google-chrome');
+            monacoPageObjects.initPageObjects(MonacoConstants.TS_SELENIUM_MONACO_PAGE_OBJECTS_USE_VERSION, MonacoConstants.TS_SELENIUM_MONACO_PAGE_OBJECTS_BASE_VERSION, vscodeExtensionTesterLocators.getLocatorsPath(), driverHelper.getDriver(), 'google-chrome');
         },
         async function prolongTimeoutConstantsInDebugMode(): Promise<void> {
-            if (TestConstants.TS_DEBUG_MODE) {
+            if (BaseTestConstants.TS_DEBUG_MODE) {
                 for (let [timeout, seconds] of Object.entries(TimeoutConstants)) {
                     Object.defineProperty(TimeoutConstants, timeout, {value: seconds as number * 100});
                 }
@@ -57,13 +59,13 @@ exports.mochaHooks = {
     afterAll: [
         // stop and remove running workspace
         async () => {
-            if (TestConstants.DELETE_WORKSPACE_ON_FAILED_TEST) {
+            if (BaseTestConstants.DELETE_WORKSPACE_ON_FAILED_TEST) {
                 Logger.info('Property DELETE_WORKSPACE_ON_FAILED_TEST is true - trying to stop and delete running workspace with API.');
                 testWorkspaceUtil.stopAndDeleteWorkspaceByName(latestWorkspace);
             }
         },
         async function stopTheDriver(): Promise<void> {
-            if (!TestConstants.TS_DEBUG_MODE && TestConstants.TS_USE_WEB_DRIVER_FOR_TEST) {
+            if (!BaseTestConstants.TS_DEBUG_MODE && ChromeDriverConstants.TS_USE_WEB_DRIVER_FOR_TEST) {
                 await driverHelper.getDriver().quit();
                 Logger.info('Chrome driver session stopped.');
             }

package/specs/SmokeTest.spec.ts

@@ -15,10 +15,10 @@ import { WorkspaceHandlingTests } from '../tests-library/WorkspaceHandlingTests'
 import { registerRunningWorkspace } from './MochaHooks';
 import { Logger } from '../utils/Logger';
 import { LoginTests } from '../tests-library/LoginTests';
-import { TestConstants } from '../constants/TestConstants';
 import { StringUtil } from '../utils/StringUtil';
+import { FactoryTestConstants } from '../constants/FactoryTestConstants';
 
-const factoryUrl: string = TestConstants.TS_SELENIUM_FACTORY_GIT_REPO_URL || 'https://github.com/che-incubator/quarkus-api-example.git';
+const factoryUrl: string = FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_REPO_URL || 'https://github.com/che-incubator/quarkus-api-example.git';
 const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);

package/specs/api/EmptyWorkspaceAPI.spec.ts

@@ -2,13 +2,14 @@ import { KubernetesCommandLineToolsExecutor } from '../../utils/KubernetesComman
 import { expect } from 'chai';
 import { ShellString } from 'shelljs';
 import { StringUtil } from '../../utils/StringUtil';
-import { TestConstants } from '../../constants/TestConstants';
 import { DevWorkspaceConfigurationHelper } from '../../utils/DevWorkspaceConfigurationHelper';
 import { DevfileContext } from '@eclipse-che/che-devworkspace-generator/lib/api/devfile-context';
+import { APITestConstants } from '../../constants/APITestConstants';
+import { BaseTestConstants } from '../../constants/BaseTestConstants';
 
 suite(`Empty workspace API test`, async function (): Promise<void> {
     // works only for root user
-    const namespace: string = TestConstants.TS_API_TEST_NAMESPACE;
+    const namespace: string = APITestConstants.TS_API_TEST_NAMESPACE;
     let clonedProjectName: string;
     let containerWorkDir: string;
     let devWorkspaceConfigurationHelper: DevWorkspaceConfigurationHelper;
@@ -57,7 +58,7 @@ suite(`Empty workspace API test`, async function (): Promise<void> {
 
         test('Check if project files are imported', function (): void {
             expect(containerTerminal.ls(`${containerWorkDir}/${clonedProjectName}`).stdout)
-                .includes(TestConstants.TS_SELENIUM_PROJECT_ROOT_FILE_NAME);
+                .includes(BaseTestConstants.TS_SELENIUM_PROJECT_ROOT_FILE_NAME);
         });
 
         suiteTeardown('Delete cloned project', function (): void {

package/specs/dashboard-samples/EmptyWorkspace.spec.ts

@@ -15,10 +15,13 @@ import { Logger } from '../../utils/Logger';
 import { ProjectAndFileTests } from '../../tests-library/ProjectAndFileTests';
 import { LoginTests } from '../../tests-library/LoginTests';
 import { registerRunningWorkspace } from '../MochaHooks';
+import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
 const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
+const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
+
 const stackName: string = 'Empty Workspace';
 
 suite(`${stackName} test`, async () => {
@@ -44,8 +47,13 @@ suite(`${stackName} test`, async () => {
     });
 
     suite('Stopping and deleting the workspace', async () => {
-        test(`Stop and remove workspace`, async () => {
-            await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+        test('Stop the workspace', async function (): Promise<void> {
+            await workspaceHandlingTests.stopWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+            await browserTabsUtil.closeAllTabsExceptCurrent();
+        });
+
+        test('Delete the workspace', async function (): Promise<void> {
+            await workspaceHandlingTests.removeWorkspace(WorkspaceHandlingTests.getWorkspaceName());
         });
         loginTests.logoutFromChe();
     });

package/specs/dashboard-samples/RecomendedExtentions.spec.ts

@@ -33,8 +33,9 @@ import { DriverHelper } from '../../utils/DriverHelper';
 import { CheCodeLocatorLoader } from '../../pageobjects/ide/CheCodeLocatorLoader';
 import { expect } from 'chai';
 import { TimeoutConstants } from '../../constants/TimeoutConstants';
-import { TestConstants } from '../../constants/TestConstants';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
+import { PluginsTestConstants } from '../../constants/PluginsTestConstants';
+import { BaseTestConstants } from '../../constants/BaseTestConstants';
 
 const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
@@ -42,7 +43,7 @@ const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
 const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
 
 const webCheCodeLocators: Locators = new CheCodeLocatorLoader().webCheCodeLocators;
-const samples: string[] = TestConstants.TS_SAMPLE_LIST.split(',');
+const samples: string[] = PluginsTestConstants.TS_SAMPLE_LIST.split(',');
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 
 suite(`Check if recommended extensions installed for ${samples}`, async function (): Promise<void> {
@@ -71,7 +72,7 @@ suite(`Check if recommended extensions installed for ${samples}`, async function
 
         test('Wait until the project will be imported and accept it as trusted one', async function (): Promise<void> {
             [projectSection] = await new SideBarView().getContent().getSections();
-            const label: string = TestConstants.TS_SELENIUM_PROJECT_ROOT_FILE_NAME;
+            const label: string = BaseTestConstants.TS_SELENIUM_PROJECT_ROOT_FILE_NAME;
             Logger.debug(`projectSection.findItem: find ${label}`);
             const isFileImported: ViewItem | undefined = await projectSection.findItem(label);
             expect(isFileImported).not.eqls(undefined);

package/specs/devconsole-intergration/DevConsoleIntegration.spec.ts

@@ -20,12 +20,12 @@ import { CLASSES } from '../../configs/inversify.types';
 import { WorkspaceHandlingTests } from '../../tests-library/WorkspaceHandlingTests';
 import { ProjectAndFileTests } from '../../tests-library/ProjectAndFileTests';
 import { expect } from 'chai';
-import { TestConstants } from '../../constants/TestConstants';
 import { OcpMainPage } from '../../pageobjects/openshift/OcpMainPage';
 import { OcpImportFromGitPage } from '../../pageobjects/openshift/OcpImportFromGitPage';
 import { KubernetesCommandLineToolsExecutor } from '../../utils/KubernetesCommandLineToolsExecutor';
 import { StringUtil } from '../../utils/StringUtil';
 import { OcpApplicationPage } from '../../pageobjects/openshift/OcpApplicationPage';
+import { BaseTestConstants } from '../../constants/BaseTestConstants';
 
 const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
 const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
@@ -86,7 +86,7 @@ suite(`DevConsole Integration`, async function (): Promise<void> {
     test('Check if project and files imported', async function (): Promise<void> {
         const applicationSourceProjectName: string = StringUtil.getProjectNameFromGitUrl(gitImportRepo);
         const projectSection: ViewSection = await new SideBarView().getContent().getSection(applicationSourceProjectName);
-        const isFileImported: ViewItem | undefined = await projectSection.findItem(TestConstants.TS_SELENIUM_PROJECT_ROOT_FILE_NAME);
+        const isFileImported: ViewItem | undefined = await projectSection.findItem(BaseTestConstants.TS_SELENIUM_PROJECT_ROOT_FILE_NAME);
         expect(isFileImported).not.eqls(undefined);
     });