@eclipse-che/che-e2e 7.64.0-dev-9dbc63a → 7.64.0-dev-01207b1

package/tests-library/WorkspaceHandlingTests.ts

@@ -51,6 +51,7 @@ export class WorkspaceHandlingTests {
 
     public createAndOpenWorkspace(stack: string): void {
         test(`Create and open new workspace, stack:${stack}`, async () => {
+            await this.dashboard.clickWorkspacesButton();
             await this.dashboard.waitPage();
             Logger.debug(`Fetching user kubernetes namespace, storing auth token by getting workspaces API URL.`);
             await this.apiUrlResolver.getWorkspacesApiUrl();

package/utils/CheReporter.ts

@@ -36,7 +36,7 @@ class CheReporter extends mocha.reporters.Spec {
   constructor(runner: mocha.Runner, options: mocha.MochaOptions) {
     super(runner, options);
 
-    runner.on('start', async () => {
+    runner.on('start', async (): Promise<void> => {
       let launchInformation: string =
         `################## Launch Information ##################
 
@@ -155,7 +155,7 @@ class CheReporter extends mocha.reporters.Spec {
       screenshotStream.write(Buffer.from(screenshot, 'base64'));
       screenshotStream.end();
 
-      // take pagesource and write to file
+      // take page source and write to file
       const pageSource: string = await driverHelper.getDriver().getPageSource();
       const pageSourceStream: WriteStream = fs.createWriteStream(pageSourceFileName);
       pageSourceStream.write(Buffer.from(pageSource));

package/utils/DriverHelper.ts

@@ -22,7 +22,7 @@ export class DriverHelper {
     private readonly driver: ThenableWebDriver;
 
     constructor(@inject(TYPES.Driver) driver: IDriver) {
-        this.driver = driver.get();
+        this.driver = driver.get() as ThenableWebDriver;
     }
 
     public getAction(): Actions {

package/utils/OpenshiftClientExecutor.ts

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

package/utils/vsc/GitUtil.ts

@@ -19,7 +19,7 @@ export class GitUtil {
      * @param url git https url (which using for "git clone")
      * @return project name
      */
-    getProjectNameFromGitUrl(url: string): string {
+    static getProjectNameFromGitUrl(url: string): string {
         return url.split(/[\/.]/).filter((e: string) => e !== '' && e !== 'git').reverse()[0];
     }
 }

package/dist/specs/devfiles/EmptyWorkspace.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"EmptyWorkspace.spec.js","sourceRoot":"","sources":["../../../specs/devfiles/EmptyWorkspace.spec.ts"],"names":[],"mappings":";;AAAA;;;;;;;;wEAQwE;AACxE,qEAA8D;AAC9D,6DAA0E;AAC1E,mEAAwD;AACxD,uFAAoF;AACpF,+CAA4C;AAG5C,8CAAyD;AAEzD,MAAM,sBAAsB,GAA2B,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,sBAAsB,CAAC,CAAC;AACxG,MAAM,mBAAmB,GAAwB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,mBAAmB,CAAC,CAAC;AAC/F,MAAM,UAAU,GAAe,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,UAAU,CAAC,CAAC;AACpE,MAAM,SAAS,GAAW,iBAAiB,CAAC;AAE5C,KAAK,CAAC,GAAG,SAAS,OAAO,EAAE,KAAK,IAAI,EAAE;IAClC,KAAK,CAAC,UAAU,SAAS,YAAY,EAAE,KAAK,IAAI,EAAE;QAC9C,UAAU,CAAC,YAAY,EAAE,CAAC;QAC1B,sBAAsB,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC;QACzD,sBAAsB,CAAC,mCAAmC,EAAE,CAAC;QAC7D,IAAI,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;YAC1C,qCAAwB,CAAC,+CAAsB,CAAC,gBAAgB,EAAE,CAAC,CAAC;QACxE,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,0BAA0B,EAAE,KAAK,IAAG,EAAE;YACvC,MAAM,mBAAmB,CAAC,sCAAsC,EAAE,CAAC;YAEnE,MAAM,SAAS,GAAc,IAAI,+BAAS,EAAE,CAAC;YAC7C,MAAM,WAAW,GAAgB,SAAS,CAAC,cAAc,EAAE,CAAC;YAC5D,MAAM,mBAAmB,GAAkB,MAAM,WAAW,CAAC,eAAe,EAAE,CAAC;YAE/E,eAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;YACjC,KAAK,MAAM,OAAO,IAAI,mBAAmB,EAAE;gBACvC,eAAM,CAAC,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;aAC/C;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;QACpD,IAAI,CAAC,2BAA2B,EAAE,KAAK,IAAI,EAAE;YACzC,MAAM,sBAAsB,CAAC,sBAAsB,CAAC,+CAAsB,CAAC,gBAAgB,EAAE,CAAC,CAAC;QACnG,CAAC,CAAC,CAAC;QACH,UAAU,CAAC,aAAa,EAAE,CAAC;IAC/B,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/dist/specs/devfiles/Quarkus.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Quarkus.spec.js","sourceRoot":"","sources":["../../../specs/devfiles/Quarkus.spec.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;AAExE,6DAA+D;AAC/D,8CAAyD;AAEzD,qEAA8D;AAC9D,mEAAwD;AACxD,uFAAoF;AAEpF,+CAA4C;AAE5C,MAAM,SAAS,GAAW,sBAAsB,CAAC;AACjD,MAAM,WAAW,GAAW,qBAAqB,CAAC;AAClD,MAAM,mBAAmB,GAAwB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,mBAAmB,CAAC,CAAC;AAC/F,MAAM,sBAAsB,GAA2B,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,sBAAsB,CAAC,CAAC;AACxG,MAAM,UAAU,GAAe,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,UAAU,CAAC,CAAC;AAEpE,KAAK,CAAC,OAAO,SAAS,YAAY,EAAE,KAAK;IACrC,IAAI,cAA2B,CAAC;IAChC,KAAK,CAAC,yBAAyB,SAAS,SAAS,EAAE,KAAK;QACpD,UAAU,CAAC,YAAY,EAAE,CAAC;QAC1B,sBAAsB,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC;QACzD,sBAAsB,CAAC,mCAAmC,EAAE,CAAC;QAC7D,IAAI,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;YAC1C,qCAAwB,CAAC,+CAAsB,CAAC,gBAAgB,EAAE,CAAC,CAAC;QACxE,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,0BAA0B,EAAE,KAAK;YAClC,MAAM,mBAAmB,CAAC,sCAAsC,EAAE,CAAC;QACvE,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,yCAAyC,EAAE,KAAK;YACjD,cAAc,GAAG,MAAM,IAAI,iCAAW,EAAE,CAAC,UAAU,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;YAC9E,eAAM,CAAC,KAAK,CAAC,kDAAkD,WAAW,EAAE,CAAC,CAAC;QAClF,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,sCAAsC,EAAE,KAAK;YAC9C,MAAM,KAAK,GAAW,cAAc,CAAC;YACrC,MAAM,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACrC,eAAM,CAAC,KAAK,CAAC,iCAAiC,KAAK,EAAE,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,qCAAqC,EAAE,KAAK;YAC7C,MAAM,sBAAsB,CAAC,sBAAsB,CAAC,+CAAsB,CAAC,gBAAgB,EAAE,CAAC,CAAC;QACnG,CAAC,CAAC,CAAC;QACH,UAAU,CAAC,aAAa,EAAE,CAAC;IAC/B,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}