@eclipse-che/che-e2e 7.67.0 → 7.67.1-dev-e49f025

package/specs/factory/NoSetupRepoFactory.spec.ts

@@ -27,7 +27,7 @@ import {
     ViewSection
 } from 'monaco-page-objects';
 import { expect } from 'chai';
-import { GitUtil } from '../../utils/vsc/GitUtil';
+import { StringUtil } from '../../utils/StringUtil';
 import { CheCodeLocatorLoader } from '../../pageobjects/ide/CheCodeLocatorLoader';
 import WebDriverError = error.WebDriverError;
 import { registerRunningWorkspace } from '../MochaHooks';
@@ -38,10 +38,12 @@ import { ProjectAndFileTests } from '../../tests-library/ProjectAndFileTests';
 import { DriverHelper } from '../../utils/DriverHelper';
 import { Dashboard } from '../../pageobjects/dashboard/Dashboard';
 import { Workspaces } from '../../pageobjects/dashboard/Workspaces';
-import { GitProviderType, TestConstants } from '../../constants/TestConstants';
 import { TimeoutConstants } from '../../constants/TimeoutConstants';
 import { Logger } from '../../utils/Logger';
 import { LoginTests } from '../../tests-library/LoginTests';
+import { FactoryTestConstants, GitProviderType } from '../../constants/FactoryTestConstants';
+import { OAuthConstants } from '../../constants/OAuthConstants';
+import { BaseTestConstants } from '../../constants/BaseTestConstants';
 
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
@@ -52,7 +54,7 @@ const dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard);
 const workspaces: Workspaces = e2eContainer.get(CLASSES.Workspaces);
 const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
 
-suite(`Create a workspace via launching a factory from the ${TestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER} repository without OAuth setup`, async function (): Promise<void> {
+suite(`Create a workspace via launching a factory from the ${FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER} repository without OAuth setup`, async function (): Promise<void> {
 
     let projectSection: ViewSection;
     let scmProvider: SingleScmProvider;
@@ -65,11 +67,11 @@ suite(`Create a workspace via launching a factory from the ${TestConstants.TS_SE
     const changesToCommit: string = (new Date()).getTime().toString();
     const fileToChange: string = 'Date.txt';
     const pushItemLabel: string = 'Push';
-    const commitChangesButtonLabel: string = `Commit Changes on "${TestConstants.TS_SELENIUM_FACTORY_GIT_REPO_BRANCH}"`;
+    const commitChangesButtonLabel: string = `Commit Changes on "${FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_REPO_BRANCH}"`;
     const refreshButtonLabel: string = 'Refresh';
-    const label: string = TestConstants.TS_SELENIUM_PROJECT_ROOT_FILE_NAME;
-    const testRepoProjectName: string = GitUtil.getProjectNameFromGitUrl(TestConstants.TS_SELENIUM_FACTORY_GIT_REPO_URL);
-    const isPrivateRepo: string = TestConstants.TS_SELENIUM_IS_PRIVATE_FACTORY_GIT_REPO ? 'private' : 'public';
+    const label: string = BaseTestConstants.TS_SELENIUM_PROJECT_ROOT_FILE_NAME;
+    let testRepoProjectName: string;
+    const isPrivateRepo: string = FactoryTestConstants.TS_SELENIUM_IS_PRIVATE_FACTORY_GIT_REPO ? 'private' : 'public';
 
     loginTests.loginIntoChe();
 
@@ -80,16 +82,15 @@ suite(`Create a workspace via launching a factory from the ${TestConstants.TS_SE
     });
 
     test(`Navigate to the ${isPrivateRepo} repository factory URL`, async function (): Promise<void> {
-        await browserTabsUtil.navigateTo(TestConstants.TS_SELENIUM_FACTORY_URL());
+        await browserTabsUtil.navigateTo(FactoryTestConstants.TS_SELENIUM_FACTORY_URL());
     });
 
-    if (TestConstants.TS_SELENIUM_IS_PRIVATE_FACTORY_GIT_REPO) {
+    if (FactoryTestConstants.TS_SELENIUM_IS_PRIVATE_FACTORY_GIT_REPO) {
 
         test(`Check that workspace cannot be created without OAuth for ${isPrivateRepo} repo`, async function (): Promise<void> {
             await dashboard.waitLoader();
             const loaderAlert: string = await dashboard.getLoaderAlert();
-            expect(loaderAlert).contains('Failed to create the workspace')
-                .and.contains('Cause: Unsupported OAuth provider ');
+            expect(loaderAlert).contains.oneOf(['Cause: Unsupported OAuth provider', 'Cause: No PersonalAccessTokenFetcher configured']);
         });
 
         test(`Check that workspace was not created`, async function (): Promise<void> {
@@ -114,6 +115,7 @@ suite(`Create a workspace via launching a factory from the ${TestConstants.TS_SE
         });
 
         test('Check if a project folder has been created', async function (): Promise<void> {
+            testRepoProjectName = StringUtil.getProjectNameFromGitUrl(FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_REPO_URL);
             Logger.debug(`new SideBarView().getContent().getSection: get ${testRepoProjectName}`);
             projectSection = await new SideBarView().getContent().getSection(testRepoProjectName);
         });
@@ -135,7 +137,7 @@ suite(`Create a workspace via launching a factory from the ${TestConstants.TS_SE
                 await driverHelper.waitDisappearance(webCheCodeLocators.WelcomeContent.text);
             } catch (e) {
                 Logger.info(`"Accept the project as a trusted one" dialog was not shown firstly for "${isPrivateRepo}"`);
-                if (!TestConstants.TS_SELENIUM_IS_PRIVATE_FACTORY_GIT_REPO) {
+                if (!FactoryTestConstants.TS_SELENIUM_IS_PRIVATE_FACTORY_GIT_REPO) {
                     throw new WebDriverError(e as string);
                 }
             }
@@ -170,7 +172,7 @@ suite(`Create a workspace via launching a factory from the ${TestConstants.TS_SE
             Logger.debug(`scmView.getProviders: "${scmProvider}, ${scmProvider}"`);
         });
 
-        test('Check if the changes is displayed in the source control manager', async function (): Promise<void> {
+        test('Check if the changes are displayed in the source control manager', async function (): Promise<void> {
             await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
             await driverHelper.wait(timeToRefresh);
             Logger.debug(`scmProvider.takeAction: "${refreshButtonLabel}"`);
@@ -207,7 +209,7 @@ suite(`Create a workspace via launching a factory from the ${TestConstants.TS_SE
         });
 
         test('Push the changes', async function (): Promise<void> {
-            await driverHelper.waitVisibility(webCheCodeLocators.ScmView.actionConstructor(`Push 1 commits to origin/${TestConstants.TS_SELENIUM_FACTORY_GIT_REPO_BRANCH}`));
+            await driverHelper.waitVisibility(webCheCodeLocators.ScmView.actionConstructor(`Push 1 commits to origin/${FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_REPO_BRANCH}`));
             await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
             Logger.debug(`scmProvider.openMoreActions`);
             scmContextMenu = await scmProvider.openMoreActions();
@@ -216,7 +218,7 @@ suite(`Create a workspace via launching a factory from the ${TestConstants.TS_SE
             await scmContextMenu.select(pushItemLabel);
         });
 
-        if (TestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER === GitProviderType.GITHUB) {
+        if (FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER === GitProviderType.GITHUB) {
             test('Decline GitHub Extension', async function (): Promise<void> {
                 await driverHelper.waitVisibility(webCheCodeLocators.Dialog.details);
                 const gitHaExtensionDialog: ModalDialog = new ModalDialog();
@@ -225,20 +227,18 @@ suite(`Create a workspace via launching a factory from the ${TestConstants.TS_SE
         }
 
         test('Insert git credentials which were asked after push', async function (): Promise<void> {
-            await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
-
             try {
-                await driverHelper.waitVisibility(webCheCodeLocators.Input.inputBox);
+                await driverHelper.waitVisibility(webCheCodeLocators.InputBox.message);
             } catch (e) {
                 Logger.info(`Workspace did not ask credentials before push - ${e};
-                Known issue for github.com - https://issues.redhat.com/browse/CRW-4066`);
+                Known issue for github.com - https://issues.redhat.com/browse/CRW-4066, please check if not other git provider. `);
+                expect(FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER).eqls(GitProviderType.GITHUB);
             }
             const input: InputBox = new InputBox();
-            await input.setText(TestConstants.TS_SELENIUM_GIT_PROVIDER_USERNAME);
-            await driverHelper.wait(timeToRefresh);
+            await input.setText(OAuthConstants.TS_SELENIUM_GIT_PROVIDER_USERNAME);
             await input.confirm();
             await driverHelper.wait(timeToRefresh);
-            await input.setText(TestConstants.TS_SELENIUM_GIT_PROVIDER_PASSWORD);
+            await input.setText(OAuthConstants.TS_SELENIUM_GIT_PROVIDER_PASSWORD);
             await input.confirm();
             await driverHelper.wait(timeToRefresh);
         });
@@ -256,16 +256,15 @@ suite(`Create a workspace via launching a factory from the ${TestConstants.TS_SE
             expect(isCommitButtonDisabled).eql('true');
         });
 
-        test(`Stop and remove the workspace`, async function (): Promise<void> {
-            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();
     }
-
-    suiteTeardown('Close the browser', async function (): Promise<void> {
-        if (!TestConstants.TS_DEBUG_MODE) {
-            await driverHelper.getDriver().close();
-        }
-    });
 });

package/specs/factory/RefusedOAuthFactory.spec.ts

@@ -35,12 +35,14 @@ import { WorkspaceHandlingTests } from '../../tests-library/WorkspaceHandlingTes
 import { CheCodeLocatorLoader } from '../../pageobjects/ide/CheCodeLocatorLoader';
 import { ProjectAndFileTests } from '../../tests-library/ProjectAndFileTests';
 import { DriverHelper } from '../../utils/DriverHelper';
-import { TestConstants } from '../../constants/TestConstants';
 import { OauthPage } from '../../pageobjects/git-providers/OauthPage';
-import { GitUtil } from '../../utils/vsc/GitUtil';
+import { StringUtil } from '../../utils/StringUtil';
 import { Logger } from '../../utils/Logger';
 import { TimeoutConstants } from '../../constants/TimeoutConstants';
 import { LoginTests } from '../../tests-library/LoginTests';
+import { OAuthConstants } from '../../constants/OAuthConstants';
+import { BaseTestConstants } from '../../constants/BaseTestConstants';
+import { FactoryTestConstants, GitProviderType } from '../../constants/FactoryTestConstants';
 
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
@@ -49,7 +51,7 @@ const webCheCodeLocators: Locators = new CheCodeLocatorLoader().webCheCodeLocato
 const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
 const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
 
-suite(`Create a workspace via launching a factory from the ${TestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER} repository and deny the access`, async function (): Promise<void> {
+suite(`Create a workspace via launching a factory from the ${FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER} repository and deny the access`, async function (): Promise<void> {
     const oauthPage: OauthPage = new OauthPage(driverHelper);
 
     let projectSection: ViewSection;
@@ -61,21 +63,21 @@ suite(`Create a workspace via launching a factory from the ${TestConstants.TS_SE
     const timeToRefresh: number = 1500;
     const changesToCommit: string = (new Date()).getTime().toString();
     const fileToChange: string = 'Date.txt';
-    const commitChangesButtonLabel: string = `Commit Changes on "${TestConstants.TS_SELENIUM_FACTORY_GIT_REPO_BRANCH}"`;
+    const commitChangesButtonLabel: string = `Commit Changes on "${FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_REPO_BRANCH}"`;
     const refreshButtonLabel: string = 'Refresh';
     const pushItemLabel: string = 'Push';
-    const label: string = TestConstants.TS_SELENIUM_PROJECT_ROOT_FILE_NAME;
-    const testRepoProjectName: string = GitUtil.getProjectNameFromGitUrl(TestConstants.TS_SELENIUM_FACTORY_GIT_REPO_URL);
-    const isPrivateRepo: string = TestConstants.TS_SELENIUM_IS_PRIVATE_FACTORY_GIT_REPO ? 'private' : 'public';
+    const label: string = BaseTestConstants.TS_SELENIUM_PROJECT_ROOT_FILE_NAME;
+    let testRepoProjectName: string;
+    const isPrivateRepo: string = FactoryTestConstants.TS_SELENIUM_IS_PRIVATE_FACTORY_GIT_REPO ? 'private' : 'public';
 
     loginTests.loginIntoChe();
 
     test(`Navigate to the ${isPrivateRepo} repository factory URL`, async function (): Promise<void> {
-        await browserTabsUtil.navigateTo(TestConstants.TS_SELENIUM_FACTORY_URL());
+        await browserTabsUtil.navigateTo(FactoryTestConstants.TS_SELENIUM_FACTORY_URL());
     });
 
-    if (TestConstants.TS_SELENIUM_GIT_PROVIDER_OAUTH) {
-        test(`Authorize with a ${TestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER} OAuth and deny access`, async function (): Promise<void> {
+    if (FactoryTestConstants.TS_SELENIUM_GIT_PROVIDER_OAUTH) {
+        test(`Authorize with a ${FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER} OAuth and deny access`, async function (): Promise<void> {
             await oauthPage.login();
             await oauthPage.waitOauthPage();
             await oauthPage.denyAccess();
@@ -97,6 +99,7 @@ suite(`Create a workspace via launching a factory from the ${TestConstants.TS_SE
     });
 
     test('Check if a project folder has been created', async function (): Promise<void> {
+        testRepoProjectName = StringUtil.getProjectNameFromGitUrl(FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_REPO_URL);
         Logger.debug(`new SideBarView().getContent().getSection: get ${testRepoProjectName}`);
         projectSection = await new SideBarView().getContent().getSection(testRepoProjectName);
     });
@@ -118,13 +121,13 @@ suite(`Create a workspace via launching a factory from the ${TestConstants.TS_SE
             await driverHelper.waitDisappearance(webCheCodeLocators.WelcomeContent.text);
         } catch (e) {
             Logger.info(`"Accept the project as a trusted one" dialog was not shown firstly for "${isPrivateRepo}"`);
-            if (!TestConstants.TS_SELENIUM_IS_PRIVATE_FACTORY_GIT_REPO) {
+            if (!FactoryTestConstants.TS_SELENIUM_IS_PRIVATE_FACTORY_GIT_REPO) {
                 throw new WebDriverError(e as string);
             }
         }
     });
 
-    if (TestConstants.TS_SELENIUM_IS_PRIVATE_FACTORY_GIT_REPO) {
+    if (FactoryTestConstants.TS_SELENIUM_IS_PRIVATE_FACTORY_GIT_REPO) {
         test('Check that project can not be cloned', async function (): Promise<void> {
             await driverHelper.waitVisibility(webCheCodeLocators.Dialog.message);
             const workspaceDoesNotExistDialog: ModalDialog = new ModalDialog();
@@ -167,7 +170,7 @@ suite(`Create a workspace via launching a factory from the ${TestConstants.TS_SE
             Logger.debug(`scmView.getProviders: "${scmProvider}, ${scmProvider}"`);
         });
 
-        test('Check if the changes is displayed in the source control manager', async function (): Promise<void> {
+        test('Check if the changes are displayed in the source control manager', async function (): Promise<void> {
             await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
             await driverHelper.wait(timeToRefresh);
             Logger.debug(`scmProvider.takeAction: "${refreshButtonLabel}"`);
@@ -204,7 +207,7 @@ suite(`Create a workspace via launching a factory from the ${TestConstants.TS_SE
         });
 
         test('Push the changes', async function (): Promise<void> {
-            await driverHelper.waitVisibility(webCheCodeLocators.ScmView.actionConstructor(`Push 1 commits to origin/${TestConstants.TS_SELENIUM_FACTORY_GIT_REPO_BRANCH}`));
+            await driverHelper.waitVisibility(webCheCodeLocators.ScmView.actionConstructor(`Push 1 commits to origin/${FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_REPO_BRANCH}`));
             await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
             Logger.debug(`scmProvider.openMoreActions`);
             scmContextMenu = await scmProvider.openMoreActions();
@@ -214,19 +217,18 @@ suite(`Create a workspace via launching a factory from the ${TestConstants.TS_SE
         });
 
         test('Insert git credentials which were asked after push', async function (): Promise<void> {
-            await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
-
             try {
-                await driverHelper.waitVisibility(webCheCodeLocators.Input.inputBox);
+                await driverHelper.waitVisibility(webCheCodeLocators.InputBox.message);
             } catch (e) {
                 Logger.info(`Workspace did not ask credentials before push - ${e};
-                Known issue for github.com - https://issues.redhat.com/browse/CRW-4066`);
+                Known issue for github.com - https://issues.redhat.com/browse/CRW-4066, please check if not other git provider. `);
+                expect(FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER).eqls(GitProviderType.GITHUB);
             }
             const input: InputBox = new InputBox();
-            await input.setText(TestConstants.TS_SELENIUM_GIT_PROVIDER_USERNAME);
+            await input.setText(OAuthConstants.TS_SELENIUM_GIT_PROVIDER_USERNAME);
             await input.confirm();
             await driverHelper.wait(timeToRefresh);
-            await input.setText(TestConstants.TS_SELENIUM_GIT_PROVIDER_PASSWORD);
+            await input.setText(OAuthConstants.TS_SELENIUM_GIT_PROVIDER_PASSWORD);
             await input.confirm();
             await driverHelper.wait(timeToRefresh);
         });
@@ -245,15 +247,14 @@ suite(`Create a workspace via launching a factory from the ${TestConstants.TS_SE
         });
     }
 
-    test(`Stop and remove the workspace`, async function (): Promise<void> {
-        await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+    test('Stop the workspace', async function (): Promise<void> {
+        await workspaceHandlingTests.stopWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+        await browserTabsUtil.closeAllTabsExceptCurrent();
     });
 
-    loginTests.logoutFromChe();
-
-    suiteTeardown('Close the browser', async function (): Promise<void> {
-        if (!TestConstants.TS_DEBUG_MODE) {
-            await driverHelper.getDriver().close();
-        }
+    test('Delete the workspace', async function (): Promise<void> {
+        await workspaceHandlingTests.removeWorkspace(WorkspaceHandlingTests.getWorkspaceName());
     });
+
+    loginTests.logoutFromChe();
 });

package/tests-library/LoginTests.ts

@@ -9,12 +9,12 @@
  **********************************************************************/
 
 import { CLASSES, TYPES } from '../configs/inversify.types';
-import { ICheLoginPage } from '../pageobjects/login/ICheLoginPage';
-import { TestConstants } from '../constants/TestConstants';
+import { ICheLoginPage } from '../pageobjects/login/interfaces/ICheLoginPage';
 import { BrowserTabsUtil } from '../utils/BrowserTabsUtil';
 import { inject, injectable } from 'inversify';
 import { Dashboard } from '../pageobjects/dashboard/Dashboard';
-import { IOcpLoginPage } from '../pageobjects/login/IOcpLoginPage';
+import { IOcpLoginPage } from '../pageobjects/login/interfaces/IOcpLoginPage';
+import { BaseTestConstants } from '../constants/BaseTestConstants';
 
 @injectable()
 export class LoginTests {
@@ -25,10 +25,10 @@ export class LoginTests {
         @inject(CLASSES.Dashboard) private readonly dashboard: Dashboard) {
     }
 
-    public loginIntoChe(): void {
+    loginIntoChe(): void {
         test('Login', async () => {
-            if (!(await this.browserTabsUtil.getCurrentUrl()).includes(TestConstants.TS_SELENIUM_BASE_URL)) {
-                await this.browserTabsUtil.navigateTo(TestConstants.TS_SELENIUM_BASE_URL);
+            if (!(await this.browserTabsUtil.getCurrentUrl()).includes(BaseTestConstants.TS_SELENIUM_BASE_URL)) {
+                await this.browserTabsUtil.navigateTo(BaseTestConstants.TS_SELENIUM_BASE_URL);
             }
             await this.productLoginPage.login();
             await this.browserTabsUtil.maximize();
@@ -36,16 +36,16 @@ export class LoginTests {
         });
     }
 
-    public loginIntoOcpConsole(): void {
+    loginIntoOcpConsole(): void {
         test('Login into ocp console', async () => {
-            const openshiftConsoleUrl: string =  TestConstants.TS_SELENIUM_BASE_URL.replace('devspaces', 'console-openshift-console');
+            const openshiftConsoleUrl: string = BaseTestConstants.TS_SELENIUM_BASE_URL.replace('devspaces', 'console-openshift-console');
             await this.browserTabsUtil.navigateTo(openshiftConsoleUrl);
             await this.ocpLoginPage.login();
             await this.browserTabsUtil.maximize();
         });
     }
 
-    public logoutFromChe(): void {
+    logoutFromChe(): void {
         test('Logout', async () => {
             await this.dashboard.logout();
         });

package/tests-library/ProjectAndFileTests.ts

@@ -22,7 +22,7 @@ export class ProjectAndFileTests {
     constructor(
         @inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) {}
 
-    public async waitWorkspaceReadinessForCheCodeEditor(): Promise<void> {
+    async waitWorkspaceReadinessForCheCodeEditor(): Promise<void> {
         Logger.debug(`${this.constructor.name}.${this.waitWorkspaceReadinessForCheCodeEditor.name} - Waiting for editor.`);
         try {
             const start: number = new Date().getTime();

package/tests-library/WorkspaceHandlingTests.ts

@@ -20,12 +20,11 @@ import { ApiUrlResolver } from '../utils/workspace/ApiUrlResolver';
 import { TimeoutConstants } from '../constants/TimeoutConstants';
 import { DriverHelper } from '../utils/DriverHelper';
 import { By, error } from 'selenium-webdriver';
-import { TestConstants } from '../constants/TestConstants';
 
 @injectable()
 export class WorkspaceHandlingTests {
 
-    public static getWorkspaceName(): string {
+    static getWorkspaceName(): string {
         return WorkspaceHandlingTests.workspaceName;
     }
 
@@ -41,15 +40,15 @@ export class WorkspaceHandlingTests {
         @inject(CLASSES.ApiUrlResolver) private readonly apiUrlResolver: ApiUrlResolver,
         @inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) {}
 
-    public setWindowHandle(guid: string): void {
+    setWindowHandle(guid: string): void {
         WorkspaceHandlingTests.parentGUID = guid;
     }
 
-    public getWindowHandle(): string {
+    getWindowHandle(): string {
         return WorkspaceHandlingTests.parentGUID;
     }
 
-    public createAndOpenWorkspace(stack: string): void {
+    createAndOpenWorkspace(stack: string): void {
         test(`Create and open new workspace, stack:${stack}`, async () => {
             await this.dashboard.clickWorkspacesButton();
             await this.dashboard.waitPage();
@@ -63,7 +62,7 @@ export class WorkspaceHandlingTests {
         });
     }
 
-    public createAndOpenWorkspaceFromGitRepository(factoryUrl: string): void {
+    createAndOpenWorkspaceFromGitRepository(factoryUrl: string): void {
         test(`Create and open new workspace from factory:${factoryUrl}`, async () => {
             await this.dashboard.waitPage();
             Logger.debug(`Fetching user kubernetes namespace, storing auth token by getting workspaces API URL.`);
@@ -76,7 +75,7 @@ export class WorkspaceHandlingTests {
         });
     }
 
-    public openExistingWorkspace(workspaceName: string): void {
+    openExistingWorkspace(workspaceName: string): void {
         test('Open and start existing workspace', async () => {
             await this.dashboard.waitPage();
             Logger.debug(`Fetching user kubernetes namespace, storing auth token by getting workspaces API URL.`);
@@ -87,10 +86,10 @@ export class WorkspaceHandlingTests {
         });
     }
 
-    public obtainWorkspaceNameFromStartingPage(): void {
+    obtainWorkspaceNameFromStartingPage(): void {
         test('Obtain workspace name from workspace loader page', async() => {
             const timeout: number = TimeoutConstants.TS_IDE_LOAD_TIMEOUT;
-            const polling: number = TestConstants.TS_SELENIUM_DEFAULT_POLLING;
+            const polling: number = TimeoutConstants.TS_SELENIUM_DEFAULT_POLLING;
             const attempts: number = Math.ceil(timeout / polling);
 
             for (let i: number = 0; i < attempts; i++) {
@@ -125,17 +124,17 @@ export class WorkspaceHandlingTests {
         });
     }
 
-    public async stopWorkspace(workspaceName: string): Promise<void> {
+    async stopWorkspace(workspaceName: string): Promise<void> {
         await this.dashboard.openDashboard();
         await this.dashboard.stopWorkspaceByUI(workspaceName);
     }
 
-    public async removeWorkspace(workspaceName: string): Promise<void> {
+    async removeWorkspace(workspaceName: string): Promise<void> {
         await this.dashboard.openDashboard();
         await this.dashboard.deleteStoppedWorkspaceByUI(workspaceName);
     }
 
-    public async stopAndRemoveWorkspace(workspaceName: string): Promise<void> {
+    async stopAndRemoveWorkspace(workspaceName: string): Promise<void> {
         await this.dashboard.openDashboard();
         await this.dashboard.stopAndRemoveWorkspaceByUI(workspaceName);
     }

package/utils/BrowserTabsUtil.ts

@@ -13,7 +13,7 @@ import { CLASSES } from '../configs/inversify.types';
 import { DriverHelper } from './DriverHelper';
 import { Logger } from './Logger';
 import { TimeoutConstants } from '../constants/TimeoutConstants';
-import { TestConstants } from '../constants/TestConstants';
+import { ChromeDriverConstants } from '../constants/ChromeDriverConstants';
 
 @injectable()
 export class BrowserTabsUtil {
@@ -92,7 +92,7 @@ export class BrowserTabsUtil {
 
     async maximize(): Promise<void> {
         Logger.trace(`BrowserTabsUtil.maximize`);
-        if (TestConstants.TS_SELENIUM_LAUNCH_FULLSCREEN) {
+        if (ChromeDriverConstants.TS_SELENIUM_LAUNCH_FULLSCREEN) {
             Logger.debug(`TS_SELENIUM_LAUNCH_FULLSCREEN is set to true, maximizing window.`);
             await this.driverHelper.getDriver().manage().window().maximize();
         }

package/utils/CheReporter.ts

@@ -8,31 +8,30 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 import * as mocha from 'mocha';
-import { TYPES, CLASSES } from '../configs/inversify.types';
+import { CLASSES } from '../configs/inversify.types';
 import * as fs from 'fs';
 import * as rm from 'rimraf';
-import { TestConstants } from '../constants/TestConstants';
 import { logging } from 'selenium-webdriver';
 import { DriverHelper } from './DriverHelper';
 import { ScreenCatcher } from './ScreenCatcher';
-import { ITestWorkspaceUtil } from './workspace/ITestWorkspaceUtil';
 import { TimeoutConstants } from '../constants/TimeoutConstants';
 import { Logger } from './Logger';
-import { Sanitizer } from './Sanitizer';
 import { e2eContainer } from '../configs/inversify.config';
 import { WriteStream } from 'fs';
+import { StringUtil } from './StringUtil';
+import { BaseTestConstants } from '../constants/BaseTestConstants';
+import { ChromeDriverConstants } from '../constants/ChromeDriverConstants';
+import { OAuthConstants } from '../constants/OAuthConstants';
+import { ReporterConstants } from '../constants/ReporterConstants';
+import { PluginsTestConstants } from '../constants/PluginsTestConstants';
 
 const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
 const screenCatcher: ScreenCatcher = e2eContainer.get(CLASSES.ScreenCatcher);
-const sanitizer: Sanitizer = e2eContainer.get(CLASSES.Sanitizer);
 let methodIndex: number = 0;
 let deleteScreencast: boolean = true;
-let testWorkspaceUtil: ITestWorkspaceUtil = e2eContainer.get(TYPES.WorkspaceUtil);
 
 class CheReporter extends mocha.reporters.Spec {
 
-  private static latestWorkspace: string = '';
-
   constructor(runner: mocha.Runner, options: mocha.MochaOptions) {
     super(runner, options);
 
@@ -40,32 +39,32 @@ class CheReporter extends mocha.reporters.Spec {
       let launchInformation: string =
         `################## Launch Information ##################
 
-      TS_SELENIUM_BASE_URL: ${TestConstants.TS_SELENIUM_BASE_URL}
-      TS_SELENIUM_HEADLESS: ${TestConstants.TS_SELENIUM_HEADLESS}
-      TS_SELENIUM_OCP_USERNAME: ${TestConstants.TS_SELENIUM_OCP_USERNAME}
-      TS_SELENIUM_EDITOR:   ${TestConstants.TS_SELENIUM_EDITOR}
-
-      TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME: ${TestConstants.TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME}
-      TS_SELENIUM_DELAY_BETWEEN_SCREENSHOTS: ${TestConstants.TS_SELENIUM_DELAY_BETWEEN_SCREENSHOTS}
-      TS_SELENIUM_REPORT_FOLDER: ${TestConstants.TS_SELENIUM_REPORT_FOLDER}
-      TS_SELENIUM_EXECUTION_SCREENCAST: ${TestConstants.TS_SELENIUM_EXECUTION_SCREENCAST}
-      DELETE_SCREENCAST_IF_TEST_PASS: ${TestConstants.DELETE_SCREENCAST_IF_TEST_PASS}
-      TS_SELENIUM_REMOTE_DRIVER_URL: ${TestConstants.TS_SELENIUM_REMOTE_DRIVER_URL}
-      DELETE_WORKSPACE_ON_FAILED_TEST: ${TestConstants.DELETE_WORKSPACE_ON_FAILED_TEST}
-      TS_SELENIUM_LOG_LEVEL: ${TestConstants.TS_SELENIUM_LOG_LEVEL}
-      TS_SELENIUM_LAUNCH_FULLSCREEN: ${TestConstants.TS_SELENIUM_LAUNCH_FULLSCREEN}
+      TS_SELENIUM_BASE_URL: ${BaseTestConstants.TS_SELENIUM_BASE_URL}
+      TS_SELENIUM_HEADLESS: ${ChromeDriverConstants.TS_SELENIUM_HEADLESS}
+      TS_SELENIUM_OCP_USERNAME: ${OAuthConstants.TS_SELENIUM_OCP_USERNAME}
+      TS_SELENIUM_EDITOR:   ${BaseTestConstants.TS_SELENIUM_EDITOR}
+
+      TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME: ${BaseTestConstants.TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME}
+      TS_SELENIUM_DELAY_BETWEEN_SCREENSHOTS: ${ReporterConstants.TS_SELENIUM_DELAY_BETWEEN_SCREENSHOTS}
+      TS_SELENIUM_REPORT_FOLDER: ${ReporterConstants.TS_SELENIUM_REPORT_FOLDER}
+      TS_SELENIUM_EXECUTION_SCREENCAST: ${ReporterConstants.TS_SELENIUM_EXECUTION_SCREENCAST}
+      DELETE_SCREENCAST_IF_TEST_PASS: ${ReporterConstants.DELETE_SCREENCAST_IF_TEST_PASS}
+      TS_SELENIUM_REMOTE_DRIVER_URL: ${ChromeDriverConstants.TS_SELENIUM_REMOTE_DRIVER_URL}
+      DELETE_WORKSPACE_ON_FAILED_TEST: ${BaseTestConstants.DELETE_WORKSPACE_ON_FAILED_TEST}
+      TS_SELENIUM_LOG_LEVEL: ${ReporterConstants.TS_SELENIUM_LOG_LEVEL}
+      TS_SELENIUM_LAUNCH_FULLSCREEN: ${ChromeDriverConstants.TS_SELENIUM_LAUNCH_FULLSCREEN}
 
       TS_COMMON_DASHBOARD_WAIT_TIMEOUT: ${TimeoutConstants.TS_COMMON_DASHBOARD_WAIT_TIMEOUT}
       TS_SELENIUM_START_WORKSPACE_TIMEOUT: ${TimeoutConstants.TS_SELENIUM_START_WORKSPACE_TIMEOUT}
       TS_WAIT_LOADER_PRESENCE_TIMEOUT: ${TimeoutConstants.TS_WAIT_LOADER_PRESENCE_TIMEOUT}
 
-      TS_SAMPLE_LIST: ${TestConstants.TS_SAMPLE_LIST}
+      TS_SAMPLE_LIST: ${PluginsTestConstants.TS_SAMPLE_LIST}
 
       ${process.env.MOCHA_DIRECTORY ? 'MOCHA_DIRECTORY: ' + process.env.MOCHA_DIRECTORY : 'MOCHA_DRIRECTORY is not set'}
       ${process.env.USERSTORY ? 'USERSTORY: ' + process.env.USERSTORY : 'USERSTORY is not set'}
 `;
 
-      if (TestConstants.TS_SELENIUM_PRINT_TIMEOUT_VARIABLES) {
+      if (ReporterConstants.TS_SELENIUM_PRINT_TIMEOUT_VARIABLES) {
         launchInformation += `\n      TS_SELENIUM_PRINT_TIMEOUT_VARIABLES is set to true: \n`;
         Object.entries(TimeoutConstants).forEach(
           ([key, value]) => launchInformation += `\n         ${key}: ${value}`);
@@ -77,11 +76,11 @@ class CheReporter extends mocha.reporters.Spec {
 
       console.log(launchInformation);
 
-      rm.sync(TestConstants.TS_SELENIUM_REPORT_FOLDER);
+      rm.sync(ReporterConstants.TS_SELENIUM_REPORT_FOLDER);
     });
 
     runner.on('test', async function (test: mocha.Test): Promise<void> {
-      if (!TestConstants.TS_SELENIUM_EXECUTION_SCREENCAST) {
+      if (!ReporterConstants.TS_SELENIUM_EXECUTION_SCREENCAST) {
         return;
       }
 
@@ -93,13 +92,13 @@ class CheReporter extends mocha.reporters.Spec {
         await screenCatcher.catchMethodScreen(test.title, currentMethodIndex, iterationIndex);
         iterationIndex = iterationIndex + 1;
 
-        await driverHelper.wait(TestConstants.TS_SELENIUM_DELAY_BETWEEN_SCREENSHOTS);
+        await driverHelper.wait(ReporterConstants.TS_SELENIUM_DELAY_BETWEEN_SCREENSHOTS);
       }
     });
 
     runner.on('pass', async (test: mocha.Test) => {
-      if (TestConstants.TS_LOAD_TESTS) {
-        const loadTestReportFolder: string = TestConstants.TS_SELENIUM_LOAD_TEST_REPORT_FOLDER;
+      if (BaseTestConstants.TS_LOAD_TESTS) {
+        const loadTestReportFolder: string = ReporterConstants.TS_SELENIUM_LOAD_TEST_REPORT_FOLDER;
         const loadTestFilePath: string = loadTestReportFolder + '/load-test-results.txt';
         const report: string = test.title + ': ' + test.duration + '\r';
         if (!fs.existsSync(loadTestReportFolder)) {
@@ -118,8 +117,8 @@ class CheReporter extends mocha.reporters.Spec {
       await driverHelper.getDriver().quit();
 
       // delete screencast folder if conditions matched
-      if (deleteScreencast && TestConstants.DELETE_SCREENCAST_IF_TEST_PASS) {
-        rm.sync(TestConstants.TS_SELENIUM_REPORT_FOLDER);
+      if (deleteScreencast && ReporterConstants.DELETE_SCREENCAST_IF_TEST_PASS) {
+        rm.sync(ReporterConstants.TS_SELENIUM_REPORT_FOLDER);
       }
     });
 
@@ -129,23 +128,23 @@ class CheReporter extends mocha.reporters.Spec {
       deleteScreencast = false;
 
       Logger.trace(`FullTitle:${test.fullTitle()}`);
-      const testFullTitle: string = sanitizer.sanitize(test.fullTitle());
+      const testFullTitle: string = StringUtil.sanitizeTitle(test.fullTitle());
       Logger.trace(`FullTitleSanitized:${testFullTitle}`);
       Logger.trace(`TestTitle:${test.title}`);
-      const testTitle: string = sanitizer.sanitize(test.title);
+      const testTitle: string = StringUtil.sanitizeTitle(test.title);
       Logger.trace(`TestTitleSanitized:${testTitle}`);
 
-      const testReportDirPath: string = `${TestConstants.TS_SELENIUM_REPORT_FOLDER}/${testFullTitle}`;
+      const testReportDirPath: string = `${ReporterConstants.TS_SELENIUM_REPORT_FOLDER}/${testFullTitle}`;
       const screenshotFileName: string = `${testReportDirPath}/screenshot-${testTitle}.png`;
       const pageSourceFileName: string = `${testReportDirPath}/pagesource-${testTitle}.html`;
       const browserLogsFileName: string = `${testReportDirPath}/browserlogs-${testTitle}.txt`;
 
 
       // create reporter dir if not exist
-      const reportDirExists: boolean = fs.existsSync(TestConstants.TS_SELENIUM_REPORT_FOLDER);
+      const reportDirExists: boolean = fs.existsSync(ReporterConstants.TS_SELENIUM_REPORT_FOLDER);
 
       if (!reportDirExists) {
-        fs.mkdirSync(TestConstants.TS_SELENIUM_REPORT_FOLDER);
+        fs.mkdirSync(ReporterConstants.TS_SELENIUM_REPORT_FOLDER);
       }
 
       // create dir for failed test report if not exist
@@ -179,12 +178,6 @@ class CheReporter extends mocha.reporters.Spec {
       browserLogsStream.write(Buffer.from(browserLogs));
       browserLogsStream.end();
 
-      // stop and remove running workspace
-      if (TestConstants.DELETE_WORKSPACE_ON_FAILED_TEST) {
-        Logger.warn('Property DELETE_WORKSPACE_ON_FAILED_TEST se to true - trying to stop and delete running workspace.');
-        await testWorkspaceUtil.stopAndDeleteWorkspaceByName(CheReporter.latestWorkspace);
-      }
-
     });
   }
 }