@eclipse-che/che-e2e 7.64.0-dev-2c00276 → 7.64.1-dev-43c3317

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

@@ -0,0 +1,167 @@
+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;
+    private static pod: string;
+    private readonly namespace: string;
+    private readonly workspaceName: string | undefined;
+    private readonly KUBERNETES_COMMAND_LINE_TOOL: string = TestConstants.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL;
+
+    constructor(_workspaceName?: string, _namespace?: string) {
+        super();
+        this.workspaceName = _workspaceName;
+        this.namespace = this.setNamespace(_namespace);
+    }
+
+    get getWorkspaceName(): string {
+        return <string>this.workspaceName;
+    }
+
+    get getNamespace(): string {
+        return this.namespace;
+    }
+
+    // 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.`);
+            const url: string = this.getServerUrl();
+            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`);
+        }
+    }
+
+    getContainerName(): string {
+        Logger.debug(`${this.getLoggingName(this.getContainerName.name)}: Get container name.`);
+        const output: ShellString = this.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} get ${(KubernetesCommandLineToolsExecutor.pod)} -o jsonpath='{.spec.containers[*].name}' -n ${this.namespace}`);
+        echo('\n');
+        return output.stderr ? output.stderr : output.stdout;
+    }
+
+    getWorkspacePodName(): string {
+        Logger.debug(`${this.getLoggingName(this.getWorkspacePodName.name)}: Get workspace pod name.`);
+        const output: ShellString = this.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} get pod -l controller.devfile.io/devworkspace_name=${this.workspaceName} -n ${this.namespace} -o name`);
+        return output.stderr ? output.stderr : output.stdout.replace('\n', '');
+    }
+
+    deleteDevWorkspace(): void {
+        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 {
+        if (this.KUBERNETES_COMMAND_LINE_TOOL === KubernetesCommandLineTool.KUBECTL) {
+            this.createNamespace();
+        }
+        this.applyYamlConfigurationAsStringOutput(yamlConfiguration);
+        const output: ShellString = this.waitDevWorkspace();
+        KubernetesCommandLineToolsExecutor.pod = this.getWorkspacePodName();
+        KubernetesCommandLineToolsExecutor.container = this.getContainerName();
+        return output;
+    }
+
+    executeCommand(commandToExecute: string): ShellString {
+        Logger.debug(`${this.getLoggingName(this.executeCommand.name)}:`);
+        return this.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} exec -i ${KubernetesCommandLineToolsExecutor.pod} -n ${this.namespace} -c ${KubernetesCommandLineToolsExecutor.container} -- sh -c "${commandToExecute}"`);
+    }
+
+    applyYamlConfigurationAsStringOutput(yamlConfiguration: string): void {
+        Logger.debug(`${this.getLoggingName(this.applyYamlConfigurationAsStringOutput.name)}:`);
+        this.execWithLog(`cat <<EOF | ${this.KUBERNETES_COMMAND_LINE_TOOL} apply -n ${this.namespace} -f - \n` +
+            yamlConfiguration + '\n' +
+            '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`);
+    }
+
+    createNamespace(): void {
+        Logger.debug(`${this.getLoggingName(this.createNamespace.name)}: Create namespace "${this.namespace}".`);
+        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)}`;
+    }
+
+    private setNamespace(_namespace: string | undefined): string {
+        _namespace = _namespace !== undefined ? _namespace
+            : TestConstants.TS_SELENIUM_BASE_URL.includes('devspaces') ? TestConstants.TS_SELENIUM_OCP_USERNAME + '-devspaces'
+                : TestConstants.TS_SELENIUM_BASE_URL.includes('che') ? TestConstants.TS_SELENIUM_OCP_USERNAME + '-che'
+                    : 'default';
+        return _namespace;
+    }
+
+    private getServerUrl(): string {
+        Logger.debug(`${this.getLoggingName(this.getServerUrl.name)}: Get server api url.`);
+        return TestConstants.TS_SELENIUM_BASE_URL.replace('devspaces.apps', 'api') + ':6443';
+    }
+}
+
+export namespace KubernetesCommandLineToolsExecutor {
+    export class ContainerTerminal extends KubernetesCommandLineToolsExecutor {
+        constructor(cluster: KubernetesCommandLineToolsExecutor) {
+            super(cluster.getWorkspaceName, cluster.getNamespace);
+        }
+
+        ls(path: string = ''): ShellString {
+            return this.executeCommand('ls ' + path);
+        }
+
+        pwd(): ShellString {
+            return this.executeCommand('pwd');
+        }
+
+        cd(path: string): ShellString {
+            return this.executeCommand('cd ' + path);
+        }
+
+        gitClone(repository: string): ShellString {
+            return this.executeCommand('git clone ' + repository);
+        }
+
+        removeFolder(path: string): ShellString {
+            return this.executeCommand('rm -rf ' + path);
+        }
+    }
+}

package/utils/ShellExecutor.ts

@@ -0,0 +1,13 @@
+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);
+    }
+}

package/dist/utils/OpenshiftClientExecutor.js

@@ -1,98 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OpenshiftClientExecutor = void 0;
-const shelljs_1 = require("shelljs");
-const TestConstants_1 = require("../constants/TestConstants");
-const Logger_1 = require("./Logger");
-class OpenshiftClientExecutor {
-    constructor(_workspaceName, _namespace) {
-        this.workspaceName = _workspaceName;
-        this.namespace = this.setNamespace(_namespace);
-    }
-    get getWorkspaceName() {
-        return this.workspaceName;
-    }
-    get getNamespace() {
-        return this.namespace;
-    }
-    loginToOcp() {
-        Logger_1.Logger.debug('OpenshiftClientExecutor.loginToOcp: Login to the \'OC\' client');
-        const url = this.getServerUrl();
-        Logger_1.Logger.debug(url, TestConstants_1.TestConstants.TS_SELENIUM_OCP_USERNAME);
-        shelljs_1.exec(`sleep 5
-            oc login --server=${url} -u=${TestConstants_1.TestConstants.TS_SELENIUM_OCP_USERNAME} -p=${TestConstants_1.TestConstants.TS_SELENIUM_OCP_PASSWORD} --insecure-skip-tls-verify`);
-    }
-    getContainerName() {
-        Logger_1.Logger.debug(`OpenshiftClientExecutor.getContainerName: Get container name.`);
-        const output = this.execWithLog(`oc get ${(OpenshiftClientExecutor.pod)} -o jsonpath='{.spec.containers[*].name}' -n ${this.namespace}`);
-        shelljs_1.echo('\n');
-        return output.stderr ? output.stderr : output.stdout;
-    }
-    getWorkspacePodName() {
-        Logger_1.Logger.debug('OpenshiftClientExecutor.getWorkspacePodName: Get workspace pod name.');
-        const output = this.execWithLog(`oc get pod -l controller.devfile.io/devworkspace_name=${this.workspaceName} -n ${this.namespace} -o name`);
-        return output.stderr ? output.stderr : output.stdout.replace('\n', '');
-    }
-    deleteDevWorkspace() {
-        Logger_1.Logger.debug(`OpenshiftClientExecutor.deleteWorkspace: Delete '${this.workspaceName}' workspace`);
-        this.execWithLog(`oc patch dw ${this.workspaceName} -n ${this.namespace} -p '{ "metadata": { "finalizers": null }}' --type merge || true`);
-        this.execWithLog(`oc delete dw ${this.workspaceName} -n ${this.namespace} || true`);
-    }
-    applyAndWaitDevWorkspace(yamlConfiguration) {
-        this.apply(yamlConfiguration);
-        const output = this.waitDevWorkspace();
-        OpenshiftClientExecutor.pod = this.getWorkspacePodName();
-        OpenshiftClientExecutor.container = this.getContainerName();
-        return output;
-    }
-    executeCommand(commandToExecute) {
-        Logger_1.Logger.debug('OpenshiftClientExecutor.executeCommand');
-        return this.execWithLog(`oc exec -i ${OpenshiftClientExecutor.pod} -n ${this.namespace} -c ${OpenshiftClientExecutor.container} -- sh -c "${commandToExecute}"`);
-    }
-    apply(yamlConfiguration) {
-        Logger_1.Logger.debug('OpenshiftClientExecutor.apply:');
-        this.execWithLog('cat <<EOF | oc apply -n ' + this.namespace + ' -f - \n' +
-            yamlConfiguration + '\n' +
-            'EOF');
-    }
-    waitDevWorkspace(timeout = 360) {
-        Logger_1.Logger.debug('OpenshiftClientExecutor.wait: Wait till workspace ready.');
-        return this.execWithLog(`oc wait -n ${this.namespace} --for=condition=Ready dw ${this.workspaceName} --timeout=${timeout}s`);
-    }
-    setNamespace(_namespace) {
-        return _namespace !== undefined ? _namespace : TestConstants_1.TestConstants.TS_SELENIUM_OCP_USERNAME + '-devspaces';
-    }
-    getServerUrl() {
-        Logger_1.Logger.debug('OpenshiftClientExecutor.getServerUrl: Get server api url.');
-        return TestConstants_1.TestConstants.TS_SELENIUM_BASE_URL.replace('devspaces.apps', 'api') + ':6443';
-    }
-    execWithLog(command) {
-        shelljs_1.echo(command);
-        return shelljs_1.exec(command);
-    }
-}
-exports.OpenshiftClientExecutor = OpenshiftClientExecutor;
-(function (OpenshiftClientExecutor) {
-    class ContainerTerminal extends OpenshiftClientExecutor {
-        constructor(cluster) {
-            super(cluster.getWorkspaceName, cluster.getNamespace);
-        }
-        ls(path = '') {
-            return this.executeCommand('ls ' + path);
-        }
-        pwd() {
-            return this.executeCommand('pwd');
-        }
-        cd(path) {
-            return this.executeCommand('cd ' + path);
-        }
-        gitClone(repository) {
-            return this.executeCommand('git clone ' + repository);
-        }
-        removeFolder(path) {
-            return this.executeCommand('rm -rf ' + path);
-        }
-    }
-    OpenshiftClientExecutor.ContainerTerminal = ContainerTerminal;
-})(OpenshiftClientExecutor = exports.OpenshiftClientExecutor || (exports.OpenshiftClientExecutor = {}));
-//# sourceMappingURL=OpenshiftClientExecutor.js.map

package/dist/utils/OpenshiftClientExecutor.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"OpenshiftClientExecutor.js","sourceRoot":"","sources":["../../utils/OpenshiftClientExecutor.ts"],"names":[],"mappings":"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"}

package/utils/OpenshiftClientExecutor.ts

@@ -1,117 +0,0 @@
-import { echo, exec, ShellString } from 'shelljs';
-import { TestConstants } from '../constants/TestConstants';
-import { Logger } from './Logger';
-
-export class OpenshiftClientExecutor {
-    protected static container: string;
-    protected static pod: string | undefined;
-    protected workspaceName: string | undefined;
-    protected namespace: string;
-
-    constructor(_workspaceName?: string, _namespace?: string) {
-        this.workspaceName = _workspaceName;
-        this.namespace = this.setNamespace(_namespace);
-    }
-
-    get getWorkspaceName(): string {
-        return <string>this.workspaceName;
-    }
-
-    get getNamespace(): string {
-        return this.namespace;
-    }
-
-    loginToOcp(): void {
-        Logger.debug('OpenshiftClientExecutor.loginToOcp: 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`);
-    }
-
-    getContainerName(): string {
-        Logger.debug(`OpenshiftClientExecutor.getContainerName: Get container name.`);
-        const output: ShellString = this.execWithLog(`oc get ${(OpenshiftClientExecutor.pod)} -o jsonpath='{.spec.containers[*].name}' -n ${this.namespace}`);
-        echo('\n');
-        return output.stderr ? output.stderr : output.stdout;
-    }
-
-    getWorkspacePodName(): string {
-        Logger.debug('OpenshiftClientExecutor.getWorkspacePodName: Get workspace pod name.');
-        const output: ShellString = this.execWithLog(`oc get pod -l controller.devfile.io/devworkspace_name=${this.workspaceName} -n ${this.namespace} -o name`);
-        return output.stderr ? output.stderr : output.stdout.replace('\n', '');
-    }
-
-    deleteDevWorkspace(): void {
-        Logger.debug(`OpenshiftClientExecutor.deleteWorkspace: Delete '${this.workspaceName}' workspace`);
-        this.execWithLog(`oc patch dw ${this.workspaceName} -n ${this.namespace} -p '{ "metadata": { "finalizers": null }}' --type merge || true`);
-        this.execWithLog(`oc delete dw ${this.workspaceName} -n ${this.namespace} || true`);
-    }
-
-    applyAndWaitDevWorkspace(yamlConfiguration: string): ShellString {
-        this.apply(yamlConfiguration);
-        const output: ShellString = this.waitDevWorkspace();
-        OpenshiftClientExecutor.pod = this.getWorkspacePodName();
-        OpenshiftClientExecutor.container = this.getContainerName();
-        return output;
-    }
-
-    executeCommand(commandToExecute: string): ShellString {
-        Logger.debug('OpenshiftClientExecutor.executeCommand');
-        return this.execWithLog(`oc exec -i ${OpenshiftClientExecutor.pod} -n ${this.namespace} -c ${OpenshiftClientExecutor.container} -- sh -c "${commandToExecute}"`);
-    }
-
-    apply(yamlConfiguration: string): void {
-        Logger.debug('OpenshiftClientExecutor.apply:');
-        this.execWithLog('cat <<EOF | oc apply -n ' + this.namespace + ' -f - \n' +
-            yamlConfiguration + '\n' +
-            'EOF');
-    }
-
-    waitDevWorkspace(timeout: number = 360): ShellString {
-        Logger.debug('OpenshiftClientExecutor.wait: Wait till workspace ready.');
-        return this.execWithLog(`oc wait -n ${this.namespace} --for=condition=Ready dw ${this.workspaceName} --timeout=${timeout}s`);
-    }
-
-    private setNamespace(_namespace: string | undefined): string {
-        return _namespace !== undefined ? _namespace : TestConstants.TS_SELENIUM_OCP_USERNAME + '-devspaces';
-    }
-
-    private getServerUrl(): string {
-        Logger.debug('OpenshiftClientExecutor.getServerUrl: Get server api url.');
-        return TestConstants.TS_SELENIUM_BASE_URL.replace('devspaces.apps', 'api') + ':6443';
-    }
-
-    private execWithLog(command: string): ShellString {
-        echo(command);
-        return exec(command);
-    }
-}
-
-export namespace OpenshiftClientExecutor {
-    export class ContainerTerminal extends OpenshiftClientExecutor {
-        constructor(cluster: OpenshiftClientExecutor) {
-            super(cluster.getWorkspaceName, cluster.getNamespace);
-        }
-
-        ls(path: string = ''): ShellString {
-            return this.executeCommand('ls ' + path);
-        }
-
-        pwd(): ShellString {
-            return this.executeCommand('pwd');
-        }
-
-        cd(path: string): ShellString {
-            return this.executeCommand('cd ' + path);
-        }
-
-        gitClone(repository: string): ShellString {
-            return this.executeCommand('git clone ' + repository);
-        }
-
-        removeFolder(path: string): ShellString {
-            return this.executeCommand('rm -rf ' + path);
-        }
-    }
-}