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

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,37 +35,41 @@ 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});
+                    Object.defineProperty(TimeoutConstants, timeout, { value: seconds as number * 100 });
                 }
             }
         },
     ],
-    afterAll: [
+    afterEach: [
         // stop and remove running workspace
-        async () => {
-            if (TestConstants.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 (this: Mocha.Context): Promise<void> {
+            if (this.currentTest?.state === 'failed') {
+                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.');
+                    await testWorkspaceUtil.stopAndDeleteWorkspaceByName(latestWorkspace);
+                }
             }
         },
+    ],
+    afterAll: [
         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,12 +15,14 @@ import { WorkspaceHandlingTests } from '../tests-library/WorkspaceHandlingTests'
 import { registerRunningWorkspace } from './MochaHooks';
 import { Logger } from '../utils/Logger';
 import { LoginTests } from '../tests-library/LoginTests';
+import { StringUtil } from '../utils/StringUtil';
+import { FactoryTestConstants } from '../constants/FactoryTestConstants';
 
-const factoryUrl: string = 'https://github.com/che-incubator/quarkus-api-example.git';
-const projectName: string = 'quarkus-api-example';
+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);
+let projectName: string;
 
 suite(`The SmokeTest userstory`, async function (): Promise<void> {
     let projectSection: ViewSection;
@@ -35,6 +37,7 @@ suite(`The SmokeTest userstory`, async function (): Promise<void> {
             await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
         });
         test('Check a project folder has been created', async function (): Promise<void> {
+            projectName = StringUtil.getProjectNameFromGitUrl(factoryUrl);
             projectSection = await new SideBarView().getContent().getSection(projectName);
             Logger.debug(`new SideBarView().getContent().getSection: get ${projectName}`);
         });

package/specs/api/ContainerOverridesAPI.spec.ts

@@ -3,6 +3,7 @@ import fs from 'fs';
 import path from 'path';
 import YAML from 'yaml';
 import { expect } from 'chai';
+import { ShellExecutor } from '../../utils/ShellExecutor';
 
 suite(`Test defining container overrides via attribute.`, async function (): Promise<void> {
     const pathToSampleFile: string = path.resolve('resources/container-overrides.yaml');
@@ -13,16 +14,16 @@ suite(`Test defining container overrides via attribute.`, async function (): Pro
         kubernetesCommandLineToolsExecutor.loginToOcp();
     });
 
-    suiteTeardown('Delete DewWorkspace', function (): void {
+    suiteTeardown('Delete DevWorkspace', function (): void {
         kubernetesCommandLineToolsExecutor.deleteDevWorkspace();
     });
 
-    test('Apply container-overrides sample as DewWorkspace with OC client', function (): void {
+    test('Apply container-overrides sample as DevWorkspace with OC client', function (): void {
         kubernetesCommandLineToolsExecutor.applyYamlConfigurationAsFile(pathToSampleFile);
-        kubernetesCommandLineToolsExecutor.wait(5);
+        ShellExecutor.wait(5);
     });
 
-    test('Check that fields are overridden in the Deployment for DewWorkspace', function (): void {
+    test('Check that fields are overridden in the Deployment for DevWorkspace', function (): void {
        const devWorkspaceFullYamlOutput: any = YAML.parse(kubernetesCommandLineToolsExecutor.getDevWorkspaceYamlConfiguration());
        expect(devWorkspaceFullYamlOutput.spec.template.components[0].attributes['container-overrides']).eqls({
            resources: {

package/specs/api/DevfileAcceptanceTestAPI.spec.ts

@@ -0,0 +1,106 @@
+import { KubernetesCommandLineToolsExecutor } from '../../utils/KubernetesCommandLineToolsExecutor';
+import { DevWorkspaceConfigurationHelper } from '../../utils/DevWorkspaceConfigurationHelper';
+import { ShellString } from 'shelljs';
+import { expect } from 'chai';
+import { DevfileContext } from '@eclipse-che/che-devworkspace-generator/lib/api/devfile-context';
+import { StringUtil } from '../../utils/StringUtil';
+import { DevfilesRegistryHelper } from '../../utils/DevfilesRegistryHelper';
+import { Logger } from '../../utils/Logger';
+
+/**
+ * Dynamically generating tests
+ * info: https://mochajs.org/#delayed-root-suite
+ */
+
+(async function (): Promise<void> {
+
+    const devfilesRegistryHelper: DevfilesRegistryHelper = new DevfilesRegistryHelper();
+    const devfileSamples: any = await devfilesRegistryHelper.collectPathsToDevfilesFromRegistry();
+
+    for (const devfileSample of devfileSamples) {
+        suite(`Devfile acceptance test suite for ${devfileSample.name}`, async function (): Promise<void> {
+            this.bail(false);
+            this.timeout(1500000); // 25 minutes because build of Quarkus sample takes 20+ minutes
+            let devWorkspaceConfigurationHelper: DevWorkspaceConfigurationHelper;
+            let kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor;
+            let containerTerminal: KubernetesCommandLineToolsExecutor.ContainerTerminal;
+            let devfileContext: DevfileContext;
+            let devWorkspaceName: string | undefined;
+            let clonedProjectName: string;
+            let containerWorkDir: string;
+            let devfilesBuildCommands: any[] = [];
+
+            test('Get DevWorkspace configuration', async function (): Promise<void> {
+                devWorkspaceConfigurationHelper = new DevWorkspaceConfigurationHelper({
+                    devfileUrl: devfileSample.link,
+                });
+                devfileContext = await devWorkspaceConfigurationHelper.generateDevfileContext();
+                devWorkspaceName = devfileContext?.devWorkspace?.metadata?.name;
+
+                kubernetesCommandLineToolsExecutor = new KubernetesCommandLineToolsExecutor(devWorkspaceName);
+                containerTerminal = new KubernetesCommandLineToolsExecutor.ContainerTerminal(kubernetesCommandLineToolsExecutor);
+                kubernetesCommandLineToolsExecutor.loginToOcp();
+            });
+
+            test('Collect build commands from the devfile', async function (): Promise<void> {
+                if (devfileContext.devfile.commands === undefined) {
+                    Logger.info(`Devfile does not contains any commands.`);
+                } else {
+                    devfileContext.devfile.commands.forEach((command: any) => {
+                        if (command.exec?.group?.kind === 'build') {
+                            Logger.debug(`Build command found: ${command.exec.commandLine}`);
+                            devfilesBuildCommands.push(command);
+                        }
+                    });
+                }
+            });
+
+            test('Create DevWorkspace', async function (): Promise<void> {
+                const devWorkspaceConfigurationYamlString: string = await devWorkspaceConfigurationHelper.getDevWorkspaceConfigurationYamlAsString(devfileContext);
+                const applyOutput: ShellString = kubernetesCommandLineToolsExecutor.applyYamlConfigurationAsStringOutput(devWorkspaceConfigurationYamlString);
+
+                expect(applyOutput.stdout)
+                    .contains('devworkspacetemplate')
+                    .and.contains('devworkspace')
+                    .and.contains.oneOf(['created', 'configured']);
+
+            });
+
+            test('Wait until DevWorkspace has status "ready"', async function (): Promise<void> {
+                expect(kubernetesCommandLineToolsExecutor.waitDevWorkspace().stdout).contains('condition met');
+            });
+
+            test('Check if project was created', function (): void {
+                clonedProjectName = StringUtil.getProjectNameFromGitUrl(devfileSample.link);
+                expect(containerTerminal.ls().stdout).includes(clonedProjectName);
+            });
+
+            test('Check if project files are imported', function (): void {
+                containerWorkDir = containerTerminal.pwd().stdout.replace('\n', '');
+                expect(containerTerminal.ls(`${containerWorkDir}/${clonedProjectName}`).stdout).includes(`devfile.yaml`);
+            });
+
+            test(`Check if build commands returns success`, function (): void {
+                if (devfilesBuildCommands.length === 0) {
+                    Logger.info(`Devfile does not contains build commands.`);
+                } else {
+                    devfilesBuildCommands.forEach((command) => {
+                        Logger.info(`command.exec: ${JSON.stringify(command.exec)}`);
+
+                        const commandString: string = StringUtil.updateCommandEnvsToShStyle(`cd ${command.exec.workingDir} && ${command.exec.commandLine}`);
+                        Logger.info(`Full build command to be executed: ${commandString}`);
+
+                        const output: ShellString = containerTerminal.executeCommand(commandString, command.exec.component);
+                        expect(output.code).eqls(0);
+                    });
+                }
+            });
+
+            test('Delete DevWorkspace', async function (): Promise<void> {
+                kubernetesCommandLineToolsExecutor.deleteDevWorkspace();
+            });
+        });
+    }
+
+    run();
+})();

package/specs/api/EmptyWorkspaceAPI.spec.ts

@@ -0,0 +1,74 @@
+import { KubernetesCommandLineToolsExecutor } from '../../utils/KubernetesCommandLineToolsExecutor';
+import { expect } from 'chai';
+import { ShellString } from 'shelljs';
+import { StringUtil } from '../../utils/StringUtil';
+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 = APITestConstants.TS_API_TEST_NAMESPACE;
+    let clonedProjectName: string;
+    let containerWorkDir: string;
+    let devWorkspaceConfigurationHelper: DevWorkspaceConfigurationHelper;
+    let kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor;
+    let devfileContext: DevfileContext;
+    let devWorkspaceName: string | undefined;
+    let containerTerminal: KubernetesCommandLineToolsExecutor.ContainerTerminal;
+
+    const gitRepository: string = 'https://github.com/crw-qe/web-nodejs-sample';
+
+    suiteSetup('Create empty workspace with OC client', async function (): Promise<void> {
+        const workspaceName: string = 'empty-' + Math.floor(Math.random() * 1000);
+        const devfileContent: string =
+            'schemaVersion: 2.2.0\n' +
+            'metadata:\n' +
+            `  name: ${workspaceName}\n`;
+
+        devWorkspaceConfigurationHelper = new DevWorkspaceConfigurationHelper({
+            devfileContent,
+        });
+        devfileContext = await devWorkspaceConfigurationHelper.generateDevfileContext();
+        devWorkspaceName = devfileContext?.devWorkspace?.metadata?.name;
+        kubernetesCommandLineToolsExecutor = new KubernetesCommandLineToolsExecutor(devWorkspaceName, namespace);
+        containerTerminal = new KubernetesCommandLineToolsExecutor.ContainerTerminal(kubernetesCommandLineToolsExecutor);
+    });
+
+    test('Create empty workspace', async function (): Promise<void> {
+        kubernetesCommandLineToolsExecutor.loginToOcp();
+        const devWorkspaceConfigurationYamlString: string = await devWorkspaceConfigurationHelper.getDevWorkspaceConfigurationYamlAsString(devfileContext);
+        const output: ShellString = kubernetesCommandLineToolsExecutor.applyAndWaitDevWorkspace(devWorkspaceConfigurationYamlString);
+        expect(output.stdout).contains('condition met');
+    });
+
+    suite('Clone public repo without previous setup', function (): void {
+
+        test('Check if public repo can be cloned', function (): void {
+            containerWorkDir = containerTerminal.pwd().stdout.replace('\n', '');
+            const cloneOutput: ShellString = containerTerminal.gitClone(gitRepository);
+            expect(cloneOutput.stdout + cloneOutput.stderr).includes('Cloning');
+        });
+
+        test('Check if project was created', function (): void {
+            clonedProjectName = StringUtil.getProjectNameFromGitUrl(gitRepository);
+            expect(containerTerminal.ls().stdout).includes(clonedProjectName);
+        });
+
+        test('Check if project files are imported', function (): void {
+            expect(containerTerminal.ls(`${containerWorkDir}/${clonedProjectName}`).stdout)
+                .includes(BaseTestConstants.TS_SELENIUM_PROJECT_ROOT_FILE_NAME);
+        });
+
+        suiteTeardown('Delete cloned project', function (): void {
+            containerTerminal.removeFolder(`${clonedProjectName}`);
+        });
+    });
+
+    suiteTeardown('Delete workspace', function (): void {
+        kubernetesCommandLineToolsExecutor.deleteDevWorkspace();
+    });
+});
+
+

package/specs/api/PodOverridesAPI.spec.ts

@@ -3,6 +3,7 @@ import fs from 'fs';
 import path from 'path';
 import YAML from 'yaml';
 import { expect } from 'chai';
+import { ShellExecutor } from '../../utils/ShellExecutor';
 
 suite(`Test defining pod overrides via attribute.`, async function (): Promise<void> {
     const pathToSampleFile: string = path.resolve('resources/pod-overrides.yaml');
@@ -13,16 +14,16 @@ suite(`Test defining pod overrides via attribute.`, async function (): Promise<v
         kubernetesCommandLineToolsExecutor.loginToOcp();
     });
 
-    suiteTeardown('Delete DewWorkspace', function (): void {
+    suiteTeardown('Delete DevWorkspace', function (): void {
         kubernetesCommandLineToolsExecutor.deleteDevWorkspace();
     });
 
-    test('Apply pod-overrides sample as DewWorkspace with OC client', function (): void {
+    test('Apply pod-overrides sample as DevWorkspace with OC client', function (): void {
         kubernetesCommandLineToolsExecutor.applyYamlConfigurationAsFile(pathToSampleFile);
-        kubernetesCommandLineToolsExecutor.wait(5);
+        ShellExecutor.wait(5);
     });
 
-    test('Check that fields are overridden in the Deployment for DewWorkspace', function (): void {
+    test('Check that fields are overridden in the Deployment for DevWorkspace', function (): void {
        const devWorkspaceFullYamlOutput: any = YAML.parse(kubernetesCommandLineToolsExecutor.getDevWorkspaceYamlConfiguration());
        expect(devWorkspaceFullYamlOutput.spec.template.attributes['pod-overrides']).eqls({
            metadata: {

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);
@@ -115,7 +116,7 @@ suite(`Check if recommended extensions installed for ${samples}`, async function
             await driverHelper.wait(TimeoutConstants.TS_COMMON_PLUGIN_TEST_TIMEOUT);
         });
 
-        test(`Check if extensions is installed and enabled`, async function (): Promise<void> {
+        test(`Check if extensions are installed and enabled`, async function (): Promise<void> {
             this.retries(10);
             Logger.debug(`ActivityBar().getViewControl('Extensions'))?.openView(): open Extensions view.`);
             extensionsView = await (await new ActivityBar().getViewControl('Extensions'))?.openView();
@@ -171,12 +172,12 @@ suite(`Check if recommended extensions installed for ${samples}`, async function
                 expect(isInstalled).eqls(true);
 
                 Logger.debug(`itemWithRightNameAndPublisher.manage(): get context menu.`);
-                const extensionManageMenu: ContextMenu | undefined = await itemWithRightNameAndPublisher?.manage();
+                const extensionManageMenu: ContextMenu = await (itemWithRightNameAndPublisher as ExtensionsViewItem).manage();
 
                 Logger.debug(`extensionManageMenu.getItems(): get menu items.`);
-                const extensionMenuItems: ContextMenuItem[] | undefined = await extensionManageMenu?.getItems();
+                const extensionMenuItems: ContextMenuItem[] = await extensionManageMenu.getItems();
                 let extensionMenuItemLabels: string = '';
-                for (const item of extensionMenuItems as ContextMenuItem[]) {
+                for (const item of extensionMenuItems) {
                     Logger.trace(`extensionMenuItems -> item.getLabel(): get menu items names.`);
                     extensionMenuItemLabels += (await item.getLabel()) + ' ';
                 }

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 { GitUtil } from '../../utils/vsc/GitUtil';
+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);
@@ -84,9 +84,9 @@ suite(`DevConsole Integration`, async function (): Promise<void> {
     });
 
     test('Check if project and files imported', async function (): Promise<void> {
-        const applicationSourceProjectName: string = GitUtil.getProjectNameFromGitUrl(gitImportRepo);
+        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);
     });
 

package/specs/factory/Factory.spec.ts

@@ -25,10 +25,9 @@ import {
     ViewItem,
     ViewSection
 } from 'monaco-page-objects';
-import { TestConstants } from '../../constants/TestConstants';
 import { expect } from 'chai';
 import { OauthPage } from '../../pageobjects/git-providers/OauthPage';
-import { GitUtil } from '../../utils/vsc/GitUtil';
+import { StringUtil } from '../../utils/StringUtil';
 import { CheCodeLocatorLoader } from '../../pageobjects/ide/CheCodeLocatorLoader';
 import { registerRunningWorkspace } from '../MochaHooks';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
@@ -38,6 +37,9 @@ import { DriverHelper } from '../../utils/DriverHelper';
 import { ProjectAndFileTests } from '../../tests-library/ProjectAndFileTests';
 import { Logger } from '../../utils/Logger';
 import { LoginTests } from '../../tests-library/LoginTests';
+import { OAuthConstants } from '../../constants/OAuthConstants';
+import { BaseTestConstants } from '../../constants/BaseTestConstants';
+import { FactoryTestConstants } from '../../constants/FactoryTestConstants';
 
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
@@ -47,7 +49,7 @@ const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
 
 const webCheCodeLocators: Locators = new CheCodeLocatorLoader().webCheCodeLocators;
 
-suite(`Create a workspace via launching a factory from the ${TestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER} repository`, async function (): Promise<void> {
+suite(`Create a workspace via launching a factory from the ${FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER} repository`, async function (): Promise<void> {
     const oauthPage: OauthPage = new OauthPage(driverHelper);
 
     let projectSection: ViewSection;
@@ -59,18 +61,18 @@ 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 testRepoProjectName: string = GitUtil.getProjectNameFromGitUrl(TestConstants.TS_SELENIUM_FACTORY_GIT_REPO_URL);
+    let testRepoProjectName: string;
 
     loginTests.loginIntoChe();
     test(`Navigate to the 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`, async function (): Promise<void> {
+    if (OAuthConstants.TS_SELENIUM_GIT_PROVIDER_OAUTH) {
+        test(`Authorize with a ${FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER} OAuth`, async function (): Promise<void> {
             await oauthPage.login();
             await oauthPage.waitOauthPage();
             await oauthPage.confirmAccess();
@@ -88,12 +90,13 @@ 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);
     });
 
     test('Check if the project files were imported', async function (): Promise<void> {
-        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);
@@ -129,7 +132,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}"`);
@@ -166,7 +169,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();
@@ -184,15 +187,14 @@ 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();
     });
 
-    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();
 });