@eclipse-che/che-e2e 7.45.0-dev-0129fe6 → 7.45.0-dev-60c4bc4

package/testsLibrary/LanguageServerTests.ts

@@ -68,6 +68,7 @@ export class LanguageServerTests {
             await this.editor.pressControlSpaceCombination(openedTab);
             await this.editor.waitSuggestionContainer();
             await this.editor.waitSuggestionWithScrolling(openedTab, expectedText);
+            await this.editor.waitTabWithSavedStatus(openedTab);
         });
     }
 

package/testsLibrary/WorkspaceHandlingTests.ts

@@ -14,7 +14,8 @@ import { CLASSES } from '../inversify.types';
 import { Dashboard } from '../pageobjects/dashboard/Dashboard';
 import { CreateWorkspace } from '../pageobjects/dashboard/CreateWorkspace';
 import { Workspaces } from '../pageobjects/dashboard/Workspaces';
-import { WorkspaceNameHandler } from '../utils/WorkspaceNameHandler';
+import { BrowserTabsUtil } from '../utils/BrowserTabsUtil';
+import { Logger } from '..';
 
 @injectable()
 export class WorkspaceHandlingTests {
@@ -29,16 +30,19 @@ export class WorkspaceHandlingTests {
         @inject(CLASSES.Dashboard) private readonly dashboard: Dashboard,
         @inject(CLASSES.CreateWorkspace) private readonly createWorkspace: CreateWorkspace,
         @inject(CLASSES.Workspaces) private readonly workspaces: Workspaces,
-        @inject(CLASSES.WorkspaceNameHandler) private readonly workspaceNameHandler: WorkspaceNameHandler) {}
+        @inject(CLASSES.BrowserTabsUtil) private readonly browserTabsUtil: BrowserTabsUtil) {}
 
     public createAndOpenWorkspace(stack: string) {
         test(`Open 'New Workspace' page`, async () => {
             await this.dashboard.waitPage();
             await this.dashboard.clickCreateWorkspaceButton();
             await this.createWorkspace.waitPage();
+            const parentGUID = await this.browserTabsUtil.getCurrentWindowHandle();
             await this.createWorkspace.clickOnSample(stack);
-            await this.dashboard.waitWorkspaceStartingPage();
-            WorkspaceHandlingTests.workspaceName = await this.workspaceNameHandler.getNameFromUrl();
+            await this.browserTabsUtil.switchToWindow(parentGUID);
+            WorkspaceHandlingTests.workspaceName = await this.dashboard.getRecentWorkspaceName(10000);
+            Logger.debug(`Workspace Name is: ${WorkspaceHandlingTests.workspaceName}`);
+            await this.browserTabsUtil.waitAndSwitchToAnotherWindow(parentGUID, 10000);
         });
     }
 

package/tsconfig.json

@@ -11,6 +11,7 @@
     "types": ["reflect-metadata", "@types/mocha", "@types/node"],
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
+    "noImplicitReturns": false,
     "sourceMap": true
   }
 }

package/tslint.json

@@ -1,123 +1,127 @@
 {
-    "rules": {
-      "ban": [
-        true,
-        [
-          "_",
-          "extend"
-        ],
-        [
-          "_",
-          "isNull"
-        ],
-        [
-          "_",
-          "isDefined"
-        ]
+  "rules": {
+    "ban": [
+      true,
+      [
+        "_",
+        "extend"
       ],
-      "class-name": true,
-      "comment-format": [
-        true,
-        "check-space",
-        "check-lowercase"
+      [
+        "_",
+        "isNull"
       ],
-      "curly": true,
-      "eofline": true,
-      "forin": true,
-      "indent": [
-        true,
-        2
-      ],
-      "interface-name": true,
-      "jsdoc-format": true,
-      "label-position": true,
-      "label-undefined": true,
-      "max-line-length": [
-        false,
-        140
-      ],
-      "member-ordering": [
-        true,
-        "public-before-private",
-        "static-before-instance",
-        "variables-before-functions"
-      ],
-      "no-arg": true,
-      "no-bitwise": true,
-      "no-console": [
-        true,
-        "debug",
-        "info",
-        "time",
-        "timeEnd",
-        "trace"
-      ],
-      "no-construct": true,
-      "no-constructor-vars": true,
-      "no-debugger": true,
-      "no-duplicate-key": true,
-      "no-duplicate-variable": true,
-      "no-empty": true,
-      "no-eval": true,
-      "no-string-literal": true,
-      "no-switch-case-fall-through": true,
-      "no-trailing-comma": true,
-      "no-trailing-whitespace": true,
-      "no-unused-expression": true,
-      "no-unused-variable": true,
-      "no-unreachable": true,
-      "no-use-before-declare": true,
-      "no-var-requires": false,
-      "one-line": [
-        true,
-        "check-open-brace",
-        "check-catch",
-        "check-else",
-        "check-whitespace"
-      ],
-      "quotemark": [
-        true,
-        "single"
-      ],
-      "radix": true,
-      "semicolon": true,
-      "triple-equals": [
-        true,
-        "allow-null-check"
-      ],
-      "typedef": [
-        true,
+      [
+        "_",
+        "isDefined"
+      ]
+    ],
+    "class-name": true,
+    "comment-format": [
+      true,
+      "check-space",
+      "check-lowercase"
+    ],
+    "curly": true,
+    "eofline": true,
+    "forin": true,
+    "indent": [
+      true,
+      2
+    ],
+    "interface-name": true,
+    "jsdoc-format": true,
+    "label-position": true,
+    "max-line-length": [
+      false,
+      140
+    ],
+    "member-ordering": [
+      true,
+      "public-before-private",
+      "static-before-instance",
+      "variables-before-functions"
+    ],
+    "no-arg": true,
+    "no-bitwise": true,
+    "no-console": [
+      true,
+      "debug",
+      "info",
+      "time",
+      "timeEnd",
+      "trace"
+    ],
+    "no-construct": true,
+    "no-parameter-properties": false,
+    "no-debugger": true,
+    "no-duplicate-variable": true,
+    "no-empty": true,
+    "no-eval": true,
+    "no-string-literal": true,
+    "no-switch-case-fall-through": true,
+    "trailing-comma": [true, {
+      "singleline": "never",
+      "multiline": {
+        "objects": "ignore",
+        "arrays": "always",
+        "functions": "never",
+        "typeLiterals": "ignore"
+      }
+    }],
+    "no-trailing-whitespace": true,
+    "no-unused-expression": true,
+    "no-unused-variable": true,
+    "no-use-before-declare": true,
+    "no-var-requires": false,
+    "one-line": [
+      true,
+      "check-open-brace",
+      "check-catch",
+      "check-else",
+      "check-whitespace"
+    ],
+    "quotemark": [
+      true,
+      "single"
+    ],
+    "radix": true,
+    "semicolon": true,
+    "triple-equals": [
+      true,
+      "allow-null-check"
+    ],
+    "typedef": [
+      true,
+      "callSignature",
+      "indexSignature",
+      "parameter",
+      "propertySignature",
+      "variableDeclarator"
+    ],
+    "typedef-whitespace": [
+      true,
+      [
         "callSignature",
-        "indexSignature",
-        "parameter",
-        "propertySignature",
-        "variableDeclarator"
+        "noSpace"
       ],
-      "typedef-whitespace": [
-        true,
-        [
-          "callSignature",
-          "noSpace"
-        ],
-        [
-          "catchClause",
-          "noSpace"
-        ],
-        [
-          "indexSignature",
-          "space"
-        ]
+      [
+        "catchClause",
+        "noSpace"
       ],
-      "use-strict": false,
-      "variable-name": false,
-      "whitespace": [
-        true,
-        "check-branch",
-        "check-decl",
-        "check-operator",
-        "check-separator",
-        "check-type"
+      [
+        "indexSignature",
+        "space"
       ]
-    }
+    ],
+    "use-strict": false,
+    "variable-name": false,
+    "whitespace": [
+      true,
+      "check-branch",
+      "check-decl",
+      "check-operator",
+      "check-separator",
+      "check-type"
+    ]
   }
-  
+}

package/utils/requestHandlers/headers/CheMultiuserAuthorizationHeaderHandler.ts

@@ -8,20 +8,14 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 import { AxiosRequestConfig } from 'axios';
-
-import { TYPES } from '../../../inversify.types';
 import { IAuthorizationHeaderHandler } from './IAuthorizationHeaderHandler';
-import { injectable, inject } from 'inversify';
-import { ITokenHandler } from '../tokens/ITokenHandler';
+import { injectable } from 'inversify';
 
 @injectable()
 export class CheMultiuserAuthorizationHeaderHandler implements IAuthorizationHeaderHandler {
 
-    constructor(@inject(TYPES.ITokenHandler) private readonly tokenHandler: ITokenHandler) {
-    }
-
     async get(): Promise<AxiosRequestConfig> {
-        const token = await this.tokenHandler.get();
-        return { headers: { 'Authorization': `Bearer ${token}` } };
+        //  to-do : Fetch the cookies from user api and pass it here
+        return { headers: { 'cookie': `` } };
     }
 }

package/utils/requestHandlers/tokens/CheMultiuserTokenHandler.ts

@@ -12,28 +12,30 @@ import querystring from 'querystring';
 import { injectable } from 'inversify';
 import { TestConstants } from '../../../TestConstants';
 import { ITokenHandler } from './ITokenHandler';
-import { KeycloackUrlHandler } from '../../KeycloackUrlHandler';
+
 
 @injectable()
 export class CheMultiuserTokenHandler implements ITokenHandler {
-    async get(): Promise<string> {
-        const keycloakUrl = KeycloackUrlHandler.getTokenEndpointUrl();
-
-        const params = {
-            client_id: 'che-public',
-            username: TestConstants.TS_SELENIUM_USERNAME,
-            password: TestConstants.TS_SELENIUM_PASSWORD,
-            grant_type: 'password'
-        };
+  async get(): Promise<string> {
+    //   to-do: Login to the che-dashboard and fetch the authorization related info
+    const keycloakUrl = '';
 
-        try {
-            const responseToObtainBearerToken = await axios.post(keycloakUrl, querystring.stringify(params));
-            return responseToObtainBearerToken.data.access_token;
-        } catch (err) {
-            console.log(`Can not get bearer token. URL used: ${keycloakUrl}`);
-            throw err;
-        }
+    const params = {
+      client_id: 'che-public',
+      username: TestConstants.TS_SELENIUM_USERNAME,
+      password: TestConstants.TS_SELENIUM_PASSWORD,
+      grant_type: 'password',
+    };
 
+    try {
+      const responseToObtainBearerToken = await axios.post(
+        keycloakUrl,
+        querystring.stringify(params)
+      );
+      return responseToObtainBearerToken.data.access_token;
+    } catch (err) {
+      console.log(`Can not get bearer token. URL used: ${keycloakUrl}`);
+      throw err;
     }
-
+  }
 }

package/dist/utils/KeycloackUrlHandler.js

@@ -1,30 +0,0 @@
-"use strict";
-/*********************************************************************
- * Copyright (c) 2019 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- **********************************************************************/
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.KeycloackUrlHandler = void 0;
-const TestConstants_1 = require("../TestConstants");
-class KeycloackUrlHandler {
-    static getBaseKeycloakUrl() {
-        let baseKeycloakUrl = TestConstants_1.TestConstants.TS_SELENIUM_BASE_URL;
-        if (!TestConstants_1.TestConstants.TS_SELENIUM_SINGLE_HOST) {
-            baseKeycloakUrl = baseKeycloakUrl.replace('che', 'keycloak');
-        }
-        return baseKeycloakUrl;
-    }
-    static getTokenEndpointUrl() {
-        return `${this.getBaseKeycloakUrl()}/auth/realms/che/protocol/openid-connect/token`;
-    }
-    static getIdentityCallbackUrl() {
-        return `${this.getBaseKeycloakUrl()}/auth/realms/che/broker/github/endpoint`;
-    }
-}
-exports.KeycloackUrlHandler = KeycloackUrlHandler;
-//# sourceMappingURL=KeycloackUrlHandler.js.map

package/dist/utils/KeycloackUrlHandler.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"KeycloackUrlHandler.js","sourceRoot":"","sources":["../../utils/KeycloackUrlHandler.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;AAExE,oDAAiD;AAEjD,MAAa,mBAAmB;IACrB,MAAM,CAAC,kBAAkB;QAC5B,IAAI,eAAe,GAAW,6BAAa,CAAC,oBAAoB,CAAC;QAEjE,IAAI,CAAC,6BAAa,CAAC,uBAAuB,EAAE;YACxC,eAAe,GAAG,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;SAChE;QAED,OAAO,eAAe,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,mBAAmB;QAC7B,OAAO,GAAG,IAAI,CAAC,kBAAkB,EAAE,gDAAgD,CAAC;IACxF,CAAC;IAEM,MAAM,CAAC,sBAAsB;QAChC,OAAO,GAAG,IAAI,CAAC,kBAAkB,EAAE,yCAAyC,CAAC;IACjF,CAAC;CAEJ;AAnBD,kDAmBC"}

package/utils/KeycloackUrlHandler.ts

@@ -1,32 +0,0 @@
-/*********************************************************************
- * Copyright (c) 2019 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- **********************************************************************/
-
-import { TestConstants } from '../TestConstants';
-
-export class KeycloackUrlHandler {
-    public static getBaseKeycloakUrl(): string {
-        let baseKeycloakUrl: string = TestConstants.TS_SELENIUM_BASE_URL;
-
-        if (!TestConstants.TS_SELENIUM_SINGLE_HOST) {
-            baseKeycloakUrl = baseKeycloakUrl.replace('che', 'keycloak');
-        }
-
-        return baseKeycloakUrl;
-    }
-
-    public static getTokenEndpointUrl(): string {
-        return `${this.getBaseKeycloakUrl()}/auth/realms/che/protocol/openid-connect/token`;
-    }
-
-    public static getIdentityCallbackUrl(): string {
-        return `${this.getBaseKeycloakUrl()}/auth/realms/che/broker/github/endpoint`;
-    }
-
-}