@eclipse-che/che-e2e 7.72.0-dev-4dc1021 → 7.72.0

package/dist/pageobjects/dashboard/Dashboard.js

@@ -31,19 +31,12 @@ const DriverHelper_1 = require("../../utils/DriverHelper");
 const TimeoutConstants_1 = require("../../constants/TimeoutConstants");
 const Workspaces_1 = require("./Workspaces");
 const Logger_1 = require("../../utils/Logger");
-const OAuthConstants_1 = require("../../constants/OAuthConstants");
 const BaseTestConstants_1 = require("../../constants/BaseTestConstants");
 let Dashboard = Dashboard_1 = class Dashboard {
     constructor(driverHelper, workspaces) {
         this.driverHelper = driverHelper;
         this.workspaces = workspaces;
     }
-    static getUserDropdownMenuButtonLocator() {
-        Logger_1.Logger.debug(`Dashboard.getUserDropdownMenuButtonLocator: get current user.`);
-        const currentUser = OAuthConstants_1.OAuthConstants.TS_SELENIUM_OCP_USERNAME;
-        Logger_1.Logger.debug(`Dashboard.getUserDropdownMenuButtonLocator: ${currentUser}.`);
-        return selenium_webdriver_1.By.xpath(`//*[text()="${currentUser}"]//parent::button`);
-    }
     async stopWorkspaceByUI(workspaceName) {
         Logger_1.Logger.debug(`Dashboard.stopWorkspaceByUI "${workspaceName}"`);
         await this.clickWorkspacesButton();
@@ -75,56 +68,45 @@ let Dashboard = Dashboard_1 = class Dashboard {
     }
     async waitPage(timeout = TimeoutConstants_1.TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT) {
         Logger_1.Logger.debug('Dashboard.waitPage');
-        await this.driverHelper.waitVisibility(selenium_webdriver_1.By.xpath(Dashboard_1.WORKSPACES_BUTTON_XPATH), timeout);
-        await this.driverHelper.waitVisibility(selenium_webdriver_1.By.xpath(Dashboard_1.CREATE_WORKSPACE_BUTTON_XPATH), timeout);
+        await this.driverHelper.waitVisibility(Dashboard_1.WORKSPACES_BUTTON, timeout);
+        await this.driverHelper.waitVisibility(Dashboard_1.CREATE_WORKSPACE_BUTTON, timeout);
     }
     async clickWorkspacesButton(timeout = TimeoutConstants_1.TimeoutConstants.TS_CLICK_DASHBOARD_ITEM_TIMEOUT) {
         Logger_1.Logger.debug('Dashboard.clickWorkspacesButton');
-        await this.driverHelper.waitAndClick(selenium_webdriver_1.By.xpath(Dashboard_1.WORKSPACES_BUTTON_XPATH), timeout);
+        await this.driverHelper.waitAndClick(Dashboard_1.WORKSPACES_BUTTON, timeout);
     }
     async clickCreateWorkspaceButton(timeout = TimeoutConstants_1.TimeoutConstants.TS_CLICK_DASHBOARD_ITEM_TIMEOUT) {
         Logger_1.Logger.debug('Dashboard.clickCreateWorkspaceButton');
-        await this.driverHelper.waitAndClick(selenium_webdriver_1.By.xpath(Dashboard_1.CREATE_WORKSPACE_BUTTON_XPATH), timeout);
+        await this.driverHelper.waitAndClick(Dashboard_1.CREATE_WORKSPACE_BUTTON, timeout);
     }
     async getLoaderAlert(timeout = TimeoutConstants_1.TimeoutConstants.TS_WAIT_LOADER_PRESENCE_TIMEOUT) {
         Logger_1.Logger.debug('Dashboard.getLoaderAlert');
-        return await this.driverHelper.waitAndGetText(selenium_webdriver_1.By.xpath(Dashboard_1.LOADER_ALERT_XPATH), timeout);
+        return await this.driverHelper.waitAndGetText(Dashboard_1.LOADER_ALERT, timeout);
     }
     async waitLoader(timeout = TimeoutConstants_1.TimeoutConstants.TS_WAIT_LOADER_PRESENCE_TIMEOUT) {
         Logger_1.Logger.debug('Dashboard.waitLoader');
-        await this.driverHelper.waitAllPresence(selenium_webdriver_1.By.xpath(Dashboard_1.LOADER_PAGE_STEP_TITLES_XPATH), timeout);
-    }
-    async waitLoaderDisappearance(timeout = TimeoutConstants_1.TimeoutConstants.TS_WAIT_LOADER_ABSENCE_TIMEOUT) {
-        Logger_1.Logger.debug('Dashboard.waitLoaderDisappearance');
-        await this.driverHelper.waitDisappearance(selenium_webdriver_1.By.xpath(Dashboard_1.LOADER_PAGE_STEP_TITLES_XPATH), timeout);
-    }
-    async waitDisappearanceNavigationMenu(timeout = TimeoutConstants_1.TimeoutConstants.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
-        Logger_1.Logger.debug('Dashboard.waitDisappearanceNavigationMenu');
-        await this.driverHelper.waitDisappearance(selenium_webdriver_1.By.id('chenavmenu'), timeout);
+        await this.driverHelper.waitAllPresence(Dashboard_1.LOADER_PAGE_STEP_TITLES, timeout);
     }
     async waitStartingPageLoaderDisappearance(timeout = TimeoutConstants_1.TimeoutConstants.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
         Logger_1.Logger.debug(`Dashboard.waitStartingPageLoaderDisappearance`);
-        await this.driverHelper.waitDisappearance(selenium_webdriver_1.By.css(Dashboard_1.STARTING_PAGE_LOADER_CSS), timeout);
+        await this.driverHelper.waitDisappearance(Dashboard_1.STARTING_PAGE_LOADER, timeout);
         await this.driverHelper.wait(TimeoutConstants_1.TimeoutConstants.TS_SELENIUM_DEFAULT_POLLING);
     }
-    async getRecentWorkspaceName(timeout = TimeoutConstants_1.TimeoutConstants.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
-        Logger_1.Logger.debug(`Dashboard.getRecentWorkspaceName`);
-        return await this.driverHelper.waitAndGetText(selenium_webdriver_1.By.css('[data-testid="recent-workspace-item"]'), timeout);
-    }
     async logout(timeout = TimeoutConstants_1.TimeoutConstants.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
         Logger_1.Logger.debug(`Dashboard.logout`);
         await this.openDashboard();
-        await this.driverHelper.waitAndClick(Dashboard_1.getUserDropdownMenuButtonLocator(), timeout);
-        await this.driverHelper.waitAndClick(selenium_webdriver_1.By.xpath(Dashboard_1.LOGOUT_BUTTON_XPATH), timeout);
-        await this.driverHelper.waitDisappearance(Dashboard_1.getUserDropdownMenuButtonLocator(), timeout);
+        await this.driverHelper.waitAndClick(Dashboard_1.USER_SETTINGS_DROPDOWN, timeout);
+        await this.driverHelper.waitAndClick(Dashboard_1.LOGOUT_BUTTON, timeout);
+        await this.driverHelper.waitDisappearance(Dashboard_1.USER_SETTINGS_DROPDOWN, timeout);
     }
 };
-Dashboard.WORKSPACES_BUTTON_XPATH = `//div[@id='page-sidebar']//a[contains(text(), 'Workspaces (')]`;
-Dashboard.CREATE_WORKSPACE_BUTTON_XPATH = `//div[@id='page-sidebar']//a[text()='Create Workspace']`;
-Dashboard.LOADER_PAGE_STEP_TITLES_XPATH = '//*[@data-testid="step-title"]';
-Dashboard.STARTING_PAGE_LOADER_CSS = '.main-page-loader';
-Dashboard.LOADER_ALERT_XPATH = '//*[@data-testid="loader-alert"]';
-Dashboard.LOGOUT_BUTTON_XPATH = '//button[text()="Logout"]';
+Dashboard.WORKSPACES_BUTTON = selenium_webdriver_1.By.xpath(`//div[@id='page-sidebar']//a[contains(text(), 'Workspaces (')]`);
+Dashboard.CREATE_WORKSPACE_BUTTON = selenium_webdriver_1.By.xpath(`//div[@id='page-sidebar']//a[text()='Create Workspace']`);
+Dashboard.LOADER_PAGE_STEP_TITLES = selenium_webdriver_1.By.xpath('//*[@data-testid="step-title"]');
+Dashboard.STARTING_PAGE_LOADER = selenium_webdriver_1.By.css('.main-page-loader');
+Dashboard.LOADER_ALERT = selenium_webdriver_1.By.xpath('//*[@data-testid="loader-alert"]');
+Dashboard.LOGOUT_BUTTON = selenium_webdriver_1.By.xpath('//button[text()="Logout"]');
+Dashboard.USER_SETTINGS_DROPDOWN = selenium_webdriver_1.By.xpath('//header//button/span[text()!=\'\']//parent::button');
 Dashboard = Dashboard_1 = __decorate([
     inversify_1.injectable(),
     __param(0, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),

package/dist/pageobjects/dashboard/Dashboard.js.map

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

package/dist/specs/SmokeTest.spec.js

@@ -17,12 +17,14 @@ const MochaHooks_1 = require("./MochaHooks");
 const Logger_1 = require("../utils/Logger");
 const StringUtil_1 = require("../utils/StringUtil");
 const FactoryTestConstants_1 = require("../constants/FactoryTestConstants");
-const factoryUrl = FactoryTestConstants_1.FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_REPO_URL || 'https://github.com/che-incubator/quarkus-api-example.git';
+const chai_1 = require("chai");
+const BaseTestConstants_1 = require("../constants/BaseTestConstants");
 const projectAndFileTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.ProjectAndFileTests);
 const workspaceHandlingTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.WorkspaceHandlingTests);
 const loginTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.LoginTests);
-let projectName;
+const browserTabsUtil = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.BrowserTabsUtil);
 suite(`The SmokeTest userstory`, async function () {
+    const factoryUrl = FactoryTestConstants_1.FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_REPO_URL || 'https://github.com/che-incubator/quarkus-api-example.git';
     let projectSection;
     suite(`Create workspace from factory:${factoryUrl}`, async function () {
         loginTests.loginIntoChe();
@@ -35,18 +37,23 @@ suite(`The SmokeTest userstory`, async function () {
             await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
         });
         test('Check a project folder has been created', async function () {
-            projectName = StringUtil_1.StringUtil.getProjectNameFromGitUrl(factoryUrl);
+            const projectName = StringUtil_1.StringUtil.getProjectNameFromGitUrl(factoryUrl);
             projectSection = await new monaco_page_objects_1.SideBarView().getContent().getSection(projectName);
             Logger_1.Logger.debug(`new SideBarView().getContent().getSection: get ${projectName}`);
         });
         test('Check the project files was imported', async function () {
-            const label = 'devfile.yaml';
-            await projectSection.findItem(label);
-            Logger_1.Logger.debug(`projectSection.findItem: find ${label}`);
+            Logger_1.Logger.debug(`projectSection.findItem: find ${BaseTestConstants_1.BaseTestConstants.TS_SELENIUM_PROJECT_ROOT_FILE_NAME}`);
+            const isFileImported = await projectSection.findItem(BaseTestConstants_1.BaseTestConstants.TS_SELENIUM_PROJECT_ROOT_FILE_NAME);
+            chai_1.expect(isFileImported).not.eqls(undefined);
         });
-        test('Stopping and deleting the workspace', async function () {
-            await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName());
+        test('Stop the workspace', async function () {
+            await workspaceHandlingTests.stopWorkspace(WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName());
+            await browserTabsUtil.closeAllTabsExceptCurrent();
         });
+        test('Delete the workspace', async function () {
+            await workspaceHandlingTests.removeWorkspace(WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName());
+        });
+        loginTests.logoutFromChe();
     });
 });
 //# sourceMappingURL=SmokeTest.spec.js.map

package/dist/specs/SmokeTest.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"SmokeTest.spec.js","sourceRoot":"","sources":["../../specs/SmokeTest.spec.ts"],"names":[],"mappings":";;AAAA;;;;;;;;wEAQwE;AACxE,6DAA+D;AAE/D,gEAAqD;AACrD,kEAA2D;AAC3D,oFAAiF;AACjF,6CAAwD;AACxD,4CAAyC;AAEzC,oDAAiD;AACjD,4EAAyE;AAEzE,MAAM,UAAU,GAAW,2CAAoB,CAAC,gCAAgC,IAAI,0DAA0D,CAAC;AAC/I,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;AACpE,IAAI,WAAmB,CAAC;AAExB,KAAK,CAAC,yBAAyB,EAAE,KAAK;IAClC,IAAI,cAA2B,CAAC;IAChC,KAAK,CAAC,iCAAiC,UAAU,EAAE,EAAE,KAAK;QACtD,UAAU,CAAC,YAAY,EAAE,CAAC;QAC1B,sBAAsB,CAAC,uCAAuC,CAAC,UAAU,CAAC,CAAC;QAC3E,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,WAAW,GAAG,uBAAU,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;YAC9D,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;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
+{"version":3,"file":"SmokeTest.spec.js","sourceRoot":"","sources":["../../specs/SmokeTest.spec.ts"],"names":[],"mappings":";;AAAA;;;;;;;;wEAQwE;AACxE,6DAAyE;AAEzE,gEAAqD;AACrD,kEAA2D;AAC3D,oFAAiF;AACjF,6CAAwD;AACxD,4CAAyC;AAEzC,oDAAiD;AACjD,4EAAyE;AAEzE,+BAA8B;AAC9B,sEAAmE;AAEnE,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;AACpE,MAAM,eAAe,GAAoB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,eAAe,CAAC,CAAC;AAEnF,KAAK,CAAC,yBAAyB,EAAE,KAAK;IAClC,MAAM,UAAU,GAAW,2CAAoB,CAAC,gCAAgC,IAAI,0DAA0D,CAAC;IAC/I,IAAI,cAA2B,CAAC;IAChC,KAAK,CAAC,iCAAiC,UAAU,EAAE,EAAE,KAAK;QACtD,UAAU,CAAC,YAAY,EAAE,CAAC;QAC1B,sBAAsB,CAAC,uCAAuC,CAAC,UAAU,CAAC,CAAC;QAC3E,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,MAAM,WAAW,GAAW,uBAAU,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;YAC5E,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,eAAM,CAAC,KAAK,CAAC,iCAAiC,qCAAiB,CAAC,kCAAkC,EAAE,CAAC,CAAC;YACtG,MAAM,cAAc,GAAyB,MAAM,cAAc,CAAC,QAAQ,CAAC,qCAAiB,CAAC,kCAAkC,CAAC,CAAC;YACjI,aAAM,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC/C,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,oBAAoB,EAAE,KAAK;YAC5B,MAAM,sBAAsB,CAAC,aAAa,CAAC,+CAAsB,CAAC,gBAAgB,EAAE,CAAC,CAAC;YACtF,MAAM,eAAe,CAAC,yBAAyB,EAAE,CAAC;QACtD,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,sBAAsB,EAAE,KAAK;YAC9B,MAAM,sBAAsB,CAAC,eAAe,CAAC,+CAAsB,CAAC,gBAAgB,EAAE,CAAC,CAAC;QAC5F,CAAC,CAAC,CAAC;QACH,UAAU,CAAC,aAAa,EAAE,CAAC;IAC/B,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/dist/specs/dashboard-samples/EmptyWorkspace.spec.js

@@ -21,33 +21,29 @@ const loginTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES
 const browserTabsUtil = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.BrowserTabsUtil);
 const stackName = 'Empty Workspace';
 suite(`${stackName} test`, async () => {
-    suite(`Create ${stackName} workspace`, async () => {
-        loginTests.loginIntoChe();
-        workspaceHandlingTests.createAndOpenWorkspace(stackName);
-        workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
-        test('Register running workspace', async () => {
-            MochaHooks_1.registerRunningWorkspace(WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName());
-        });
-        test('Wait workspace readiness', async () => {
-            await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
-            const workbench = new monaco_page_objects_1.Workbench();
-            const activityBar = workbench.getActivityBar();
-            const activityBarControls = await activityBar.getViewControls();
-            Logger_1.Logger.debug(`Editor sections:`);
-            for (const control of activityBarControls) {
-                Logger_1.Logger.debug(`${await control.getTitle()}`);
-            }
-        });
+    loginTests.loginIntoChe();
+    workspaceHandlingTests.createAndOpenWorkspace(stackName);
+    workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
+    test('Register running workspace', async () => {
+        MochaHooks_1.registerRunningWorkspace(WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName());
     });
-    suite('Stopping and deleting the workspace', async () => {
-        test('Stop the workspace', async function () {
-            await workspaceHandlingTests.stopWorkspace(WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName());
-            await browserTabsUtil.closeAllTabsExceptCurrent();
-        });
-        test('Delete the workspace', async function () {
-            await workspaceHandlingTests.removeWorkspace(WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName());
-        });
-        loginTests.logoutFromChe();
+    test('Wait workspace readiness', async () => {
+        await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
+        const workbench = new monaco_page_objects_1.Workbench();
+        const activityBar = workbench.getActivityBar();
+        const activityBarControls = await activityBar.getViewControls();
+        Logger_1.Logger.debug(`Editor sections:`);
+        for (const control of activityBarControls) {
+            Logger_1.Logger.debug(`${await control.getTitle()}`);
+        }
     });
+    test('Stop the workspace', async function () {
+        await workspaceHandlingTests.stopWorkspace(WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName());
+        await browserTabsUtil.closeAllTabsExceptCurrent();
+    });
+    test('Delete the workspace', async function () {
+        await workspaceHandlingTests.removeWorkspace(WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName());
+    });
+    loginTests.logoutFromChe();
 });
 //# sourceMappingURL=EmptyWorkspace.spec.js.map

package/dist/specs/dashboard-samples/EmptyWorkspace.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"EmptyWorkspace.spec.js","sourceRoot":"","sources":["../../../specs/dashboard-samples/EmptyWorkspace.spec.ts"],"names":[],"mappings":";;AAAA;;;;;;;;wEAQwE;AACxE,qEAA8D;AAC9D,6DAA0E;AAC1E,mEAAwD;AACxD,uFAAoF;AACpF,+CAA4C;AAG5C,8CAAyD;AAGzD,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,eAAe,GAAoB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,eAAe,CAAC,CAAC;AAEnF,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,oBAAoB,EAAE,KAAK;YAC5B,MAAM,sBAAsB,CAAC,aAAa,CAAC,+CAAsB,CAAC,gBAAgB,EAAE,CAAC,CAAC;YACtF,MAAM,eAAe,CAAC,yBAAyB,EAAE,CAAC;QACtD,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,sBAAsB,EAAE,KAAK;YAC9B,MAAM,sBAAsB,CAAC,eAAe,CAAC,+CAAsB,CAAC,gBAAgB,EAAE,CAAC,CAAC;QAC5F,CAAC,CAAC,CAAC;QACH,UAAU,CAAC,aAAa,EAAE,CAAC;IAC/B,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
+{"version":3,"file":"EmptyWorkspace.spec.js","sourceRoot":"","sources":["../../../specs/dashboard-samples/EmptyWorkspace.spec.ts"],"names":[],"mappings":";;AAAA;;;;;;;;wEAQwE;AACxE,qEAA8D;AAC9D,6DAA0E;AAC1E,mEAAwD;AACxD,uFAAoF;AACpF,+CAA4C;AAG5C,8CAAyD;AAGzD,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,eAAe,GAAoB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,eAAe,CAAC,CAAC;AAEnF,MAAM,SAAS,GAAW,iBAAiB,CAAC;AAE5C,KAAK,CAAC,GAAG,SAAS,OAAO,EAAE,KAAK,IAAI,EAAE;IAClC,UAAU,CAAC,YAAY,EAAE,CAAC;IAE1B,sBAAsB,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC;IAEzD,sBAAsB,CAAC,mCAAmC,EAAE,CAAC;IAE7D,IAAI,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;QAC1C,qCAAwB,CAAC,+CAAsB,CAAC,gBAAgB,EAAE,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,0BAA0B,EAAE,KAAK,IAAI,EAAE;QACxC,MAAM,mBAAmB,CAAC,sCAAsC,EAAE,CAAC;QAEnE,MAAM,SAAS,GAAc,IAAI,+BAAS,EAAE,CAAC;QAC7C,MAAM,WAAW,GAAgB,SAAS,CAAC,cAAc,EAAE,CAAC;QAC5D,MAAM,mBAAmB,GAAkB,MAAM,WAAW,CAAC,eAAe,EAAE,CAAC;QAE/E,eAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACjC,KAAK,MAAM,OAAO,IAAI,mBAAmB,EAAE;YACvC,eAAM,CAAC,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;SAC/C;IACL,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,oBAAoB,EAAE,KAAK;QAC5B,MAAM,sBAAsB,CAAC,aAAa,CAAC,+CAAsB,CAAC,gBAAgB,EAAE,CAAC,CAAC;QACtF,MAAM,eAAe,CAAC,yBAAyB,EAAE,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,sBAAsB,EAAE,KAAK;QAC9B,MAAM,sBAAsB,CAAC,eAAe,CAAC,+CAAsB,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAC5F,CAAC,CAAC,CAAC;IAEH,UAAU,CAAC,aAAa,EAAE,CAAC;AAC/B,CAAC,CAAC,CAAC"}

package/dist/specs/dashboard-samples/Quarkus.spec.js

@@ -15,36 +15,39 @@ const inversify_config_1 = require("../../configs/inversify.config");
 const inversify_types_1 = require("../../configs/inversify.types");
 const WorkspaceHandlingTests_1 = require("../../tests-library/WorkspaceHandlingTests");
 const Logger_1 = require("../../utils/Logger");
-const stackName = 'Java 11 with Quarkus';
-const projectName = 'quarkus-quickstarts';
+const BaseTestConstants_1 = require("../../constants/BaseTestConstants");
 const projectAndFileTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.ProjectAndFileTests);
 const workspaceHandlingTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.WorkspaceHandlingTests);
 const loginTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.LoginTests);
+const browserTabsUtil = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.BrowserTabsUtil);
+const stackName = 'Java 11 with Quarkus';
+const projectName = 'quarkus-quickstarts';
 suite(`The ${stackName} userstory`, async function () {
     let projectSection;
-    suite(`Create workspace from ${stackName} simple`, async function () {
-        loginTests.loginIntoChe();
-        workspaceHandlingTests.createAndOpenWorkspace(stackName);
-        workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
-        test('Register running workspace', async () => {
-            MochaHooks_1.registerRunningWorkspace(WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName());
-        });
-        test('Wait workspace readiness', async function () {
-            await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
-        });
-        test('Check a project folder has been created', async function () {
-            projectSection = await new monaco_page_objects_1.SideBarView().getContent().getSection(projectName);
-            Logger_1.Logger.debug(`new SideBarView().getContent().getSection: get ${projectName}`);
-        });
-        test('Check the project files was imported', async function () {
-            const label = 'devfile.yaml';
-            await projectSection.findItem(label);
-            Logger_1.Logger.debug(`projectSection.findItem: find ${label}`);
-        });
-        test('Stopping and deleting the workspace', async function () {
-            await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName());
-        });
-        loginTests.logoutFromChe();
+    loginTests.loginIntoChe();
+    workspaceHandlingTests.createAndOpenWorkspace(stackName);
+    workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
+    test('Register running workspace', async () => {
+        MochaHooks_1.registerRunningWorkspace(WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName());
+    });
+    test('Wait workspace readiness', async function () {
+        await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
+    });
+    test('Check a project folder has been created', async function () {
+        projectSection = await new monaco_page_objects_1.SideBarView().getContent().getSection(projectName);
+        Logger_1.Logger.debug(`new SideBarView().getContent().getSection: get ${projectName}`);
+    });
+    test('Check the project files was imported', async function () {
+        await projectSection.findItem(BaseTestConstants_1.BaseTestConstants.TS_SELENIUM_PROJECT_ROOT_FILE_NAME);
+        Logger_1.Logger.debug(`projectSection.findItem: find ${BaseTestConstants_1.BaseTestConstants.TS_SELENIUM_PROJECT_ROOT_FILE_NAME}`);
+    });
+    test('Stop the workspace', async function () {
+        await workspaceHandlingTests.stopWorkspace(WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName());
+        await browserTabsUtil.closeAllTabsExceptCurrent();
+    });
+    test('Delete the workspace', async function () {
+        await workspaceHandlingTests.removeWorkspace(WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName());
     });
+    loginTests.logoutFromChe();
 });
 //# sourceMappingURL=Quarkus.spec.js.map

package/dist/specs/dashboard-samples/Quarkus.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"Quarkus.spec.js","sourceRoot":"","sources":["../../../specs/dashboard-samples/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"}
+{"version":3,"file":"Quarkus.spec.js","sourceRoot":"","sources":["../../../specs/dashboard-samples/Quarkus.spec.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;AAExE,6DAA+D;AAC/D,8CAAyD;AAEzD,qEAA8D;AAC9D,mEAAwD;AACxD,uFAAoF;AAEpF,+CAA4C;AAC5C,yEAAsE;AAGtE,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;AACpE,MAAM,eAAe,GAAoB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,eAAe,CAAC,CAAC;AAEnF,MAAM,SAAS,GAAW,sBAAsB,CAAC;AACjD,MAAM,WAAW,GAAW,qBAAqB,CAAC;AAElD,KAAK,CAAC,OAAO,SAAS,YAAY,EAAE,KAAK;IACrC,IAAI,cAA2B,CAAC;IAEhC,UAAU,CAAC,YAAY,EAAE,CAAC;IAE1B,sBAAsB,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC;IAEzD,sBAAsB,CAAC,mCAAmC,EAAE,CAAC;IAE7D,IAAI,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;QAC1C,qCAAwB,CAAC,+CAAsB,CAAC,gBAAgB,EAAE,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,0BAA0B,EAAE,KAAK;QAClC,MAAM,mBAAmB,CAAC,sCAAsC,EAAE,CAAC;IACvE,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,yCAAyC,EAAE,KAAK;QACjD,cAAc,GAAG,MAAM,IAAI,iCAAW,EAAE,CAAC,UAAU,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QAC9E,eAAM,CAAC,KAAK,CAAC,kDAAkD,WAAW,EAAE,CAAC,CAAC;IAClF,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,sCAAsC,EAAE,KAAK;QAC9C,MAAM,cAAc,CAAC,QAAQ,CAAC,qCAAiB,CAAC,kCAAkC,CAAC,CAAC;QACpF,eAAM,CAAC,KAAK,CAAC,iCAAiC,qCAAiB,CAAC,kCAAkC,EAAE,CAAC,CAAC;IAC1G,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,oBAAoB,EAAE,KAAK;QAC5B,MAAM,sBAAsB,CAAC,aAAa,CAAC,+CAAsB,CAAC,gBAAgB,EAAE,CAAC,CAAC;QACtF,MAAM,eAAe,CAAC,yBAAyB,EAAE,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,sBAAsB,EAAE,KAAK;QAC9B,MAAM,sBAAsB,CAAC,eAAe,CAAC,+CAAsB,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAC5F,CAAC,CAAC,CAAC;IACH,UAAU,CAAC,aAAa,EAAE,CAAC;AAC/B,CAAC,CAAC,CAAC"}

package/dist/utils/StringUtil.js

@@ -28,6 +28,9 @@ let StringUtil = class StringUtil {
      */
     static getProjectNameFromGitUrl(url) {
         Logger_1.Logger.debug(`${this.constructor.name}.${this.getProjectNameFromGitUrl.name} - ${url}`);
+        if (url.includes('?')) {
+            url = url.substring(0, url.indexOf('?'));
+        }
         if (url.includes('/tree/')) {
             url = url.split('/').slice(0, -2).join('/');
         }

package/dist/utils/StringUtil.js.map

@@ -1 +1 @@
-{"version":3,"file":"StringUtil.js","sourceRoot":"","sources":["../../utils/StringUtil.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;AAExE,yCAAuC;AACvC,qCAAkC;AAIlC,IAAa,UAAU,GAAvB,MAAa,UAAU;IACnB;;;;;;OAMG;IACH,MAAM,CAAC,wBAAwB,CAAC,GAAW;QACvC,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,wBAAwB,CAAC,IAAI,MAAM,GAAG,EAAE,CAAC,CAAC;QACxF,IAAI,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;YACxB,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAC/C;QACD,MAAM,WAAW,GAAW,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;QAC5G,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,wBAAwB,CAAC,IAAI,MAAM,WAAW,EAAE,CAAC,CAAC;QAChG,OAAO,WAAW,CAAC;IACvB,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,GAAW;QAC5B,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,wBAAwB,EAAE,GAAG,CAAC,CAAC;IACrI,CAAC;IAED;;;;OAIG;IAEH,MAAM,CAAC,0BAA0B,CAAC,OAAe;QAC7C,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,oCAAoC,EAAE,OAAO,CAAC,CAAC;IAC/F,CAAC;CACJ,CAAA;AA/BY,UAAU;IADtB,sBAAU,EAAE;GACA,UAAU,CA+BtB;AA/BY,gCAAU"}
+{"version":3,"file":"StringUtil.js","sourceRoot":"","sources":["../../utils/StringUtil.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;AAExE,yCAAuC;AACvC,qCAAkC;AAIlC,IAAa,UAAU,GAAvB,MAAa,UAAU;IACnB;;;;;;OAMG;IACH,MAAM,CAAC,wBAAwB,CAAC,GAAW;QACvC,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,wBAAwB,CAAC,IAAI,MAAM,GAAG,EAAE,CAAC,CAAC;QACxF,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACnB,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;SAC5C;QACD,IAAI,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;YACxB,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAC/C;QACD,MAAM,WAAW,GAAW,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;QAC5G,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,wBAAwB,CAAC,IAAI,MAAM,WAAW,EAAE,CAAC,CAAC;QAChG,OAAO,WAAW,CAAC;IACvB,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,GAAW;QAC5B,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,wBAAwB,EAAE,GAAG,CAAC,CAAC;IACrI,CAAC;IAED;;;;OAIG;IAEH,MAAM,CAAC,0BAA0B,CAAC,OAAe;QAC7C,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,oCAAoC,EAAE,OAAO,CAAC,CAAC;IAC/F,CAAC;CACJ,CAAA;AAlCY,UAAU;IADtB,sBAAU,EAAE;GACA,UAAU,CAkCtB;AAlCY,gCAAU"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-che/che-e2e",
-  "version": "7.72.0-dev-4dc1021",
+  "version": "7.72.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/pageobjects/dashboard/Dashboard.ts

@@ -15,27 +15,17 @@ import { DriverHelper } from '../../utils/DriverHelper';
 import { TimeoutConstants } from '../../constants/TimeoutConstants';
 import { Workspaces } from './Workspaces';
 import { Logger } from '../../utils/Logger';
-import { OAuthConstants } from '../../constants/OAuthConstants';
 import { BaseTestConstants } from '../../constants/BaseTestConstants';
 
 @injectable()
 export class Dashboard {
-    private static readonly WORKSPACES_BUTTON_XPATH: string = `//div[@id='page-sidebar']//a[contains(text(), 'Workspaces (')]`;
-    private static readonly CREATE_WORKSPACE_BUTTON_XPATH: string = `//div[@id='page-sidebar']//a[text()='Create Workspace']`;
-    private static readonly LOADER_PAGE_STEP_TITLES_XPATH: string = '//*[@data-testid="step-title"]';
-    private static readonly STARTING_PAGE_LOADER_CSS: string = '.main-page-loader';
-    private static readonly LOADER_ALERT_XPATH: string = '//*[@data-testid="loader-alert"]';
-    private static readonly LOGOUT_BUTTON_XPATH: string = '//button[text()="Logout"]';
-
-    private static getUserDropdownMenuButtonLocator(): By {
-        Logger.debug(`Dashboard.getUserDropdownMenuButtonLocator: get current user.`);
-
-        const currentUser: string = OAuthConstants.TS_SELENIUM_OCP_USERNAME;
-        Logger.debug(`Dashboard.getUserDropdownMenuButtonLocator: ${currentUser}.`);
-
-        return By.xpath(`//*[text()="${currentUser}"]//parent::button`);
-
-    }
+    private static readonly WORKSPACES_BUTTON: By = By.xpath(`//div[@id='page-sidebar']//a[contains(text(), 'Workspaces (')]`);
+    private static readonly CREATE_WORKSPACE_BUTTON: By = By.xpath(`//div[@id='page-sidebar']//a[text()='Create Workspace']`);
+    private static readonly LOADER_PAGE_STEP_TITLES: By = By.xpath('//*[@data-testid="step-title"]');
+    private static readonly STARTING_PAGE_LOADER: By = By.css('.main-page-loader');
+    private static readonly LOADER_ALERT: By = By.xpath('//*[@data-testid="loader-alert"]');
+    private static readonly LOGOUT_BUTTON: By = By.xpath('//button[text()="Logout"]');
+    private static readonly USER_SETTINGS_DROPDOWN: By = By.xpath('//header//button/span[text()!=\'\']//parent::button');
 
     constructor(@inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper,
                 @inject(CLASSES.Workspaces) private readonly workspaces: Workspaces) {
@@ -82,65 +72,47 @@ export class Dashboard {
     async waitPage(timeout: number = TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT): Promise<void> {
         Logger.debug('Dashboard.waitPage');
 
-        await this.driverHelper.waitVisibility(By.xpath(Dashboard.WORKSPACES_BUTTON_XPATH), timeout);
-        await this.driverHelper.waitVisibility(By.xpath(Dashboard.CREATE_WORKSPACE_BUTTON_XPATH), timeout);
+        await this.driverHelper.waitVisibility(Dashboard.WORKSPACES_BUTTON, timeout);
+        await this.driverHelper.waitVisibility(Dashboard.CREATE_WORKSPACE_BUTTON, timeout);
     }
 
     async clickWorkspacesButton(timeout: number = TimeoutConstants.TS_CLICK_DASHBOARD_ITEM_TIMEOUT): Promise<void> {
         Logger.debug('Dashboard.clickWorkspacesButton');
 
-        await this.driverHelper.waitAndClick(By.xpath(Dashboard.WORKSPACES_BUTTON_XPATH), timeout);
+        await this.driverHelper.waitAndClick(Dashboard.WORKSPACES_BUTTON, timeout);
     }
 
     async clickCreateWorkspaceButton(timeout: number = TimeoutConstants.TS_CLICK_DASHBOARD_ITEM_TIMEOUT): Promise<void> {
         Logger.debug('Dashboard.clickCreateWorkspaceButton');
 
-        await this.driverHelper.waitAndClick(By.xpath(Dashboard.CREATE_WORKSPACE_BUTTON_XPATH), timeout);
+        await this.driverHelper.waitAndClick(Dashboard.CREATE_WORKSPACE_BUTTON, timeout);
     }
 
     async getLoaderAlert(timeout: number = TimeoutConstants.TS_WAIT_LOADER_PRESENCE_TIMEOUT): Promise<string> {
         Logger.debug('Dashboard.getLoaderAlert');
 
-        return await this.driverHelper.waitAndGetText(By.xpath(Dashboard.LOADER_ALERT_XPATH), timeout);
+        return await this.driverHelper.waitAndGetText(Dashboard.LOADER_ALERT, timeout);
     }
 
     async waitLoader(timeout: number = TimeoutConstants.TS_WAIT_LOADER_PRESENCE_TIMEOUT): Promise<void> {
         Logger.debug('Dashboard.waitLoader');
 
-        await this.driverHelper.waitAllPresence(By.xpath(Dashboard.LOADER_PAGE_STEP_TITLES_XPATH), timeout);
-    }
-
-    async waitLoaderDisappearance(timeout: number = TimeoutConstants.TS_WAIT_LOADER_ABSENCE_TIMEOUT): Promise<void> {
-        Logger.debug('Dashboard.waitLoaderDisappearance');
-
-        await this.driverHelper.waitDisappearance(By.xpath(Dashboard.LOADER_PAGE_STEP_TITLES_XPATH), timeout);
-    }
-
-    async waitDisappearanceNavigationMenu(timeout: number = TimeoutConstants.TS_COMMON_DASHBOARD_WAIT_TIMEOUT): Promise<void> {
-        Logger.debug('Dashboard.waitDisappearanceNavigationMenu');
-
-        await this.driverHelper.waitDisappearance(By.id('chenavmenu'), timeout);
+        await this.driverHelper.waitAllPresence(Dashboard.LOADER_PAGE_STEP_TITLES, timeout);
     }
 
     async waitStartingPageLoaderDisappearance(timeout: number = TimeoutConstants.TS_COMMON_DASHBOARD_WAIT_TIMEOUT): Promise<void> {
         Logger.debug(`Dashboard.waitStartingPageLoaderDisappearance`);
 
-        await this.driverHelper.waitDisappearance(By.css(Dashboard.STARTING_PAGE_LOADER_CSS), timeout);
+        await this.driverHelper.waitDisappearance(Dashboard.STARTING_PAGE_LOADER, timeout);
         await this.driverHelper.wait(TimeoutConstants.TS_SELENIUM_DEFAULT_POLLING);
     }
 
-    async getRecentWorkspaceName(timeout: number = TimeoutConstants.TS_COMMON_DASHBOARD_WAIT_TIMEOUT): Promise<string> {
-        Logger.debug(`Dashboard.getRecentWorkspaceName`);
-
-        return await this.driverHelper.waitAndGetText(By.css('[data-testid="recent-workspace-item"]'), timeout);
-    }
-
     async logout(timeout: number = TimeoutConstants.TS_COMMON_DASHBOARD_WAIT_TIMEOUT): Promise<void> {
         Logger.debug(`Dashboard.logout`);
 
         await this.openDashboard();
-        await this.driverHelper.waitAndClick(Dashboard.getUserDropdownMenuButtonLocator(), timeout);
-        await this.driverHelper.waitAndClick(By.xpath(Dashboard.LOGOUT_BUTTON_XPATH), timeout);
-        await this.driverHelper.waitDisappearance(Dashboard.getUserDropdownMenuButtonLocator(), timeout);
+        await this.driverHelper.waitAndClick(Dashboard.USER_SETTINGS_DROPDOWN, timeout);
+        await this.driverHelper.waitAndClick(Dashboard.LOGOUT_BUTTON, timeout);
+        await this.driverHelper.waitDisappearance(Dashboard.USER_SETTINGS_DROPDOWN, timeout);
     }
 }

package/specs/SmokeTest.spec.ts

@@ -7,7 +7,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
-import { SideBarView, ViewSection } from 'monaco-page-objects';
+import { SideBarView, ViewItem, ViewSection } from 'monaco-page-objects';
 import { ProjectAndFileTests } from '../tests-library/ProjectAndFileTests';
 import { CLASSES } from '../configs/inversify.types';
 import { e2eContainer } from '../configs/inversify.config';
@@ -17,14 +17,17 @@ import { Logger } from '../utils/Logger';
 import { LoginTests } from '../tests-library/LoginTests';
 import { StringUtil } from '../utils/StringUtil';
 import { FactoryTestConstants } from '../constants/FactoryTestConstants';
+import { BrowserTabsUtil } from '../utils/BrowserTabsUtil';
+import { expect } from 'chai';
+import { BaseTestConstants } from '../constants/BaseTestConstants';
 
-const factoryUrl: string = FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_REPO_URL || 'https://github.com/che-incubator/quarkus-api-example.git';
 const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
-let projectName: string;
+const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 
 suite(`The SmokeTest userstory`, async function (): Promise<void> {
+    const factoryUrl: string = FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_REPO_URL || 'https://github.com/che-incubator/quarkus-api-example.git';
     let projectSection: ViewSection;
     suite(`Create workspace from factory:${factoryUrl}`, async function (): Promise<void> {
         loginTests.loginIntoChe();
@@ -37,17 +40,22 @@ suite(`The SmokeTest userstory`, async function (): Promise<void> {
             await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
         });
         test('Check a project folder has been created', async function (): Promise<void> {
-            projectName = StringUtil.getProjectNameFromGitUrl(factoryUrl);
+            const projectName: string = StringUtil.getProjectNameFromGitUrl(factoryUrl);
             projectSection = await new SideBarView().getContent().getSection(projectName);
             Logger.debug(`new SideBarView().getContent().getSection: get ${projectName}`);
         });
         test('Check the project files was imported', async function (): Promise<void> {
-            const label: string = 'devfile.yaml';
-            await projectSection.findItem(label);
-            Logger.debug(`projectSection.findItem: find ${label}`);
+            Logger.debug(`projectSection.findItem: find ${BaseTestConstants.TS_SELENIUM_PROJECT_ROOT_FILE_NAME}`);
+            const isFileImported: ViewItem | undefined = await projectSection.findItem(BaseTestConstants.TS_SELENIUM_PROJECT_ROOT_FILE_NAME);
+            expect(isFileImported).not.eqls(undefined);
         });
-        test('Stopping and deleting the workspace', async function (): Promise<void> {
-            await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+        test('Stop the workspace', async function (): Promise<void> {
+            await workspaceHandlingTests.stopWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+            await browserTabsUtil.closeAllTabsExceptCurrent();
         });
+        test('Delete the workspace', async function (): Promise<void> {
+            await workspaceHandlingTests.removeWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+        });
+        loginTests.logoutFromChe();
     });
 });

package/specs/dashboard-samples/EmptyWorkspace.spec.ts

@@ -25,36 +25,37 @@ const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUti
 const stackName: string = 'Empty Workspace';
 
 suite(`${stackName} test`, async () => {
-    suite(`Create ${stackName} workspace`, async () => {
-        loginTests.loginIntoChe();
-        workspaceHandlingTests.createAndOpenWorkspace(stackName);
-        workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
-        test('Register running workspace', async () => {
-            registerRunningWorkspace(WorkspaceHandlingTests.getWorkspaceName());
-        });
-        test('Wait workspace readiness', async() => {
-            await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
-
-            const workbench: Workbench = new Workbench();
-            const activityBar: ActivityBar = workbench.getActivityBar();
-            const activityBarControls: ViewControl[] = await activityBar.getViewControls();
-
-            Logger.debug(`Editor sections:`);
-            for (const control of activityBarControls) {
-                Logger.debug(`${await control.getTitle()}`);
-            }
-        });
+    loginTests.loginIntoChe();
+
+    workspaceHandlingTests.createAndOpenWorkspace(stackName);
+
+    workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
+
+    test('Register running workspace', async () => {
+        registerRunningWorkspace(WorkspaceHandlingTests.getWorkspaceName());
     });
 
-    suite('Stopping and deleting the workspace', async () => {
-        test('Stop the workspace', async function (): Promise<void> {
-            await workspaceHandlingTests.stopWorkspace(WorkspaceHandlingTests.getWorkspaceName());
-            await browserTabsUtil.closeAllTabsExceptCurrent();
-        });
+    test('Wait workspace readiness', async () => {
+        await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
 
-        test('Delete the workspace', async function (): Promise<void> {
-            await workspaceHandlingTests.removeWorkspace(WorkspaceHandlingTests.getWorkspaceName());
-        });
-        loginTests.logoutFromChe();
+        const workbench: Workbench = new Workbench();
+        const activityBar: ActivityBar = workbench.getActivityBar();
+        const activityBarControls: ViewControl[] = await activityBar.getViewControls();
+
+        Logger.debug(`Editor sections:`);
+        for (const control of activityBarControls) {
+            Logger.debug(`${await control.getTitle()}`);
+        }
     });
+
+    test('Stop the workspace', async function (): Promise<void> {
+        await workspaceHandlingTests.stopWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+        await browserTabsUtil.closeAllTabsExceptCurrent();
+    });
+
+    test('Delete the workspace', async function (): Promise<void> {
+        await workspaceHandlingTests.removeWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+    });
+
+    loginTests.logoutFromChe();
 });

package/specs/dashboard-samples/Quarkus.spec.ts

@@ -16,37 +16,51 @@ import { CLASSES } from '../../configs/inversify.types';
 import { WorkspaceHandlingTests } from '../../tests-library/WorkspaceHandlingTests';
 import { ProjectAndFileTests } from '../../tests-library/ProjectAndFileTests';
 import { Logger } from '../../utils/Logger';
+import { BaseTestConstants } from '../../constants/BaseTestConstants';
+import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 
-const stackName: string = 'Java 11 with Quarkus';
-const projectName: string = 'quarkus-quickstarts';
 const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
+const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
+
+const stackName: string = 'Java 11 with Quarkus';
+const projectName: string = 'quarkus-quickstarts';
 
 suite(`The ${stackName} userstory`, async function (): Promise<void> {
     let projectSection: ViewSection;
-    suite(`Create workspace from ${stackName} simple`, async function (): Promise<void> {
-        loginTests.loginIntoChe();
-        workspaceHandlingTests.createAndOpenWorkspace(stackName);
-        workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
-        test('Register running workspace', async () => {
-            registerRunningWorkspace(WorkspaceHandlingTests.getWorkspaceName());
-        });
-        test('Wait workspace readiness', async function (): Promise<void> {
-            await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
-        });
-        test('Check a project folder has been created', async function (): Promise<void> {
-            projectSection = await new SideBarView().getContent().getSection(projectName);
-            Logger.debug(`new SideBarView().getContent().getSection: get ${projectName}`);
-        });
-        test('Check the project files was imported', async function (): Promise<void> {
-            const label: string = 'devfile.yaml';
-            await projectSection.findItem(label);
-            Logger.debug(`projectSection.findItem: find ${label}`);
-        });
-        test('Stopping and deleting the workspace', async function (): Promise<void> {
-            await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
-        });
-        loginTests.logoutFromChe();
+
+    loginTests.loginIntoChe();
+
+    workspaceHandlingTests.createAndOpenWorkspace(stackName);
+
+    workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
+
+    test('Register running workspace', async () => {
+        registerRunningWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+    });
+
+    test('Wait workspace readiness', async function (): Promise<void> {
+        await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
+    });
+
+    test('Check a project folder has been created', async function (): Promise<void> {
+        projectSection = await new SideBarView().getContent().getSection(projectName);
+        Logger.debug(`new SideBarView().getContent().getSection: get ${projectName}`);
+    });
+
+    test('Check the project files was imported', async function (): Promise<void> {
+        await projectSection.findItem(BaseTestConstants.TS_SELENIUM_PROJECT_ROOT_FILE_NAME);
+        Logger.debug(`projectSection.findItem: find ${BaseTestConstants.TS_SELENIUM_PROJECT_ROOT_FILE_NAME}`);
+    });
+
+    test('Stop the workspace', async function (): Promise<void> {
+        await workspaceHandlingTests.stopWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+        await browserTabsUtil.closeAllTabsExceptCurrent();
+    });
+
+    test('Delete the workspace', async function (): Promise<void> {
+        await workspaceHandlingTests.removeWorkspace(WorkspaceHandlingTests.getWorkspaceName());
     });
+    loginTests.logoutFromChe();
 });

package/utils/StringUtil.ts

@@ -23,6 +23,9 @@ export class StringUtil {
      */
     static getProjectNameFromGitUrl(url: string): string {
         Logger.debug(`${this.constructor.name}.${this.getProjectNameFromGitUrl.name} - ${url}`);
+        if (url.includes('?')) {
+            url = url.substring(0, url.indexOf('?'));
+        }
         if (url.includes('/tree/')) {
             url = url.split('/').slice(0, -2).join('/');
         }