@eclipse-che/che-e2e 7.72.0-dev-a481783 → 7.72.0-dev-cc6cd70
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/pageobjects/dashboard/Dashboard.js +17 -35
- package/dist/pageobjects/dashboard/Dashboard.js.map +1 -1
- package/dist/specs/SmokeTest.spec.js +15 -8
- package/dist/specs/SmokeTest.spec.js.map +1 -1
- package/dist/specs/dashboard-samples/EmptyWorkspace.spec.js +22 -26
- package/dist/specs/dashboard-samples/EmptyWorkspace.spec.js.map +1 -1
- package/dist/specs/dashboard-samples/Quarkus.spec.js +28 -25
- package/dist/specs/dashboard-samples/Quarkus.spec.js.map +1 -1
- package/dist/utils/KubernetesCommandLineToolsExecutor.js +3 -3
- package/dist/utils/KubernetesCommandLineToolsExecutor.js.map +1 -1
- package/dist/utils/StringUtil.js +3 -0
- package/dist/utils/StringUtil.js.map +1 -1
- package/package.json +1 -1
- package/pageobjects/dashboard/Dashboard.ts +17 -45
- package/specs/SmokeTest.spec.ts +17 -9
- package/specs/dashboard-samples/EmptyWorkspace.spec.ts +29 -28
- package/specs/dashboard-samples/Quarkus.spec.ts +39 -25
- package/utils/KubernetesCommandLineToolsExecutor.ts +3 -3
- package/utils/StringUtil.ts +3 -0
|
@@ -31,19 +31,12 @@ const DriverHelper_1 = require("../../utils/DriverHelper");
|
|
|
31
31
|
const TimeoutConstants_1 = require("../../constants/TimeoutConstants");
|
|
32
32
|
const Workspaces_1 = require("./Workspaces");
|
|
33
33
|
const Logger_1 = require("../../utils/Logger");
|
|
34
|
-
const OAuthConstants_1 = require("../../constants/OAuthConstants");
|
|
35
34
|
const BaseTestConstants_1 = require("../../constants/BaseTestConstants");
|
|
36
35
|
let Dashboard = Dashboard_1 = class Dashboard {
|
|
37
36
|
constructor(driverHelper, workspaces) {
|
|
38
37
|
this.driverHelper = driverHelper;
|
|
39
38
|
this.workspaces = workspaces;
|
|
40
39
|
}
|
|
41
|
-
static getUserDropdownMenuButtonLocator() {
|
|
42
|
-
Logger_1.Logger.debug(`Dashboard.getUserDropdownMenuButtonLocator: get current user.`);
|
|
43
|
-
const currentUser = OAuthConstants_1.OAuthConstants.TS_SELENIUM_OCP_USERNAME;
|
|
44
|
-
Logger_1.Logger.debug(`Dashboard.getUserDropdownMenuButtonLocator: ${currentUser}.`);
|
|
45
|
-
return selenium_webdriver_1.By.xpath(`//*[text()="${currentUser}"]//parent::button`);
|
|
46
|
-
}
|
|
47
40
|
async stopWorkspaceByUI(workspaceName) {
|
|
48
41
|
Logger_1.Logger.debug(`Dashboard.stopWorkspaceByUI "${workspaceName}"`);
|
|
49
42
|
await this.clickWorkspacesButton();
|
|
@@ -75,56 +68,45 @@ let Dashboard = Dashboard_1 = class Dashboard {
|
|
|
75
68
|
}
|
|
76
69
|
async waitPage(timeout = TimeoutConstants_1.TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT) {
|
|
77
70
|
Logger_1.Logger.debug('Dashboard.waitPage');
|
|
78
|
-
await this.driverHelper.waitVisibility(
|
|
79
|
-
await this.driverHelper.waitVisibility(
|
|
71
|
+
await this.driverHelper.waitVisibility(Dashboard_1.WORKSPACES_BUTTON, timeout);
|
|
72
|
+
await this.driverHelper.waitVisibility(Dashboard_1.CREATE_WORKSPACE_BUTTON, timeout);
|
|
80
73
|
}
|
|
81
74
|
async clickWorkspacesButton(timeout = TimeoutConstants_1.TimeoutConstants.TS_CLICK_DASHBOARD_ITEM_TIMEOUT) {
|
|
82
75
|
Logger_1.Logger.debug('Dashboard.clickWorkspacesButton');
|
|
83
|
-
await this.driverHelper.waitAndClick(
|
|
76
|
+
await this.driverHelper.waitAndClick(Dashboard_1.WORKSPACES_BUTTON, timeout);
|
|
84
77
|
}
|
|
85
78
|
async clickCreateWorkspaceButton(timeout = TimeoutConstants_1.TimeoutConstants.TS_CLICK_DASHBOARD_ITEM_TIMEOUT) {
|
|
86
79
|
Logger_1.Logger.debug('Dashboard.clickCreateWorkspaceButton');
|
|
87
|
-
await this.driverHelper.waitAndClick(
|
|
80
|
+
await this.driverHelper.waitAndClick(Dashboard_1.CREATE_WORKSPACE_BUTTON, timeout);
|
|
88
81
|
}
|
|
89
82
|
async getLoaderAlert(timeout = TimeoutConstants_1.TimeoutConstants.TS_WAIT_LOADER_PRESENCE_TIMEOUT) {
|
|
90
83
|
Logger_1.Logger.debug('Dashboard.getLoaderAlert');
|
|
91
|
-
return await this.driverHelper.waitAndGetText(
|
|
84
|
+
return await this.driverHelper.waitAndGetText(Dashboard_1.LOADER_ALERT, timeout);
|
|
92
85
|
}
|
|
93
86
|
async waitLoader(timeout = TimeoutConstants_1.TimeoutConstants.TS_WAIT_LOADER_PRESENCE_TIMEOUT) {
|
|
94
87
|
Logger_1.Logger.debug('Dashboard.waitLoader');
|
|
95
|
-
await this.driverHelper.waitAllPresence(
|
|
96
|
-
}
|
|
97
|
-
async waitLoaderDisappearance(timeout = TimeoutConstants_1.TimeoutConstants.TS_WAIT_LOADER_ABSENCE_TIMEOUT) {
|
|
98
|
-
Logger_1.Logger.debug('Dashboard.waitLoaderDisappearance');
|
|
99
|
-
await this.driverHelper.waitDisappearance(selenium_webdriver_1.By.xpath(Dashboard_1.LOADER_PAGE_STEP_TITLES_XPATH), timeout);
|
|
100
|
-
}
|
|
101
|
-
async waitDisappearanceNavigationMenu(timeout = TimeoutConstants_1.TimeoutConstants.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
102
|
-
Logger_1.Logger.debug('Dashboard.waitDisappearanceNavigationMenu');
|
|
103
|
-
await this.driverHelper.waitDisappearance(selenium_webdriver_1.By.id('chenavmenu'), timeout);
|
|
88
|
+
await this.driverHelper.waitAllPresence(Dashboard_1.LOADER_PAGE_STEP_TITLES, timeout);
|
|
104
89
|
}
|
|
105
90
|
async waitStartingPageLoaderDisappearance(timeout = TimeoutConstants_1.TimeoutConstants.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
106
91
|
Logger_1.Logger.debug(`Dashboard.waitStartingPageLoaderDisappearance`);
|
|
107
|
-
await this.driverHelper.waitDisappearance(
|
|
92
|
+
await this.driverHelper.waitDisappearance(Dashboard_1.STARTING_PAGE_LOADER, timeout);
|
|
108
93
|
await this.driverHelper.wait(TimeoutConstants_1.TimeoutConstants.TS_SELENIUM_DEFAULT_POLLING);
|
|
109
94
|
}
|
|
110
|
-
async getRecentWorkspaceName(timeout = TimeoutConstants_1.TimeoutConstants.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
111
|
-
Logger_1.Logger.debug(`Dashboard.getRecentWorkspaceName`);
|
|
112
|
-
return await this.driverHelper.waitAndGetText(selenium_webdriver_1.By.css('[data-testid="recent-workspace-item"]'), timeout);
|
|
113
|
-
}
|
|
114
95
|
async logout(timeout = TimeoutConstants_1.TimeoutConstants.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
115
96
|
Logger_1.Logger.debug(`Dashboard.logout`);
|
|
116
97
|
await this.openDashboard();
|
|
117
|
-
await this.driverHelper.waitAndClick(Dashboard_1.
|
|
118
|
-
await this.driverHelper.waitAndClick(
|
|
119
|
-
await this.driverHelper.waitDisappearance(Dashboard_1.
|
|
98
|
+
await this.driverHelper.waitAndClick(Dashboard_1.USER_SETTINGS_DROPDOWN, timeout);
|
|
99
|
+
await this.driverHelper.waitAndClick(Dashboard_1.LOGOUT_BUTTON, timeout);
|
|
100
|
+
await this.driverHelper.waitDisappearance(Dashboard_1.USER_SETTINGS_DROPDOWN, timeout);
|
|
120
101
|
}
|
|
121
102
|
};
|
|
122
|
-
Dashboard.
|
|
123
|
-
Dashboard.
|
|
124
|
-
Dashboard.
|
|
125
|
-
Dashboard.
|
|
126
|
-
Dashboard.
|
|
127
|
-
Dashboard.
|
|
103
|
+
Dashboard.WORKSPACES_BUTTON = selenium_webdriver_1.By.xpath(`//div[@id='page-sidebar']//a[contains(text(), 'Workspaces (')]`);
|
|
104
|
+
Dashboard.CREATE_WORKSPACE_BUTTON = selenium_webdriver_1.By.xpath(`//div[@id='page-sidebar']//a[text()='Create Workspace']`);
|
|
105
|
+
Dashboard.LOADER_PAGE_STEP_TITLES = selenium_webdriver_1.By.xpath('//*[@data-testid="step-title"]');
|
|
106
|
+
Dashboard.STARTING_PAGE_LOADER = selenium_webdriver_1.By.css('.main-page-loader');
|
|
107
|
+
Dashboard.LOADER_ALERT = selenium_webdriver_1.By.xpath('//*[@data-testid="loader-alert"]');
|
|
108
|
+
Dashboard.LOGOUT_BUTTON = selenium_webdriver_1.By.xpath('//button[text()="Logout"]');
|
|
109
|
+
Dashboard.USER_SETTINGS_DROPDOWN = selenium_webdriver_1.By.xpath('//header//button/span[text()!=\'\']//parent::button');
|
|
128
110
|
Dashboard = Dashboard_1 = __decorate([
|
|
129
111
|
inversify_1.injectable(),
|
|
130
112
|
__param(0, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Dashboard.js","sourceRoot":"","sources":["../../../pageobjects/dashboard/Dashboard.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,yCAA+C;AAC/C,4BAA0B;AAC1B,mEAAwD;AACxD,2DAAwC;AACxC,2DAAwD;AACxD,uEAAoE;AACpE,6CAA0C;AAC1C,+CAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"Dashboard.js","sourceRoot":"","sources":["../../../pageobjects/dashboard/Dashboard.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,12 +17,14 @@ const MochaHooks_1 = require("./MochaHooks");
|
|
|
17
17
|
const Logger_1 = require("../utils/Logger");
|
|
18
18
|
const StringUtil_1 = require("../utils/StringUtil");
|
|
19
19
|
const FactoryTestConstants_1 = require("../constants/FactoryTestConstants");
|
|
20
|
-
const
|
|
20
|
+
const chai_1 = require("chai");
|
|
21
|
+
const BaseTestConstants_1 = require("../constants/BaseTestConstants");
|
|
21
22
|
const projectAndFileTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.ProjectAndFileTests);
|
|
22
23
|
const workspaceHandlingTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.WorkspaceHandlingTests);
|
|
23
24
|
const loginTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.LoginTests);
|
|
24
|
-
|
|
25
|
+
const browserTabsUtil = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.BrowserTabsUtil);
|
|
25
26
|
suite(`The SmokeTest userstory`, async function () {
|
|
27
|
+
const factoryUrl = FactoryTestConstants_1.FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_REPO_URL || 'https://github.com/che-incubator/quarkus-api-example.git';
|
|
26
28
|
let projectSection;
|
|
27
29
|
suite(`Create workspace from factory:${factoryUrl}`, async function () {
|
|
28
30
|
loginTests.loginIntoChe();
|
|
@@ -35,18 +37,23 @@ suite(`The SmokeTest userstory`, async function () {
|
|
|
35
37
|
await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
|
|
36
38
|
});
|
|
37
39
|
test('Check a project folder has been created', async function () {
|
|
38
|
-
projectName = StringUtil_1.StringUtil.getProjectNameFromGitUrl(factoryUrl);
|
|
40
|
+
const projectName = StringUtil_1.StringUtil.getProjectNameFromGitUrl(factoryUrl);
|
|
39
41
|
projectSection = await new monaco_page_objects_1.SideBarView().getContent().getSection(projectName);
|
|
40
42
|
Logger_1.Logger.debug(`new SideBarView().getContent().getSection: get ${projectName}`);
|
|
41
43
|
});
|
|
42
44
|
test('Check the project files was imported', async function () {
|
|
43
|
-
|
|
44
|
-
await projectSection.findItem(
|
|
45
|
-
|
|
45
|
+
Logger_1.Logger.debug(`projectSection.findItem: find ${BaseTestConstants_1.BaseTestConstants.TS_SELENIUM_PROJECT_ROOT_FILE_NAME}`);
|
|
46
|
+
const isFileImported = await projectSection.findItem(BaseTestConstants_1.BaseTestConstants.TS_SELENIUM_PROJECT_ROOT_FILE_NAME);
|
|
47
|
+
chai_1.expect(isFileImported).not.eqls(undefined);
|
|
46
48
|
});
|
|
47
|
-
test('
|
|
48
|
-
await workspaceHandlingTests.
|
|
49
|
+
test('Stop the workspace', async function () {
|
|
50
|
+
await workspaceHandlingTests.stopWorkspace(WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName());
|
|
51
|
+
await browserTabsUtil.closeAllTabsExceptCurrent();
|
|
49
52
|
});
|
|
53
|
+
test('Delete the workspace', async function () {
|
|
54
|
+
await workspaceHandlingTests.removeWorkspace(WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName());
|
|
55
|
+
});
|
|
56
|
+
loginTests.logoutFromChe();
|
|
50
57
|
});
|
|
51
58
|
});
|
|
52
59
|
//# sourceMappingURL=SmokeTest.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SmokeTest.spec.js","sourceRoot":"","sources":["../../specs/SmokeTest.spec.ts"],"names":[],"mappings":";;AAAA;;;;;;;;wEAQwE;AACxE,
|
|
1
|
+
{"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"}
|
|
@@ -21,33 +21,29 @@ const loginTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES
|
|
|
21
21
|
const browserTabsUtil = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.BrowserTabsUtil);
|
|
22
22
|
const stackName = 'Empty Workspace';
|
|
23
23
|
suite(`${stackName} test`, async () => {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
MochaHooks_1.registerRunningWorkspace(WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName());
|
|
30
|
-
});
|
|
31
|
-
test('Wait workspace readiness', async () => {
|
|
32
|
-
await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
|
|
33
|
-
const workbench = new monaco_page_objects_1.Workbench();
|
|
34
|
-
const activityBar = workbench.getActivityBar();
|
|
35
|
-
const activityBarControls = await activityBar.getViewControls();
|
|
36
|
-
Logger_1.Logger.debug(`Editor sections:`);
|
|
37
|
-
for (const control of activityBarControls) {
|
|
38
|
-
Logger_1.Logger.debug(`${await control.getTitle()}`);
|
|
39
|
-
}
|
|
40
|
-
});
|
|
24
|
+
loginTests.loginIntoChe();
|
|
25
|
+
workspaceHandlingTests.createAndOpenWorkspace(stackName);
|
|
26
|
+
workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
|
|
27
|
+
test('Register running workspace', async () => {
|
|
28
|
+
MochaHooks_1.registerRunningWorkspace(WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName());
|
|
41
29
|
});
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
30
|
+
test('Wait workspace readiness', async () => {
|
|
31
|
+
await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
|
|
32
|
+
const workbench = new monaco_page_objects_1.Workbench();
|
|
33
|
+
const activityBar = workbench.getActivityBar();
|
|
34
|
+
const activityBarControls = await activityBar.getViewControls();
|
|
35
|
+
Logger_1.Logger.debug(`Editor sections:`);
|
|
36
|
+
for (const control of activityBarControls) {
|
|
37
|
+
Logger_1.Logger.debug(`${await control.getTitle()}`);
|
|
38
|
+
}
|
|
51
39
|
});
|
|
40
|
+
test('Stop the workspace', async function () {
|
|
41
|
+
await workspaceHandlingTests.stopWorkspace(WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName());
|
|
42
|
+
await browserTabsUtil.closeAllTabsExceptCurrent();
|
|
43
|
+
});
|
|
44
|
+
test('Delete the workspace', async function () {
|
|
45
|
+
await workspaceHandlingTests.removeWorkspace(WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName());
|
|
46
|
+
});
|
|
47
|
+
loginTests.logoutFromChe();
|
|
52
48
|
});
|
|
53
49
|
//# sourceMappingURL=EmptyWorkspace.spec.js.map
|
|
@@ -1 +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,
|
|
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,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"}
|
|
@@ -15,36 +15,39 @@ const inversify_config_1 = require("../../configs/inversify.config");
|
|
|
15
15
|
const inversify_types_1 = require("../../configs/inversify.types");
|
|
16
16
|
const WorkspaceHandlingTests_1 = require("../../tests-library/WorkspaceHandlingTests");
|
|
17
17
|
const Logger_1 = require("../../utils/Logger");
|
|
18
|
-
const
|
|
19
|
-
const projectName = 'quarkus-quickstarts';
|
|
18
|
+
const BaseTestConstants_1 = require("../../constants/BaseTestConstants");
|
|
20
19
|
const projectAndFileTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.ProjectAndFileTests);
|
|
21
20
|
const workspaceHandlingTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.WorkspaceHandlingTests);
|
|
22
21
|
const loginTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.LoginTests);
|
|
22
|
+
const browserTabsUtil = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.BrowserTabsUtil);
|
|
23
|
+
const stackName = 'Java 11 with Quarkus';
|
|
24
|
+
const projectName = 'quarkus-quickstarts';
|
|
23
25
|
suite(`The ${stackName} userstory`, async function () {
|
|
24
26
|
let projectSection;
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
27
|
+
loginTests.loginIntoChe();
|
|
28
|
+
workspaceHandlingTests.createAndOpenWorkspace(stackName);
|
|
29
|
+
workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
|
|
30
|
+
test('Register running workspace', async () => {
|
|
31
|
+
MochaHooks_1.registerRunningWorkspace(WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName());
|
|
32
|
+
});
|
|
33
|
+
test('Wait workspace readiness', async function () {
|
|
34
|
+
await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
|
|
35
|
+
});
|
|
36
|
+
test('Check a project folder has been created', async function () {
|
|
37
|
+
projectSection = await new monaco_page_objects_1.SideBarView().getContent().getSection(projectName);
|
|
38
|
+
Logger_1.Logger.debug(`new SideBarView().getContent().getSection: get ${projectName}`);
|
|
39
|
+
});
|
|
40
|
+
test('Check the project files was imported', async function () {
|
|
41
|
+
await projectSection.findItem(BaseTestConstants_1.BaseTestConstants.TS_SELENIUM_PROJECT_ROOT_FILE_NAME);
|
|
42
|
+
Logger_1.Logger.debug(`projectSection.findItem: find ${BaseTestConstants_1.BaseTestConstants.TS_SELENIUM_PROJECT_ROOT_FILE_NAME}`);
|
|
43
|
+
});
|
|
44
|
+
test('Stop the workspace', async function () {
|
|
45
|
+
await workspaceHandlingTests.stopWorkspace(WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName());
|
|
46
|
+
await browserTabsUtil.closeAllTabsExceptCurrent();
|
|
47
|
+
});
|
|
48
|
+
test('Delete the workspace', async function () {
|
|
49
|
+
await workspaceHandlingTests.removeWorkspace(WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName());
|
|
48
50
|
});
|
|
51
|
+
loginTests.logoutFromChe();
|
|
49
52
|
});
|
|
50
53
|
//# sourceMappingURL=Quarkus.spec.js.map
|
|
@@ -1 +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;
|
|
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;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"}
|
|
@@ -49,8 +49,8 @@ class KubernetesCommandLineToolsExecutor extends ShellExecutor_1.ShellExecutor {
|
|
|
49
49
|
Logger_1.Logger.debug(`${this.getLoggingName(this.loginToOcp.name)}: User already logged`);
|
|
50
50
|
}
|
|
51
51
|
else {
|
|
52
|
-
Logger_1.Logger.debug(`${this.getLoggingName(this.loginToOcp.name)}: Login ${url}, ${
|
|
53
|
-
shelljs_1.exec(`oc login --server=${url} -u=${
|
|
52
|
+
Logger_1.Logger.debug(`${this.getLoggingName(this.loginToOcp.name)}: Login ${url}, ${OAuthConstants_1.OAuthConstants.TS_SELENIUM_OCP_USERNAME}`);
|
|
53
|
+
shelljs_1.exec(`oc login --server=${url} -u=${OAuthConstants_1.OAuthConstants.TS_SELENIUM_OCP_USERNAME} -p=${OAuthConstants_1.OAuthConstants.TS_SELENIUM_OCP_PASSWORD} --insecure-skip-tls-verify`);
|
|
54
54
|
}
|
|
55
55
|
}
|
|
56
56
|
else {
|
|
@@ -72,7 +72,7 @@ class KubernetesCommandLineToolsExecutor extends ShellExecutor_1.ShellExecutor {
|
|
|
72
72
|
Logger_1.Logger.debug(`${this.getLoggingName(this.deleteDevWorkspace.name)}: Delete '${this.workspaceName}' workspace`);
|
|
73
73
|
ShellExecutor_1.ShellExecutor.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} patch dw ${this.workspaceName} -n ${this.namespace} -p '{ "metadata": { "finalizers": null }}' --type merge || true`);
|
|
74
74
|
ShellExecutor_1.ShellExecutor.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} delete dw ${this.workspaceName} -n ${this.namespace} || true`);
|
|
75
|
-
ShellExecutor_1.ShellExecutor.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} delete dwt ${
|
|
75
|
+
ShellExecutor_1.ShellExecutor.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} delete dwt ${BaseTestConstants_1.BaseTestConstants.TS_SELENIUM_EDITOR}-${this.workspaceName} -n ${this.namespace} || true`);
|
|
76
76
|
}
|
|
77
77
|
applyAndWaitDevWorkspace(yamlConfiguration) {
|
|
78
78
|
if (this.KUBERNETES_COMMAND_LINE_TOOL === APITestConstants_1.KubernetesCommandLineTool.KUBECTL) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KubernetesCommandLineToolsExecutor.js","sourceRoot":"","sources":["../../utils/KubernetesCommandLineToolsExecutor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,qCAAkD;AAClD,qCAAkC;AAClC,mDAAgD;AAChD,2CAA6B;AAC7B,oEAA4F;AAC5F,sEAAmE;AACnE,gEAA6D;AAE7D,MAAa,kCAAmC,SAAQ,6BAAa;IAOjE,YAAY,cAAuB,EAAE,UAAmB;QACpD,KAAK,EAAE,CAAC;QAHK,iCAA4B,GAAW,mCAAgB,CAAC,wCAAwC,CAAC;QAI9G,IAAI,CAAC,aAAa,GAAG,cAAc,CAAC;QACpC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,gBAAgB;QAChB,OAAe,IAAI,CAAC,aAAa,CAAC;IACtC,CAAC;IAED,IAAI,YAAY;QACZ,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED,wDAAwD;IACxD,UAAU;QACN,IAAI,IAAI,CAAC,4BAA4B,KAAK,4CAAyB,CAAC,EAAE,EAAE;YACpE,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;YACxF,MAAM,GAAG,GAAW,IAAI,CAAC,YAAY,EAAE,CAAC;YACxC,IAAI,IAAI,CAAC,cAAc,EAAE,EAAE;gBACvB,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;aACrF;iBAAM;gBACH,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,GAAG,KAAK,
|
|
1
|
+
{"version":3,"file":"KubernetesCommandLineToolsExecutor.js","sourceRoot":"","sources":["../../utils/KubernetesCommandLineToolsExecutor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,qCAAkD;AAClD,qCAAkC;AAClC,mDAAgD;AAChD,2CAA6B;AAC7B,oEAA4F;AAC5F,sEAAmE;AACnE,gEAA6D;AAE7D,MAAa,kCAAmC,SAAQ,6BAAa;IAOjE,YAAY,cAAuB,EAAE,UAAmB;QACpD,KAAK,EAAE,CAAC;QAHK,iCAA4B,GAAW,mCAAgB,CAAC,wCAAwC,CAAC;QAI9G,IAAI,CAAC,aAAa,GAAG,cAAc,CAAC;QACpC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,gBAAgB;QAChB,OAAe,IAAI,CAAC,aAAa,CAAC;IACtC,CAAC;IAED,IAAI,YAAY;QACZ,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED,wDAAwD;IACxD,UAAU;QACN,IAAI,IAAI,CAAC,4BAA4B,KAAK,4CAAyB,CAAC,EAAE,EAAE;YACpE,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;YACxF,MAAM,GAAG,GAAW,IAAI,CAAC,YAAY,EAAE,CAAC;YACxC,IAAI,IAAI,CAAC,cAAc,EAAE,EAAE;gBACvB,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;aACrF;iBAAM;gBACH,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,GAAG,KAAK,+BAAc,CAAC,wBAAwB,EAAE,CAAC,CAAC;gBACvH,cAAI,CAAC,qBAAqB,GAAG,OAAO,+BAAc,CAAC,wBAAwB,OAAO,+BAAc,CAAC,wBAAwB,6BAA6B,CAAC,CAAC;aAC3J;SACJ;aAAM;YACH,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;SAC/F;IACL,CAAC;IAED,gBAAgB;QACZ,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QACxF,MAAM,MAAM,GAAgB,6BAAa,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,4BAA4B,CAAC,QAAQ,CAAC,kCAAkC,CAAC,GAAG,CAAC,gDAAgD,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;QAC9M,cAAI,CAAC,IAAI,CAAC,CAAC;QACX,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;IACzD,CAAC;IAED,mBAAmB;QACf,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;QAC/F,MAAM,MAAM,GAAgB,6BAAa,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,4BAA4B,CAAC,uDAAuD,IAAI,CAAC,aAAa,OAAO,IAAI,CAAC,SAAS,UAAU,CAAC,CAAC;QACtM,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC3E,CAAC;IAED,kBAAkB;QACd,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,aAAa,aAAa,CAAC,CAAC;QAC/G,6BAAa,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,4BAA4B,CAAC,aAAa,IAAI,CAAC,aAAa,OAAO,IAAI,CAAC,SAAS,kEAAkE,CAAC,CAAC;QACxL,6BAAa,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,4BAA4B,CAAC,cAAc,IAAI,CAAC,aAAa,OAAO,IAAI,CAAC,SAAS,UAAU,CAAC,CAAC;QACjI,6BAAa,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,4BAA4B,CAAC,eAAe,qCAAiB,CAAC,kBAAkB,IAAI,IAAI,CAAC,aAAa,OAAO,IAAI,CAAC,SAAS,UAAU,CAAC,CAAC;IAC9K,CAAC;IAED,wBAAwB,CAAC,iBAAyB;QAC9C,IAAI,IAAI,CAAC,4BAA4B,KAAK,4CAAyB,CAAC,OAAO,EAAE;YACzE,IAAI,CAAC,eAAe,EAAE,CAAC;SAC1B;QACD,IAAI,CAAC,oCAAoC,CAAC,iBAAiB,CAAC,CAAC;QAC7D,OAAO,IAAI,CAAC,gBAAgB,EAAE,CAAC;IACnC,CAAC;IAED,cAAc,CAAC,gBAAwB,EAAE,YAAoB,kCAAkC,CAAC,SAAS;QACrG,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAClE,OAAO,6BAAa,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,4BAA4B,CAAC,YAAY,kCAAkC,CAAC,GAAG,OAAO,IAAI,CAAC,SAAS,OAAO,SAAS,cAAc,gBAAgB,GAAG,CAAC,CAAC;IACrM,CAAC;IAED,oCAAoC,CAAC,iBAAyB;QAC1D,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,oCAAoC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxF,OAAO,6BAAa,CAAC,WAAW,CAAC,eAAe,IAAI,CAAC,4BAA4B,aAAa,IAAI,CAAC,SAAS,UAAU;YAClH,iBAAiB,GAAG,IAAI;YACxB,KAAK,CAAC,CAAC;IACf,CAAC;IAED,4BAA4B,CAAC,UAAkB;QAC3C,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAChF,6BAAa,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,4BAA4B,aAAa,IAAI,CAAC,SAAS,QAAQ,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAClI,CAAC;IAED,gCAAgC;QAC5B,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,gCAAgC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACpF,OAAO,6BAAa,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,4BAA4B,WAAW,IAAI,CAAC,aAAa,OAAO,IAAI,CAAC,SAAS,UAAU,CAAC,CAAC;IACvI,CAAC;IAED,gBAAgB,CAAC,UAAkB,GAAG;QAClC,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;QAC/F,MAAM,MAAM,GAAgB,6BAAa,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,4BAA4B,CAAC,YAAY,IAAI,CAAC,SAAS,6BAA6B,IAAI,CAAC,aAAa,cAAc,OAAO,GAAG,CAAC,CAAC;QAC/L,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAC/B,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,eAAe;QACX,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,uBAAuB,IAAI,CAAC,SAAS,IAAI,CAAC,CAAC;QACzG,6BAAa,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,4BAA4B,qBAAqB,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;IACzG,CAAC;IAED,aAAa,CAAC,WAAmB;QAC7B,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,yBAAyB,WAAW,IAAI,CAAC,CAAC;QACtG,6BAAa,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,4BAA4B,gBAAgB,WAAW,OAAO,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;IACtH,CAAC;IAED,aAAa,CAAC,WAAmB;QAC7B,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,aAAa,WAAW,IAAI,CAAC,CAAC;QAC1F,6BAAa,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,4BAA4B,mBAAmB,WAAW,OAAO,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;IACzH,CAAC;IAEO,uBAAuB;QAC3B,kCAAkC,CAAC,GAAG,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACpE,kCAAkC,CAAC,SAAS,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC3E,CAAC;IAEO,cAAc;QAClB,MAAM,mBAAmB,GAAgB,6BAAa,CAAC,WAAW,CAAC,2CAA2C,CAAC,CAAC;QAEhH,OAAO,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,+BAAc,CAAC,wBAAwB,CAAC,IAAI,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;IACpJ,CAAC;IAEO,cAAc,CAAC,UAAkB;QACrC,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,UAAU,MAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC,EAAE,CAAC;IAC7F,CAAC;IAEO,YAAY,CAAC,UAA8B;QAC/C,UAAU,GAAG,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU;YAC9C,CAAC,CAAC,qCAAiB,CAAC,oBAAoB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,+BAAc,CAAC,wBAAwB,GAAG,YAAY;gBACnH,CAAC,CAAC,qCAAiB,CAAC,oBAAoB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,+BAAc,CAAC,wBAAwB,GAAG,MAAM;oBACvG,CAAC,CAAC,SAAS,CAAC;QACxB,OAAO,UAAU,CAAC;IACtB,CAAC;IAEO,YAAY;QAChB,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QACpF,OAAO,qCAAiB,CAAC,oBAAoB,CAAC,OAAO,CAAC,gBAAgB,EAAE,KAAK,CAAC,GAAG,OAAO,CAAC;IAC7F,CAAC;CACJ;AAxID,gFAwIC;AAED,WAAiB,kCAAkC;IAC/C,MAAa,iBAAkB,SAAQ,kCAAkC;QACrE,YAAY,OAA2C;YACnD,KAAK,CAAC,OAAO,CAAC,gBAAgB,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;QAC1D,CAAC;QAED,EAAE,CAAC,OAAe,EAAE;YAChB,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;QAC7C,CAAC;QAED,GAAG;YACC,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QACtC,CAAC;QAED,EAAE,CAAC,IAAY;YACX,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;QAC7C,CAAC;QAED,QAAQ,CAAC,UAAkB;YACvB,OAAO,IAAI,CAAC,cAAc,CAAC,YAAY,GAAG,UAAU,CAAC,CAAC;QAC1D,CAAC;QAED,YAAY,CAAC,IAAY;YACrB,OAAO,IAAI,CAAC,cAAc,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC;QACjD,CAAC;QAED,WAAW,CAAC,OAAe;YACvB,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YACxC,MAAM,MAAM,GAAgB,IAAI,CAAC,cAAc,CAAC,cAAc,OAAO,EAAE,CAAC,CAAC;YACzE,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAClC,MAAM,CAAC,MAAM;qBACR,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;qBAC7C,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC/B,CAAC;KACJ;IAjCY,oDAAiB,oBAiC7B,CAAA;AACL,CAAC,EAnCgB,kCAAkC,GAAlC,0CAAkC,KAAlC,0CAAkC,QAmClD"}
|
package/dist/utils/StringUtil.js
CHANGED
|
@@ -28,6 +28,9 @@ let StringUtil = class StringUtil {
|
|
|
28
28
|
*/
|
|
29
29
|
static getProjectNameFromGitUrl(url) {
|
|
30
30
|
Logger_1.Logger.debug(`${this.constructor.name}.${this.getProjectNameFromGitUrl.name} - ${url}`);
|
|
31
|
+
if (url.includes('?')) {
|
|
32
|
+
url = url.substring(0, url.indexOf('?'));
|
|
33
|
+
}
|
|
31
34
|
if (url.includes('/tree/')) {
|
|
32
35
|
url = url.split('/').slice(0, -2).join('/');
|
|
33
36
|
}
|
|
@@ -1 +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;
|
|
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,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
CHANGED
|
@@ -15,27 +15,17 @@ import { DriverHelper } from '../../utils/DriverHelper';
|
|
|
15
15
|
import { TimeoutConstants } from '../../constants/TimeoutConstants';
|
|
16
16
|
import { Workspaces } from './Workspaces';
|
|
17
17
|
import { Logger } from '../../utils/Logger';
|
|
18
|
-
import { OAuthConstants } from '../../constants/OAuthConstants';
|
|
19
18
|
import { BaseTestConstants } from '../../constants/BaseTestConstants';
|
|
20
19
|
|
|
21
20
|
@injectable()
|
|
22
21
|
export class Dashboard {
|
|
23
|
-
private static readonly
|
|
24
|
-
private static readonly
|
|
25
|
-
private static readonly
|
|
26
|
-
private static readonly
|
|
27
|
-
private static readonly
|
|
28
|
-
private static readonly
|
|
29
|
-
|
|
30
|
-
private static getUserDropdownMenuButtonLocator(): By {
|
|
31
|
-
Logger.debug(`Dashboard.getUserDropdownMenuButtonLocator: get current user.`);
|
|
32
|
-
|
|
33
|
-
const currentUser: string = OAuthConstants.TS_SELENIUM_OCP_USERNAME;
|
|
34
|
-
Logger.debug(`Dashboard.getUserDropdownMenuButtonLocator: ${currentUser}.`);
|
|
35
|
-
|
|
36
|
-
return By.xpath(`//*[text()="${currentUser}"]//parent::button`);
|
|
37
|
-
|
|
38
|
-
}
|
|
22
|
+
private static readonly WORKSPACES_BUTTON: By = By.xpath(`//div[@id='page-sidebar']//a[contains(text(), 'Workspaces (')]`);
|
|
23
|
+
private static readonly CREATE_WORKSPACE_BUTTON: By = By.xpath(`//div[@id='page-sidebar']//a[text()='Create Workspace']`);
|
|
24
|
+
private static readonly LOADER_PAGE_STEP_TITLES: By = By.xpath('//*[@data-testid="step-title"]');
|
|
25
|
+
private static readonly STARTING_PAGE_LOADER: By = By.css('.main-page-loader');
|
|
26
|
+
private static readonly LOADER_ALERT: By = By.xpath('//*[@data-testid="loader-alert"]');
|
|
27
|
+
private static readonly LOGOUT_BUTTON: By = By.xpath('//button[text()="Logout"]');
|
|
28
|
+
private static readonly USER_SETTINGS_DROPDOWN: By = By.xpath('//header//button/span[text()!=\'\']//parent::button');
|
|
39
29
|
|
|
40
30
|
constructor(@inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper,
|
|
41
31
|
@inject(CLASSES.Workspaces) private readonly workspaces: Workspaces) {
|
|
@@ -82,65 +72,47 @@ export class Dashboard {
|
|
|
82
72
|
async waitPage(timeout: number = TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT): Promise<void> {
|
|
83
73
|
Logger.debug('Dashboard.waitPage');
|
|
84
74
|
|
|
85
|
-
await this.driverHelper.waitVisibility(
|
|
86
|
-
await this.driverHelper.waitVisibility(
|
|
75
|
+
await this.driverHelper.waitVisibility(Dashboard.WORKSPACES_BUTTON, timeout);
|
|
76
|
+
await this.driverHelper.waitVisibility(Dashboard.CREATE_WORKSPACE_BUTTON, timeout);
|
|
87
77
|
}
|
|
88
78
|
|
|
89
79
|
async clickWorkspacesButton(timeout: number = TimeoutConstants.TS_CLICK_DASHBOARD_ITEM_TIMEOUT): Promise<void> {
|
|
90
80
|
Logger.debug('Dashboard.clickWorkspacesButton');
|
|
91
81
|
|
|
92
|
-
await this.driverHelper.waitAndClick(
|
|
82
|
+
await this.driverHelper.waitAndClick(Dashboard.WORKSPACES_BUTTON, timeout);
|
|
93
83
|
}
|
|
94
84
|
|
|
95
85
|
async clickCreateWorkspaceButton(timeout: number = TimeoutConstants.TS_CLICK_DASHBOARD_ITEM_TIMEOUT): Promise<void> {
|
|
96
86
|
Logger.debug('Dashboard.clickCreateWorkspaceButton');
|
|
97
87
|
|
|
98
|
-
await this.driverHelper.waitAndClick(
|
|
88
|
+
await this.driverHelper.waitAndClick(Dashboard.CREATE_WORKSPACE_BUTTON, timeout);
|
|
99
89
|
}
|
|
100
90
|
|
|
101
91
|
async getLoaderAlert(timeout: number = TimeoutConstants.TS_WAIT_LOADER_PRESENCE_TIMEOUT): Promise<string> {
|
|
102
92
|
Logger.debug('Dashboard.getLoaderAlert');
|
|
103
93
|
|
|
104
|
-
return await this.driverHelper.waitAndGetText(
|
|
94
|
+
return await this.driverHelper.waitAndGetText(Dashboard.LOADER_ALERT, timeout);
|
|
105
95
|
}
|
|
106
96
|
|
|
107
97
|
async waitLoader(timeout: number = TimeoutConstants.TS_WAIT_LOADER_PRESENCE_TIMEOUT): Promise<void> {
|
|
108
98
|
Logger.debug('Dashboard.waitLoader');
|
|
109
99
|
|
|
110
|
-
await this.driverHelper.waitAllPresence(
|
|
111
|
-
}
|
|
112
|
-
|
|
113
|
-
async waitLoaderDisappearance(timeout: number = TimeoutConstants.TS_WAIT_LOADER_ABSENCE_TIMEOUT): Promise<void> {
|
|
114
|
-
Logger.debug('Dashboard.waitLoaderDisappearance');
|
|
115
|
-
|
|
116
|
-
await this.driverHelper.waitDisappearance(By.xpath(Dashboard.LOADER_PAGE_STEP_TITLES_XPATH), timeout);
|
|
117
|
-
}
|
|
118
|
-
|
|
119
|
-
async waitDisappearanceNavigationMenu(timeout: number = TimeoutConstants.TS_COMMON_DASHBOARD_WAIT_TIMEOUT): Promise<void> {
|
|
120
|
-
Logger.debug('Dashboard.waitDisappearanceNavigationMenu');
|
|
121
|
-
|
|
122
|
-
await this.driverHelper.waitDisappearance(By.id('chenavmenu'), timeout);
|
|
100
|
+
await this.driverHelper.waitAllPresence(Dashboard.LOADER_PAGE_STEP_TITLES, timeout);
|
|
123
101
|
}
|
|
124
102
|
|
|
125
103
|
async waitStartingPageLoaderDisappearance(timeout: number = TimeoutConstants.TS_COMMON_DASHBOARD_WAIT_TIMEOUT): Promise<void> {
|
|
126
104
|
Logger.debug(`Dashboard.waitStartingPageLoaderDisappearance`);
|
|
127
105
|
|
|
128
|
-
await this.driverHelper.waitDisappearance(
|
|
106
|
+
await this.driverHelper.waitDisappearance(Dashboard.STARTING_PAGE_LOADER, timeout);
|
|
129
107
|
await this.driverHelper.wait(TimeoutConstants.TS_SELENIUM_DEFAULT_POLLING);
|
|
130
108
|
}
|
|
131
109
|
|
|
132
|
-
async getRecentWorkspaceName(timeout: number = TimeoutConstants.TS_COMMON_DASHBOARD_WAIT_TIMEOUT): Promise<string> {
|
|
133
|
-
Logger.debug(`Dashboard.getRecentWorkspaceName`);
|
|
134
|
-
|
|
135
|
-
return await this.driverHelper.waitAndGetText(By.css('[data-testid="recent-workspace-item"]'), timeout);
|
|
136
|
-
}
|
|
137
|
-
|
|
138
110
|
async logout(timeout: number = TimeoutConstants.TS_COMMON_DASHBOARD_WAIT_TIMEOUT): Promise<void> {
|
|
139
111
|
Logger.debug(`Dashboard.logout`);
|
|
140
112
|
|
|
141
113
|
await this.openDashboard();
|
|
142
|
-
await this.driverHelper.waitAndClick(Dashboard.
|
|
143
|
-
await this.driverHelper.waitAndClick(
|
|
144
|
-
await this.driverHelper.waitDisappearance(Dashboard.
|
|
114
|
+
await this.driverHelper.waitAndClick(Dashboard.USER_SETTINGS_DROPDOWN, timeout);
|
|
115
|
+
await this.driverHelper.waitAndClick(Dashboard.LOGOUT_BUTTON, timeout);
|
|
116
|
+
await this.driverHelper.waitDisappearance(Dashboard.USER_SETTINGS_DROPDOWN, timeout);
|
|
145
117
|
}
|
|
146
118
|
}
|
package/specs/SmokeTest.spec.ts
CHANGED
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
*
|
|
8
8
|
* SPDX-License-Identifier: EPL-2.0
|
|
9
9
|
**********************************************************************/
|
|
10
|
-
import { SideBarView, ViewSection } from 'monaco-page-objects';
|
|
10
|
+
import { SideBarView, ViewItem, ViewSection } from 'monaco-page-objects';
|
|
11
11
|
import { ProjectAndFileTests } from '../tests-library/ProjectAndFileTests';
|
|
12
12
|
import { CLASSES } from '../configs/inversify.types';
|
|
13
13
|
import { e2eContainer } from '../configs/inversify.config';
|
|
@@ -17,14 +17,17 @@ import { Logger } from '../utils/Logger';
|
|
|
17
17
|
import { LoginTests } from '../tests-library/LoginTests';
|
|
18
18
|
import { StringUtil } from '../utils/StringUtil';
|
|
19
19
|
import { FactoryTestConstants } from '../constants/FactoryTestConstants';
|
|
20
|
+
import { BrowserTabsUtil } from '../utils/BrowserTabsUtil';
|
|
21
|
+
import { expect } from 'chai';
|
|
22
|
+
import { BaseTestConstants } from '../constants/BaseTestConstants';
|
|
20
23
|
|
|
21
|
-
const factoryUrl: string = FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_REPO_URL || 'https://github.com/che-incubator/quarkus-api-example.git';
|
|
22
24
|
const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
|
|
23
25
|
const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
|
|
24
26
|
const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
|
|
25
|
-
|
|
27
|
+
const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
|
|
26
28
|
|
|
27
29
|
suite(`The SmokeTest userstory`, async function (): Promise<void> {
|
|
30
|
+
const factoryUrl: string = FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_REPO_URL || 'https://github.com/che-incubator/quarkus-api-example.git';
|
|
28
31
|
let projectSection: ViewSection;
|
|
29
32
|
suite(`Create workspace from factory:${factoryUrl}`, async function (): Promise<void> {
|
|
30
33
|
loginTests.loginIntoChe();
|
|
@@ -37,17 +40,22 @@ suite(`The SmokeTest userstory`, async function (): Promise<void> {
|
|
|
37
40
|
await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
|
|
38
41
|
});
|
|
39
42
|
test('Check a project folder has been created', async function (): Promise<void> {
|
|
40
|
-
projectName = StringUtil.getProjectNameFromGitUrl(factoryUrl);
|
|
43
|
+
const projectName: string = StringUtil.getProjectNameFromGitUrl(factoryUrl);
|
|
41
44
|
projectSection = await new SideBarView().getContent().getSection(projectName);
|
|
42
45
|
Logger.debug(`new SideBarView().getContent().getSection: get ${projectName}`);
|
|
43
46
|
});
|
|
44
47
|
test('Check the project files was imported', async function (): Promise<void> {
|
|
45
|
-
|
|
46
|
-
await projectSection.findItem(
|
|
47
|
-
|
|
48
|
+
Logger.debug(`projectSection.findItem: find ${BaseTestConstants.TS_SELENIUM_PROJECT_ROOT_FILE_NAME}`);
|
|
49
|
+
const isFileImported: ViewItem | undefined = await projectSection.findItem(BaseTestConstants.TS_SELENIUM_PROJECT_ROOT_FILE_NAME);
|
|
50
|
+
expect(isFileImported).not.eqls(undefined);
|
|
48
51
|
});
|
|
49
|
-
test('
|
|
50
|
-
await workspaceHandlingTests.
|
|
52
|
+
test('Stop the workspace', async function (): Promise<void> {
|
|
53
|
+
await workspaceHandlingTests.stopWorkspace(WorkspaceHandlingTests.getWorkspaceName());
|
|
54
|
+
await browserTabsUtil.closeAllTabsExceptCurrent();
|
|
51
55
|
});
|
|
56
|
+
test('Delete the workspace', async function (): Promise<void> {
|
|
57
|
+
await workspaceHandlingTests.removeWorkspace(WorkspaceHandlingTests.getWorkspaceName());
|
|
58
|
+
});
|
|
59
|
+
loginTests.logoutFromChe();
|
|
52
60
|
});
|
|
53
61
|
});
|
|
@@ -25,36 +25,37 @@ const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUti
|
|
|
25
25
|
const stackName: string = 'Empty Workspace';
|
|
26
26
|
|
|
27
27
|
suite(`${stackName} test`, async () => {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
|
|
37
|
-
|
|
38
|
-
const workbench: Workbench = new Workbench();
|
|
39
|
-
const activityBar: ActivityBar = workbench.getActivityBar();
|
|
40
|
-
const activityBarControls: ViewControl[] = await activityBar.getViewControls();
|
|
41
|
-
|
|
42
|
-
Logger.debug(`Editor sections:`);
|
|
43
|
-
for (const control of activityBarControls) {
|
|
44
|
-
Logger.debug(`${await control.getTitle()}`);
|
|
45
|
-
}
|
|
46
|
-
});
|
|
28
|
+
loginTests.loginIntoChe();
|
|
29
|
+
|
|
30
|
+
workspaceHandlingTests.createAndOpenWorkspace(stackName);
|
|
31
|
+
|
|
32
|
+
workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
|
|
33
|
+
|
|
34
|
+
test('Register running workspace', async () => {
|
|
35
|
+
registerRunningWorkspace(WorkspaceHandlingTests.getWorkspaceName());
|
|
47
36
|
});
|
|
48
37
|
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
await workspaceHandlingTests.stopWorkspace(WorkspaceHandlingTests.getWorkspaceName());
|
|
52
|
-
await browserTabsUtil.closeAllTabsExceptCurrent();
|
|
53
|
-
});
|
|
38
|
+
test('Wait workspace readiness', async () => {
|
|
39
|
+
await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
|
|
54
40
|
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
41
|
+
const workbench: Workbench = new Workbench();
|
|
42
|
+
const activityBar: ActivityBar = workbench.getActivityBar();
|
|
43
|
+
const activityBarControls: ViewControl[] = await activityBar.getViewControls();
|
|
44
|
+
|
|
45
|
+
Logger.debug(`Editor sections:`);
|
|
46
|
+
for (const control of activityBarControls) {
|
|
47
|
+
Logger.debug(`${await control.getTitle()}`);
|
|
48
|
+
}
|
|
59
49
|
});
|
|
50
|
+
|
|
51
|
+
test('Stop the workspace', async function (): Promise<void> {
|
|
52
|
+
await workspaceHandlingTests.stopWorkspace(WorkspaceHandlingTests.getWorkspaceName());
|
|
53
|
+
await browserTabsUtil.closeAllTabsExceptCurrent();
|
|
54
|
+
});
|
|
55
|
+
|
|
56
|
+
test('Delete the workspace', async function (): Promise<void> {
|
|
57
|
+
await workspaceHandlingTests.removeWorkspace(WorkspaceHandlingTests.getWorkspaceName());
|
|
58
|
+
});
|
|
59
|
+
|
|
60
|
+
loginTests.logoutFromChe();
|
|
60
61
|
});
|
|
@@ -16,37 +16,51 @@ import { CLASSES } from '../../configs/inversify.types';
|
|
|
16
16
|
import { WorkspaceHandlingTests } from '../../tests-library/WorkspaceHandlingTests';
|
|
17
17
|
import { ProjectAndFileTests } from '../../tests-library/ProjectAndFileTests';
|
|
18
18
|
import { Logger } from '../../utils/Logger';
|
|
19
|
+
import { BaseTestConstants } from '../../constants/BaseTestConstants';
|
|
20
|
+
import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
|
|
19
21
|
|
|
20
|
-
const stackName: string = 'Java 11 with Quarkus';
|
|
21
|
-
const projectName: string = 'quarkus-quickstarts';
|
|
22
22
|
const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
|
|
23
23
|
const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
|
|
24
24
|
const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
|
|
25
|
+
const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
|
|
26
|
+
|
|
27
|
+
const stackName: string = 'Java 11 with Quarkus';
|
|
28
|
+
const projectName: string = 'quarkus-quickstarts';
|
|
25
29
|
|
|
26
30
|
suite(`The ${stackName} userstory`, async function (): Promise<void> {
|
|
27
31
|
let projectSection: ViewSection;
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
32
|
+
|
|
33
|
+
loginTests.loginIntoChe();
|
|
34
|
+
|
|
35
|
+
workspaceHandlingTests.createAndOpenWorkspace(stackName);
|
|
36
|
+
|
|
37
|
+
workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
|
|
38
|
+
|
|
39
|
+
test('Register running workspace', async () => {
|
|
40
|
+
registerRunningWorkspace(WorkspaceHandlingTests.getWorkspaceName());
|
|
41
|
+
});
|
|
42
|
+
|
|
43
|
+
test('Wait workspace readiness', async function (): Promise<void> {
|
|
44
|
+
await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
|
|
45
|
+
});
|
|
46
|
+
|
|
47
|
+
test('Check a project folder has been created', async function (): Promise<void> {
|
|
48
|
+
projectSection = await new SideBarView().getContent().getSection(projectName);
|
|
49
|
+
Logger.debug(`new SideBarView().getContent().getSection: get ${projectName}`);
|
|
50
|
+
});
|
|
51
|
+
|
|
52
|
+
test('Check the project files was imported', async function (): Promise<void> {
|
|
53
|
+
await projectSection.findItem(BaseTestConstants.TS_SELENIUM_PROJECT_ROOT_FILE_NAME);
|
|
54
|
+
Logger.debug(`projectSection.findItem: find ${BaseTestConstants.TS_SELENIUM_PROJECT_ROOT_FILE_NAME}`);
|
|
55
|
+
});
|
|
56
|
+
|
|
57
|
+
test('Stop the workspace', async function (): Promise<void> {
|
|
58
|
+
await workspaceHandlingTests.stopWorkspace(WorkspaceHandlingTests.getWorkspaceName());
|
|
59
|
+
await browserTabsUtil.closeAllTabsExceptCurrent();
|
|
60
|
+
});
|
|
61
|
+
|
|
62
|
+
test('Delete the workspace', async function (): Promise<void> {
|
|
63
|
+
await workspaceHandlingTests.removeWorkspace(WorkspaceHandlingTests.getWorkspaceName());
|
|
51
64
|
});
|
|
65
|
+
loginTests.logoutFromChe();
|
|
52
66
|
});
|
|
@@ -35,8 +35,8 @@ export class KubernetesCommandLineToolsExecutor extends ShellExecutor {
|
|
|
35
35
|
if (this.isUserLoggedIn()) {
|
|
36
36
|
Logger.debug(`${this.getLoggingName(this.loginToOcp.name)}: User already logged`);
|
|
37
37
|
} else {
|
|
38
|
-
Logger.debug(`${this.getLoggingName(this.loginToOcp.name)}: Login ${url}, ${
|
|
39
|
-
exec(`oc login --server=${url} -u=${
|
|
38
|
+
Logger.debug(`${this.getLoggingName(this.loginToOcp.name)}: Login ${url}, ${OAuthConstants.TS_SELENIUM_OCP_USERNAME}`);
|
|
39
|
+
exec(`oc login --server=${url} -u=${OAuthConstants.TS_SELENIUM_OCP_USERNAME} -p=${OAuthConstants.TS_SELENIUM_OCP_PASSWORD} --insecure-skip-tls-verify`);
|
|
40
40
|
}
|
|
41
41
|
} else {
|
|
42
42
|
Logger.debug(`${this.getLoggingName(this.loginToOcp.name)}: doesn't support login command`);
|
|
@@ -60,7 +60,7 @@ export class KubernetesCommandLineToolsExecutor extends ShellExecutor {
|
|
|
60
60
|
Logger.debug(`${this.getLoggingName(this.deleteDevWorkspace.name)}: Delete '${this.workspaceName}' workspace`);
|
|
61
61
|
ShellExecutor.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} patch dw ${this.workspaceName} -n ${this.namespace} -p '{ "metadata": { "finalizers": null }}' --type merge || true`);
|
|
62
62
|
ShellExecutor.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} delete dw ${this.workspaceName} -n ${this.namespace} || true`);
|
|
63
|
-
ShellExecutor.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} delete dwt ${
|
|
63
|
+
ShellExecutor.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} delete dwt ${BaseTestConstants.TS_SELENIUM_EDITOR}-${this.workspaceName} -n ${this.namespace} || true`);
|
|
64
64
|
}
|
|
65
65
|
|
|
66
66
|
applyAndWaitDevWorkspace(yamlConfiguration: string): ShellString {
|
package/utils/StringUtil.ts
CHANGED
|
@@ -23,6 +23,9 @@ export class StringUtil {
|
|
|
23
23
|
*/
|
|
24
24
|
static getProjectNameFromGitUrl(url: string): string {
|
|
25
25
|
Logger.debug(`${this.constructor.name}.${this.getProjectNameFromGitUrl.name} - ${url}`);
|
|
26
|
+
if (url.includes('?')) {
|
|
27
|
+
url = url.substring(0, url.indexOf('?'));
|
|
28
|
+
}
|
|
26
29
|
if (url.includes('/tree/')) {
|
|
27
30
|
url = url.split('/').slice(0, -2).join('/');
|
|
28
31
|
}
|