@eclipse-che/che-e2e 7.66.0-dev-5e8a484 → 7.66.0-dev-37c09e5

package/utils/DriverHelper.ts

@@ -48,6 +48,12 @@ export class DriverHelper {
         await this.driver.sleep(milliseconds);
     }
 
+    public async refreshPage(): Promise<void> {
+        Logger.trace(`DriverHelper.refreshPage`);
+
+        await this.driver.navigate().refresh();
+    }
+
     public async waitVisibilityBoolean(locator: By,
         attempts: number = TestConstants.TS_SELENIUM_DEFAULT_ATTEMPTS,
         polling: number = TestConstants.TS_SELENIUM_DEFAULT_POLLING): Promise<boolean> {
@@ -273,12 +279,27 @@ export class DriverHelper {
                 await element.click();
                 return;
             } catch (err) {
-                if (err instanceof error.StaleElementReferenceError) {
-                    Logger.debug(`DriverHelper.waitAndClik - ${elementLocator} - StaleElementReferenceError - ${err}`);
+                function isElementClickInterceptedOnLastAttempt(err: Error, i: number): boolean {
+                    return err instanceof error.ElementClickInterceptedError && i === attempts - 1;
+                }
+
+                if (err instanceof error.StaleElementReferenceError || err instanceof error.ElementClickInterceptedError) {
+                    Logger.debug(`DriverHelper.waitAndClick - ${elementLocator} - ${err}`);
                     await this.wait(polling);
                     continue;
                 }
 
+                if (isElementClickInterceptedOnLastAttempt(err, i)) {
+                    Logger.debug(`DriverHelper.waitAndClick - Element is not clickable, try to perform pointer click`);
+                    await this.getAction()
+                        .move({
+                            origin: await this.waitPresence(elementLocator)
+                        })
+                        .click()
+                        .perform();
+                    return;
+                }
+
                 Logger.error(`DriverHelper.waitAndClick - failed with an unexpected exception - ${err}`);
                 throw err;
             }
@@ -658,7 +679,8 @@ export class DriverHelper {
             }
 
             try {
-                await this.getAction().move({origin: element}).perform();
+                await this.getDriver()
+                    .executeScript('arguments[0].scrollIntoView(true);', element);
                 return;
             } catch (err) {
                 if (err instanceof error.StaleElementReferenceError) {
@@ -674,7 +696,17 @@ export class DriverHelper {
         throw new error.TimeoutError(`Exceeded maximum mouse move attempts, for the '${elementLocator}' element`);
     }
 
-    getDriver(): ThenableWebDriver {
+    public async scrollToAndClick(elementLocator: By, timeout: number = TimeoutConstants.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM): Promise<void> {
+        await this.scrollTo(elementLocator, timeout);
+        await this.waitAndClick(elementLocator, timeout);
+    }
+
+    public async scrollToAndEnterValue(elementLocator: By, value: string, timeout: number = TimeoutConstants.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM): Promise<void> {
+        await this.scrollTo(elementLocator, timeout);
+        await this.enterValue(elementLocator, value, timeout);
+    }
+
+        getDriver(): ThenableWebDriver {
         Logger.trace('DriverHelper.getDriver');
 
         return this.driver;

package/utils/KubernetesCommandLineToolsExecutor.ts

@@ -2,6 +2,7 @@ import { echo, exec, ShellString } from 'shelljs';
 import { KubernetesCommandLineTool, TestConstants } from '../constants/TestConstants';
 import { Logger } from './Logger';
 import { ShellExecutor } from './ShellExecutor';
+import * as path from 'path';
 
 export class KubernetesCommandLineToolsExecutor extends ShellExecutor {
     private static container: string;
@@ -27,11 +28,14 @@ export class KubernetesCommandLineToolsExecutor extends ShellExecutor {
     // login to Openshift cluster with username and password
     loginToOcp(): void {
         if (this.KUBERNETES_COMMAND_LINE_TOOL === KubernetesCommandLineTool.OC) {
-            Logger.debug(`${this.getLoggingName(this.loginToOcp.name)}: Login to the "OC" client`);
+            Logger.debug(`${this.getLoggingName(this.loginToOcp.name)}: Login to the "OC" client.`);
             const url: string = this.getServerUrl();
-            Logger.debug(url, TestConstants.TS_SELENIUM_OCP_USERNAME);
-            exec(`sleep 5
-            oc login --server=${url} -u=${TestConstants.TS_SELENIUM_OCP_USERNAME} -p=${TestConstants.TS_SELENIUM_OCP_PASSWORD} --insecure-skip-tls-verify`);
+            if (this.isUserLoggedIn()) {
+                Logger.debug(`${this.getLoggingName(this.loginToOcp.name)}: User already logged`);
+            } else {
+                Logger.debug(`${this.getLoggingName(this.loginToOcp.name)}: Login ${url}, ${TestConstants.TS_SELENIUM_OCP_USERNAME}`);
+                exec(`oc login --server=${url} -u=${TestConstants.TS_SELENIUM_OCP_USERNAME} -p=${TestConstants.TS_SELENIUM_OCP_PASSWORD} --insecure-skip-tls-verify`);
+            }
         } else {
             Logger.debug(`${this.getLoggingName(this.loginToOcp.name)}: doesn't support login command`);
         }
@@ -54,6 +58,7 @@ export class KubernetesCommandLineToolsExecutor extends ShellExecutor {
         Logger.debug(`${this.getLoggingName(this.deleteDevWorkspace.name)}: Delete '${this.workspaceName}' workspace`);
         this.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} patch dw ${this.workspaceName} -n ${this.namespace} -p '{ "metadata": { "finalizers": null }}' --type merge || true`);
         this.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} delete dw ${this.workspaceName} -n ${this.namespace} || true`);
+        this.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} delete dwt ${TestConstants.TS_SELENIUM_EDITOR}-${this.workspaceName} -n ${this.namespace} || true`);
     }
 
     applyAndWaitDevWorkspace(yamlConfiguration: string): ShellString {
@@ -79,6 +84,16 @@ export class KubernetesCommandLineToolsExecutor extends ShellExecutor {
             'EOF');
     }
 
+    applyYamlConfigurationAsFile(pathToFile: string): void {
+        Logger.debug(`${this.getLoggingName(this.applyYamlConfigurationAsFile.name)}:`);
+        this.execWithLog(`${this.KUBERNETES_COMMAND_LINE_TOOL} apply -n ${this.namespace} -f "${path.resolve(pathToFile)}"`);
+    }
+
+    getDevWorkspaceYamlConfiguration(): ShellString {
+        Logger.debug(`${this.getLoggingName(this.getDevWorkspaceYamlConfiguration.name)}:`);
+        return this.execWithLog(`${this.KUBERNETES_COMMAND_LINE_TOOL} get dw ${this.workspaceName} -n ${this.namespace} -o yaml`);
+    }
+
     waitDevWorkspace(timeout: number = 360): ShellString {
         Logger.debug(`${this.getLoggingName(this.waitDevWorkspace.name)}: Wait till workspace ready.`);
         return this.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} wait -n ${this.namespace} --for=condition=Ready dw ${this.workspaceName} --timeout=${timeout}s`);
@@ -89,6 +104,22 @@ export class KubernetesCommandLineToolsExecutor extends ShellExecutor {
         this.execWithLog(`${this.KUBERNETES_COMMAND_LINE_TOOL} create namespace ${this.namespace}`);
     }
 
+    createProject(projectName: string): void {
+        Logger.debug(`${this.getLoggingName(this.createProject.name)}: Create new project "${projectName}".`);
+        this.execWithLog(`${this.KUBERNETES_COMMAND_LINE_TOOL} new-project ${projectName} -n ${this.namespace}`);
+    }
+
+    deleteProject(projectName: string): void {
+        Logger.debug(`${this.getLoggingName(this.deleteProject.name)}: Delete "${projectName}".`);
+        this.execWithLog(`${this.KUBERNETES_COMMAND_LINE_TOOL} delete project ${projectName} -n ${this.namespace}`);
+    }
+
+    private isUserLoggedIn(): boolean {
+        const whoamiCommandOutput: ShellString = this.execWithLog('oc whoami && oc whoami --show-server=true');
+
+        return whoamiCommandOutput.stdout.includes(TestConstants.TS_SELENIUM_OCP_USERNAME) && whoamiCommandOutput.stdout.includes(this.getServerUrl());
+    }
+
     private getLoggingName(methodName: string): string {
         return `${this.constructor.name}.${methodName} - ${(this.KUBERNETES_COMMAND_LINE_TOOL)}`;
     }
@@ -110,7 +141,7 @@ export class KubernetesCommandLineToolsExecutor extends ShellExecutor {
 export namespace KubernetesCommandLineToolsExecutor {
     export class ContainerTerminal extends KubernetesCommandLineToolsExecutor {
         constructor(cluster: KubernetesCommandLineToolsExecutor) {
-                super(cluster.getWorkspaceName, cluster.getNamespace);
+            super(cluster.getWorkspaceName, cluster.getNamespace);
         }
 
         ls(path: string = ''): ShellString {

package/utils/ShellExecutor.ts

@@ -2,6 +2,10 @@ import { echo, exec, ShellString } from 'shelljs';
 
 export class ShellExecutor {
 
+    wait(seconds: number): void {
+        this.execWithLog(`sleep ${seconds}s`);
+    }
+
     protected execWithLog(command: string): ShellString {
         echo(command);
         return exec(command);