Update to latest changes in main branch.

Signed-off-by: Dmytro Nochevnov <dnochevn@redhat.com>
eclipse-che · Jul 7, 2023 · e49f025 · e49f025
1 parent 27e839c
commit e49f025
Show file tree

Hide file tree

Showing 9 changed files with 1,052 additions and 2,423 deletions.
diff --git a/tests/e2e/package-lock.json b/tests/e2e/package-lock.json
diff --git a/tests/e2e/pageobjects/openshift/OcpMainPage.ts b/tests/e2e/pageobjects/openshift/OcpMainPage.ts
@@ -90,7 +90,7 @@ export class OcpMainPage {
     }
 
     private async selectRole(role: string): Promise<void> {
-        Logger.debug(`${this.constructor.name}.${this.selectRole.name} - ${role}`);
+        Logger.debug(`${this.constructor.name}.${this.selectRole.name} - selecting role ${role}`);
 
         await this.driverHelper.waitAndClick(OcpMainPage.getRoleLocator(role));
     }

diff --git a/tests/e2e/specs/api/ContainerOverridesAPI.spec.ts b/tests/e2e/specs/api/ContainerOverridesAPI.spec.ts
@@ -14,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);
         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: {

diff --git a/tests/e2e/specs/api/PodOverridesAPI.spec.ts b/tests/e2e/specs/api/PodOverridesAPI.spec.ts
@@ -14,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);
         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: {

diff --git a/tests/e2e/specs/dashboard-samples/RecomendedExtentions.spec.ts b/tests/e2e/specs/dashboard-samples/RecomendedExtentions.spec.ts
@@ -116,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();
@@ -172,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()) + ' ';
                 }

diff --git a/tests/e2e/specs/factory/Factory.spec.ts b/tests/e2e/specs/factory/Factory.spec.ts
@@ -132,7 +132,7 @@ suite(`Create a workspace via launching a factory from the ${FactoryTestConstant
         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}"`);

diff --git a/tests/e2e/specs/factory/NoSetupRepoFactory.spec.ts b/tests/e2e/specs/factory/NoSetupRepoFactory.spec.ts
@@ -172,7 +172,7 @@ suite(`Create a workspace via launching a factory from the ${FactoryTestConstant
             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}"`);

diff --git a/tests/e2e/specs/factory/RefusedOAuthFactory.spec.ts b/tests/e2e/specs/factory/RefusedOAuthFactory.spec.ts
@@ -170,7 +170,7 @@ suite(`Create a workspace via launching a factory from the ${FactoryTestConstant
             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}"`);

diff --git a/tests/e2e/utils/StringUtil.ts b/tests/e2e/utils/StringUtil.ts
@@ -10,7 +10,6 @@
 
 import { injectable } from 'inversify';
 import { Logger } from './Logger';
-import { KubernetesCommandLineToolsExecutor } from './KubernetesCommandLineToolsExecutor';
 
 @injectable()
 export class StringUtil {