@eclipse-che/che-e2e 7.74.0-dev-41d1364 → 7.74.0-dev-aace77a
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/.eslintrc.js +15 -1
- package/CODE_STYLE.md +144 -0
- package/configs/inversify.config.ts +26 -5
- package/configs/inversify.types.ts +17 -3
- package/constants/CHROME_DRIVER_CONSTANTS.ts +1 -13
- package/dist/configs/inversify.config.js +22 -1
- package/dist/configs/inversify.config.js.map +1 -1
- package/dist/configs/inversify.types.js +17 -3
- package/dist/configs/inversify.types.js.map +1 -1
- package/dist/constants/CHROME_DRIVER_CONSTANTS.js +1 -9
- package/dist/constants/CHROME_DRIVER_CONSTANTS.js.map +1 -1
- package/dist/driver/ChromeDriver.js +1 -7
- package/dist/driver/ChromeDriver.js.map +1 -1
- package/dist/index.js +9 -3
- package/dist/index.js.map +1 -1
- package/dist/pageobjects/dashboard/CreateWorkspace.js +5 -5
- package/dist/pageobjects/dashboard/CreateWorkspace.js.map +1 -1
- package/dist/pageobjects/dashboard/Dashboard.js +5 -6
- package/dist/pageobjects/dashboard/Dashboard.js.map +1 -1
- package/dist/pageobjects/dashboard/Workspaces.js +34 -39
- package/dist/pageobjects/dashboard/Workspaces.js.map +1 -1
- package/dist/pageobjects/dashboard/workspace-details/WorkspaceDetails.js +27 -28
- package/dist/pageobjects/dashboard/workspace-details/WorkspaceDetails.js.map +1 -1
- package/dist/pageobjects/git-providers/OauthPage.js +2 -2
- package/dist/pageobjects/git-providers/OauthPage.js.map +1 -1
- package/dist/pageobjects/ide/CheCodeLocatorLoader.js +18 -4
- package/dist/pageobjects/ide/CheCodeLocatorLoader.js.map +1 -1
- package/dist/pageobjects/login/kubernetes/DexLoginPage.js +11 -11
- package/dist/pageobjects/login/kubernetes/DexLoginPage.js.map +1 -1
- package/dist/pageobjects/login/kubernetes/KubernetesLoginPage.js +2 -2
- package/dist/pageobjects/login/kubernetes/KubernetesLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/OcpLoginPage.js +20 -24
- package/dist/pageobjects/login/openshift/OcpLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/OcpRedHatLoginPage.js +10 -13
- package/dist/pageobjects/login/openshift/OcpRedHatLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/OcpUserLoginPage.js +3 -3
- package/dist/pageobjects/login/openshift/OcpUserLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/RedHatLoginPage.js +16 -20
- package/dist/pageobjects/login/openshift/RedHatLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/RegularUserOcpCheLoginPage.js +16 -15
- package/dist/pageobjects/login/openshift/RegularUserOcpCheLoginPage.js.map +1 -1
- package/dist/pageobjects/openshift/OcpApplicationPage.js +7 -7
- package/dist/pageobjects/openshift/OcpApplicationPage.js.map +1 -1
- package/dist/pageobjects/openshift/OcpImportFromGitPage.js +20 -20
- package/dist/pageobjects/openshift/OcpImportFromGitPage.js.map +1 -1
- package/dist/pageobjects/openshift/OcpMainPage.js +25 -25
- package/dist/pageobjects/openshift/OcpMainPage.js.map +1 -1
- package/dist/specs/MochaHooks.js +9 -6
- package/dist/specs/MochaHooks.js.map +1 -1
- package/dist/specs/SmokeTest.spec.js +6 -6
- package/dist/specs/SmokeTest.spec.js.map +1 -1
- package/dist/specs/api/ContainerOverridesAPI.spec.js +7 -14
- package/dist/specs/api/ContainerOverridesAPI.spec.js.map +1 -1
- package/dist/specs/api/DevfileAcceptanceTestAPI.spec.js +11 -19
- package/dist/specs/api/DevfileAcceptanceTestAPI.spec.js.map +1 -1
- package/dist/specs/api/EmptyWorkspaceAPI.spec.js +10 -16
- package/dist/specs/api/EmptyWorkspaceAPI.spec.js.map +1 -1
- package/dist/specs/api/PodOverridesAPI.spec.js +7 -14
- package/dist/specs/api/PodOverridesAPI.spec.js.map +1 -1
- package/dist/specs/dashboard-samples/EmptyWorkspace.spec.js +5 -5
- package/dist/specs/dashboard-samples/EmptyWorkspace.spec.js.map +1 -1
- package/dist/specs/dashboard-samples/Quarkus.spec.js +6 -6
- package/dist/specs/dashboard-samples/Quarkus.spec.js.map +1 -1
- package/dist/specs/dashboard-samples/RecommendedExtensions.spec.js +11 -11
- package/dist/specs/dashboard-samples/RecommendedExtensions.spec.js.map +1 -1
- package/dist/specs/devconsole-intergration/DevConsoleIntegration.spec.js +11 -12
- package/dist/specs/devconsole-intergration/DevConsoleIntegration.spec.js.map +1 -1
- package/dist/specs/factory/Factory.spec.js +13 -16
- package/dist/specs/factory/Factory.spec.js.map +1 -1
- package/dist/specs/factory/NoSetupRepoFactory.spec.js +17 -18
- package/dist/specs/factory/NoSetupRepoFactory.spec.js.map +1 -1
- package/dist/specs/factory/RefusedOAuthFactory.spec.js +17 -19
- package/dist/specs/factory/RefusedOAuthFactory.spec.js.map +1 -1
- package/dist/specs/miscellaneous/PredefinedNamespace.spec.js +35 -41
- package/dist/specs/miscellaneous/PredefinedNamespace.spec.js.map +1 -1
- package/dist/tests-library/LoginTests.js +8 -8
- package/dist/tests-library/LoginTests.js.map +1 -1
- package/dist/tests-library/ProjectAndFileTests.js +2 -2
- package/dist/tests-library/ProjectAndFileTests.js.map +1 -1
- package/dist/tests-library/WorkspaceHandlingTests.js +8 -8
- package/dist/tests-library/WorkspaceHandlingTests.js.map +1 -1
- package/dist/utils/BrowserTabsUtil.js +4 -9
- package/dist/utils/BrowserTabsUtil.js.map +1 -1
- package/dist/utils/CheReporter.js +49 -23
- package/dist/utils/CheReporter.js.map +1 -1
- package/dist/utils/DevWorkspaceConfigurationHelper.js +27 -17
- package/dist/utils/DevWorkspaceConfigurationHelper.js.map +1 -1
- package/dist/utils/DevfilesRegistryHelper.js +15 -5
- package/dist/utils/DevfilesRegistryHelper.js.map +1 -1
- package/dist/utils/DriverHelper.js +9 -2
- package/dist/utils/DriverHelper.js.map +1 -1
- package/dist/utils/IContextParams.js +12 -0
- package/dist/utils/IContextParams.js.map +1 -0
- package/dist/utils/IKubernetesCommandLineToolsExecutor.js +3 -0
- package/dist/utils/IKubernetesCommandLineToolsExecutor.js.map +1 -0
- package/dist/utils/KubernetesCommandLineToolsExecutor.js +133 -98
- package/dist/utils/KubernetesCommandLineToolsExecutor.js.map +1 -1
- package/dist/utils/ScreenCatcher.js +8 -4
- package/dist/utils/ScreenCatcher.js.map +1 -1
- package/dist/utils/ShellExecutor.js +20 -9
- package/dist/utils/ShellExecutor.js.map +1 -1
- package/dist/utils/StringUtil.js +4 -2
- package/dist/utils/StringUtil.js.map +1 -1
- package/dist/utils/request-handlers/CheApiRequestHandler.js +2 -2
- package/dist/utils/request-handlers/CheApiRequestHandler.js.map +1 -1
- package/dist/utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.js +2 -2
- package/dist/utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.js.map +1 -1
- package/dist/utils/workspace/ApiUrlResolver.js +2 -2
- package/dist/utils/workspace/ApiUrlResolver.js.map +1 -1
- package/dist/utils/workspace/TestWorkspaceUtil.js +4 -4
- package/dist/utils/workspace/TestWorkspaceUtil.js.map +1 -1
- package/driver/ChromeDriver.ts +0 -7
- package/index.ts +2 -0
- package/package.json +3 -3
- package/pageobjects/dashboard/CreateWorkspace.ts +5 -4
- package/pageobjects/dashboard/Dashboard.ts +3 -4
- package/pageobjects/dashboard/Workspaces.ts +40 -48
- package/pageobjects/dashboard/workspace-details/WorkspaceDetails.ts +23 -26
- package/pageobjects/ide/CheCodeLocatorLoader.ts +3 -1
- package/pageobjects/login/interfaces/ICheLoginPage.ts +1 -1
- package/pageobjects/login/interfaces/IOcpLoginPage.ts +1 -1
- package/pageobjects/login/kubernetes/DexLoginPage.ts +9 -9
- package/pageobjects/login/openshift/OcpLoginPage.ts +18 -30
- package/pageobjects/login/openshift/OcpRedHatLoginPage.ts +6 -11
- package/pageobjects/login/openshift/OcpUserLoginPage.ts +1 -1
- package/pageobjects/login/openshift/RedHatLoginPage.ts +17 -16
- package/pageobjects/login/openshift/RegularUserOcpCheLoginPage.ts +16 -11
- package/pageobjects/openshift/OcpApplicationPage.ts +5 -4
- package/pageobjects/openshift/OcpImportFromGitPage.ts +18 -20
- package/pageobjects/openshift/OcpMainPage.ts +24 -25
- package/specs/MochaHooks.ts +3 -5
- package/specs/SmokeTest.spec.ts +4 -5
- package/specs/api/ContainerOverridesAPI.spec.ts +8 -2
- package/specs/api/DevfileAcceptanceTestAPI.spec.ts +9 -7
- package/specs/api/EmptyWorkspaceAPI.spec.ts +8 -4
- package/specs/api/PodOverridesAPI.spec.ts +8 -3
- package/specs/dashboard-samples/EmptyWorkspace.spec.ts +5 -5
- package/specs/dashboard-samples/Quarkus.spec.ts +7 -6
- package/specs/dashboard-samples/RecommendedExtensions.spec.ts +8 -7
- package/specs/devconsole-intergration/DevConsoleIntegration.spec.ts +12 -11
- package/specs/factory/Factory.spec.ts +8 -12
- package/specs/factory/NoSetupRepoFactory.spec.ts +10 -11
- package/specs/factory/RefusedOAuthFactory.spec.ts +8 -10
- package/specs/miscellaneous/PredefinedNamespace.spec.ts +40 -44
- package/tests-library/LoginTests.ts +3 -3
- package/tests-library/WorkspaceHandlingTests.ts +2 -2
- package/utils/BrowserTabsUtil.ts +7 -9
- package/utils/CheReporter.ts +26 -20
- package/utils/DevWorkspaceConfigurationHelper.ts +9 -24
- package/utils/DevfilesRegistryHelper.ts +8 -3
- package/utils/DriverHelper.ts +14 -12
- package/utils/IContextParams.ts +26 -0
- package/utils/IKubernetesCommandLineToolsExecutor.ts +42 -0
- package/utils/KubernetesCommandLineToolsExecutor.ts +133 -101
- package/utils/ShellExecutor.ts +10 -7
- package/utils/StringUtil.ts +6 -1
|
@@ -40,11 +40,11 @@ let Workspaces = Workspaces_1 = class Workspaces {
|
|
|
40
40
|
}
|
|
41
41
|
async waitPage(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT) {
|
|
42
42
|
Logger_1.Logger.debug();
|
|
43
|
-
await this.driverHelper.waitVisibility(
|
|
43
|
+
await this.driverHelper.waitVisibility(Workspaces_1.ADD_WORKSPACE_BUTTON, timeout);
|
|
44
44
|
}
|
|
45
45
|
async clickAddWorkspaceButton(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_CLICK_DASHBOARD_ITEM_TIMEOUT) {
|
|
46
46
|
Logger_1.Logger.debug();
|
|
47
|
-
await this.driverHelper.waitAndClick(
|
|
47
|
+
await this.driverHelper.waitAndClick(Workspaces_1.ADD_WORKSPACE_BUTTON, timeout);
|
|
48
48
|
}
|
|
49
49
|
async clickOpenButton(workspaceName, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT) {
|
|
50
50
|
Logger_1.Logger.debug();
|
|
@@ -52,23 +52,19 @@ let Workspaces = Workspaces_1 = class Workspaces {
|
|
|
52
52
|
}
|
|
53
53
|
async waitWorkspaceListItem(workspaceName, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
54
54
|
Logger_1.Logger.debug(`"${workspaceName}"`);
|
|
55
|
-
|
|
56
|
-
await this.driverHelper.waitVisibility(workspaceListItemLocator, timeout);
|
|
55
|
+
await this.driverHelper.waitVisibility(this.getWorkspaceListItemLocator(workspaceName), timeout);
|
|
57
56
|
}
|
|
58
57
|
async waitWorkspaceWithRunningStatus(workspaceName, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
59
58
|
Logger_1.Logger.debug(`"${workspaceName}"`);
|
|
60
|
-
|
|
61
|
-
await this.driverHelper.waitVisibility(runningStatusLocator, timeout);
|
|
59
|
+
await this.driverHelper.waitVisibility(this.getWorkspaceStatusLocator(workspaceName, WorkspaceStatusUI.Running), timeout);
|
|
62
60
|
}
|
|
63
61
|
async waitWorkspaceWithStoppedStatus(workspaceName, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_DASHBOARD_WORKSPACE_STOP_TIMEOUT) {
|
|
64
62
|
Logger_1.Logger.debug(`"${workspaceName}"`);
|
|
65
|
-
|
|
66
|
-
await this.driverHelper.waitVisibility(stoppedStatusLocator, timeout);
|
|
63
|
+
await this.driverHelper.waitVisibility(this.getWorkspaceStatusLocator(workspaceName, WorkspaceStatusUI.Stopped), timeout);
|
|
67
64
|
}
|
|
68
65
|
async clickWorkspaceListItem(workspaceName, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_CLICK_DASHBOARD_ITEM_TIMEOUT) {
|
|
69
66
|
Logger_1.Logger.debug(`"${workspaceName}"`);
|
|
70
|
-
|
|
71
|
-
await this.driverHelper.waitAndClick(workspaceListItemLocator, timeout);
|
|
67
|
+
await this.driverHelper.waitAndClick(this.getWorkspaceListItemLocator(workspaceName), timeout);
|
|
72
68
|
}
|
|
73
69
|
async clickActionsButton(workspaceName) {
|
|
74
70
|
Logger_1.Logger.debug(`of the '${workspaceName}' list item`);
|
|
@@ -101,21 +97,18 @@ let Workspaces = Workspaces_1 = class Workspaces {
|
|
|
101
97
|
}
|
|
102
98
|
async waitDeleteWorkspaceConfirmationWindow(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_DASHBOARD_WORKSPACE_STOP_TIMEOUT) {
|
|
103
99
|
Logger_1.Logger.debug();
|
|
104
|
-
|
|
105
|
-
await this.driverHelper.waitVisibility(confirmationWindowLocator, timeout);
|
|
100
|
+
await this.driverHelper.waitVisibility(Workspaces_1.CONFIRMATION_WINDOW, timeout);
|
|
106
101
|
}
|
|
107
102
|
async clickToDeleteConfirmationCheckbox(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_DASHBOARD_WORKSPACE_STOP_TIMEOUT) {
|
|
108
|
-
Logger_1.Logger.debug(
|
|
109
|
-
|
|
110
|
-
await this.driverHelper.waitAndClick(deleteConfirmationCheckboxLocator, timeout);
|
|
103
|
+
Logger_1.Logger.debug();
|
|
104
|
+
await this.driverHelper.waitAndClick(Workspaces_1.DELETE_CONFIRMATION_CHECKBOX, timeout);
|
|
111
105
|
}
|
|
112
106
|
async waitAndClickEnabledConfirmationWindowDeleteButton(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_DASHBOARD_WORKSPACE_STOP_TIMEOUT) {
|
|
113
|
-
Logger_1.Logger.debug(
|
|
114
|
-
|
|
115
|
-
await this.driverHelper.waitAndClick(enabledConfirmationWindowDeleteButton, timeout);
|
|
107
|
+
Logger_1.Logger.debug();
|
|
108
|
+
await this.driverHelper.waitAndClick(Workspaces_1.DELETE_WORKSPACE_BUTTON_ENABLED, timeout);
|
|
116
109
|
}
|
|
117
110
|
async deleteWorkspaceByActionsButton(workspaceName, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_DASHBOARD_WORKSPACE_STOP_TIMEOUT) {
|
|
118
|
-
Logger_1.Logger.debug(
|
|
111
|
+
Logger_1.Logger.debug();
|
|
119
112
|
await this.waitWorkspaceListItem(workspaceName, timeout);
|
|
120
113
|
await this.openActionsPopup(workspaceName, timeout);
|
|
121
114
|
await this.clickActionsDeleteButton(workspaceName);
|
|
@@ -124,59 +117,61 @@ let Workspaces = Workspaces_1 = class Workspaces {
|
|
|
124
117
|
await this.waitAndClickEnabledConfirmationWindowDeleteButton(timeout);
|
|
125
118
|
}
|
|
126
119
|
async stopWorkspaceByActionsButton(workspaceName, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_DASHBOARD_WORKSPACE_STOP_TIMEOUT) {
|
|
127
|
-
Logger_1.Logger.debug(
|
|
120
|
+
Logger_1.Logger.debug();
|
|
128
121
|
await this.waitWorkspaceListItem(workspaceName, timeout);
|
|
129
122
|
await this.openActionsPopup(workspaceName, timeout);
|
|
130
123
|
await this.clickActionsStopWorkspaceButton(workspaceName);
|
|
131
124
|
}
|
|
132
125
|
async waitWorkspaceListItemAbsence(workspaceName, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_DASHBOARD_WORKSPACE_STOP_TIMEOUT) {
|
|
133
|
-
Logger_1.Logger.debug(`
|
|
126
|
+
Logger_1.Logger.debug(`"${workspaceName}"`);
|
|
134
127
|
const polling = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_POLLING;
|
|
135
128
|
const attempts = Math.ceil(timeout / polling);
|
|
136
|
-
|
|
137
|
-
await this.driverHelper.waitDisappearance(workspaceListItemLocator, attempts, polling);
|
|
129
|
+
await this.driverHelper.waitDisappearance(this.getWorkspaceListItemLocator(workspaceName), attempts, polling);
|
|
138
130
|
}
|
|
139
131
|
async getAllCreatedWorkspacesNames(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
140
|
-
Logger_1.Logger.debug(
|
|
132
|
+
Logger_1.Logger.debug();
|
|
141
133
|
const workspaceNames = [];
|
|
142
134
|
try {
|
|
143
|
-
const workspaceItems = await this.driverHelper.waitAllPresence(
|
|
135
|
+
const workspaceItems = await this.driverHelper.waitAllPresence(Workspaces_1.WORKSPACE_ITEM_TABLE_NAME_SECTION, timeout);
|
|
144
136
|
for (const item of workspaceItems) {
|
|
145
|
-
Logger_1.Logger.debug(`
|
|
137
|
+
Logger_1.Logger.debug(`try to get ${workspaceItems.indexOf(item)} items name`);
|
|
146
138
|
workspaceNames.push(await item.getText());
|
|
147
|
-
Logger_1.Logger.debug(`
|
|
139
|
+
Logger_1.Logger.debug(`workspace name is "${workspaceNames[workspaceNames.length - 1]}"`);
|
|
148
140
|
}
|
|
149
141
|
}
|
|
150
142
|
catch (e) {
|
|
151
|
-
Logger_1.Logger.debug(
|
|
143
|
+
Logger_1.Logger.debug(`${e}`);
|
|
152
144
|
}
|
|
153
|
-
Logger_1.Logger.debug(
|
|
145
|
+
Logger_1.Logger.debug(`${workspaceNames.length} workspaces have been created in DevSpaces`);
|
|
154
146
|
return workspaceNames;
|
|
155
147
|
}
|
|
156
148
|
getWorkspaceListItemLocator(workspaceName) {
|
|
157
|
-
return `//tr[td
|
|
149
|
+
return selenium_webdriver_1.By.xpath(`//tr[td//a[text()='${workspaceName}']]`);
|
|
158
150
|
}
|
|
159
151
|
getWorkspaceStatusLocator(workspaceName, workspaceStatus) {
|
|
160
|
-
return selenium_webdriver_1.By.xpath(`${this.getWorkspaceListItemLocator(workspaceName)}//span[@data-testid='workspace-status-indicator']//*[local-name()='svg' and @fill='${workspaceStatus}']`);
|
|
152
|
+
return selenium_webdriver_1.By.xpath(`${this.getWorkspaceListItemLocator(workspaceName).value}//span[@data-testid='workspace-status-indicator']//*[local-name()='svg' and @fill='${workspaceStatus}']`);
|
|
161
153
|
}
|
|
162
154
|
getActionsLocator(workspaceName) {
|
|
163
|
-
return selenium_webdriver_1.By.xpath(`${this.getWorkspaceListItemLocator(workspaceName)}/td/div/button[@aria-label='Actions']`);
|
|
155
|
+
return selenium_webdriver_1.By.xpath(`${this.getWorkspaceListItemLocator(workspaceName).value}/td/div/button[@aria-label='Actions']`);
|
|
164
156
|
}
|
|
165
157
|
getExpandedActionsLocator(workspaceName) {
|
|
166
|
-
return selenium_webdriver_1.By.xpath(`${this.getWorkspaceListItemLocator(workspaceName)}//button[@aria-label='Actions' and @aria-expanded='true']`);
|
|
158
|
+
return selenium_webdriver_1.By.xpath(`${this.getWorkspaceListItemLocator(workspaceName).value}//button[@aria-label='Actions' and @aria-expanded='true']`);
|
|
167
159
|
}
|
|
168
160
|
getActionsPopupButtonLocator(workspaceName, buttonText) {
|
|
169
|
-
return selenium_webdriver_1.By.xpath(`${this.getWorkspaceListItemLocator(workspaceName)}//li
|
|
161
|
+
return selenium_webdriver_1.By.xpath(`${this.getWorkspaceListItemLocator(workspaceName).value}//li//button[text()='${buttonText}']`);
|
|
170
162
|
}
|
|
171
163
|
getOpenButtonLocator(workspaceName) {
|
|
172
|
-
return selenium_webdriver_1.By.xpath(`${this.getWorkspaceListItemLocator(workspaceName)}//td[@data-key=5]//a[text()='Open']`);
|
|
164
|
+
return selenium_webdriver_1.By.xpath(`${this.getWorkspaceListItemLocator(workspaceName).value}//td[@data-key=5]//a[text()='Open']`);
|
|
173
165
|
}
|
|
174
166
|
};
|
|
175
|
-
Workspaces.
|
|
176
|
-
Workspaces.
|
|
167
|
+
Workspaces.ADD_WORKSPACE_BUTTON = selenium_webdriver_1.By.xpath('//button[text()="Add Workspace"]');
|
|
168
|
+
Workspaces.WORKSPACE_ITEM_TABLE_NAME_SECTION = selenium_webdriver_1.By.xpath('//td[@data-label="Name"]/span/a');
|
|
169
|
+
Workspaces.DELETE_WORKSPACE_BUTTON_ENABLED = selenium_webdriver_1.By.xpath('//button[@data-testid="delete-workspace-button" and not(@disabled)]');
|
|
170
|
+
Workspaces.DELETE_CONFIRMATION_CHECKBOX = selenium_webdriver_1.By.xpath('//input[@data-testid="confirmation-checkbox"]');
|
|
171
|
+
Workspaces.CONFIRMATION_WINDOW = selenium_webdriver_1.By.xpath('//div[@aria-label="Delete workspaces confirmation window"]');
|
|
177
172
|
Workspaces = Workspaces_1 = __decorate([
|
|
178
|
-
inversify_1.injectable(),
|
|
179
|
-
__param(0, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
|
|
173
|
+
(0, inversify_1.injectable)(),
|
|
174
|
+
__param(0, (0, inversify_1.inject)(inversify_types_1.CLASSES.DriverHelper)),
|
|
180
175
|
__metadata("design:paramtypes", [DriverHelper_1.DriverHelper])
|
|
181
176
|
], Workspaces);
|
|
182
177
|
exports.Workspaces = Workspaces;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Workspaces.js","sourceRoot":"","sources":["../../../pageobjects/dashboard/Workspaces.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;;AAExE,yCAA+C;AAC/C,2DAAwD;AACxD,mEAAwD;AACxD,2DAAoD;AACpD,+CAA4C;AAC5C,yEAAsE;AAEtE,IAAY,iBAGX;AAHD,WAAY,iBAAiB;IAC5B,sCAAiB,CAAA;IACjB,qCAAgB,CAAA;AACjB,CAAC,EAHW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAG5B;
|
|
1
|
+
{"version":3,"file":"Workspaces.js","sourceRoot":"","sources":["../../../pageobjects/dashboard/Workspaces.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,7 +40,7 @@ let WorkspaceDetails = WorkspaceDetails_1 = class WorkspaceDetails {
|
|
|
40
40
|
}
|
|
41
41
|
async waitLoaderDisappearance(attempts = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_ATTEMPTS, polling = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_POLLING) {
|
|
42
42
|
Logger_1.Logger.debug();
|
|
43
|
-
await this.driverHelper.waitDisappearance(
|
|
43
|
+
await this.driverHelper.waitDisappearance(WorkspaceDetails_1.WORKSPACE_DETAILS_LOADER, attempts, polling);
|
|
44
44
|
}
|
|
45
45
|
async saveChanges() {
|
|
46
46
|
Logger_1.Logger.debug();
|
|
@@ -58,26 +58,25 @@ let WorkspaceDetails = WorkspaceDetails_1 = class WorkspaceDetails {
|
|
|
58
58
|
}
|
|
59
59
|
async waitWorkspaceTitle(workspaceName, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
60
60
|
Logger_1.Logger.debug(`title: "${workspaceName}"`);
|
|
61
|
-
const workspaceTitleLocator =
|
|
61
|
+
const workspaceTitleLocator = this.getWorkspaceTitleLocator(workspaceName);
|
|
62
62
|
await this.driverHelper.waitVisibility(workspaceTitleLocator, timeout);
|
|
63
63
|
}
|
|
64
64
|
async waitRunButton(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
65
65
|
Logger_1.Logger.debug();
|
|
66
|
-
await this.driverHelper.waitVisibility(
|
|
66
|
+
await this.driverHelper.waitVisibility(WorkspaceDetails_1.RUN_BUTTON, timeout);
|
|
67
67
|
}
|
|
68
68
|
async clickOnRunButton(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_CLICK_DASHBOARD_ITEM_TIMEOUT) {
|
|
69
69
|
Logger_1.Logger.debug();
|
|
70
|
-
await this.driverHelper.waitAndClick(
|
|
70
|
+
await this.driverHelper.waitAndClick(WorkspaceDetails_1.RUN_BUTTON, timeout);
|
|
71
71
|
}
|
|
72
72
|
async waitOpenButton(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
73
73
|
Logger_1.Logger.debug();
|
|
74
|
-
await this.driverHelper.waitVisibility(
|
|
74
|
+
await this.driverHelper.waitVisibility(WorkspaceDetails_1.OPEN_BUTTON, timeout);
|
|
75
75
|
}
|
|
76
76
|
async openWorkspace(namespace, workspaceName, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT) {
|
|
77
77
|
Logger_1.Logger.debug(`"${namespace}/${workspaceName}"`);
|
|
78
78
|
await this.clickOnOpenButton(timeout);
|
|
79
79
|
await this.testProjectAndFileCheCode.waitWorkspaceReadinessForCheCodeEditor();
|
|
80
|
-
// await
|
|
81
80
|
this.testWorkspaceUtil.waitWorkspaceStatus(namespace, workspaceName, WorkspaceStatus_1.WorkspaceStatus.STARTING);
|
|
82
81
|
}
|
|
83
82
|
async waitTabsPresence(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
@@ -95,7 +94,7 @@ let WorkspaceDetails = WorkspaceDetails_1 = class WorkspaceDetails {
|
|
|
95
94
|
'Editors'
|
|
96
95
|
];
|
|
97
96
|
for (const tabTitle of workspaceDetailsTabs) {
|
|
98
|
-
const workspaceDetailsTabLocator =
|
|
97
|
+
const workspaceDetailsTabLocator = this.getTabLocator(tabTitle);
|
|
99
98
|
await this.driverHelper.waitVisibility(workspaceDetailsTabLocator, timeout);
|
|
100
99
|
}
|
|
101
100
|
}
|
|
@@ -104,46 +103,46 @@ let WorkspaceDetails = WorkspaceDetails_1 = class WorkspaceDetails {
|
|
|
104
103
|
await this.clickOnTab(tabTitle, timeout);
|
|
105
104
|
await this.waitTabSelected(tabTitle, timeout);
|
|
106
105
|
}
|
|
107
|
-
|
|
108
|
-
return `che-row-toolbar[che-title='${workspaceName}']
|
|
106
|
+
getWorkspaceTitleLocator(workspaceName) {
|
|
107
|
+
return selenium_webdriver_1.By.css(`che-row-toolbar[che-title='${workspaceName}']`);
|
|
109
108
|
}
|
|
110
|
-
|
|
111
|
-
return `//md-tabs-canvas//md-tab-item//span[text()='${tabTitle}']
|
|
109
|
+
getTabLocator(tabTitle) {
|
|
110
|
+
return selenium_webdriver_1.By.xpath(`//md-tabs-canvas//md-tab-item//span[text()='${tabTitle}']`);
|
|
112
111
|
}
|
|
113
|
-
|
|
114
|
-
return `//md-tabs-canvas[@role='tablist']//md-tab-item[@aria-selected='true']//span[text()='${tabTitle}']
|
|
112
|
+
getSelectedTabLocator(tabTitle) {
|
|
113
|
+
return selenium_webdriver_1.By.xpath(`//md-tabs-canvas[@role='tablist']//md-tab-item[@aria-selected='true']//span[text()='${tabTitle}']`);
|
|
115
114
|
}
|
|
116
115
|
async waitSaveButton(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
117
|
-
await this.driverHelper.waitVisibility(
|
|
116
|
+
await this.driverHelper.waitVisibility(WorkspaceDetails_1.ENABLED_SAVE_BUTTON, timeout);
|
|
118
117
|
}
|
|
119
118
|
async waitSaveButtonDisappearance(attempts = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_ATTEMPTS, polling = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_POLLING) {
|
|
120
|
-
await this.driverHelper.waitDisappearance(
|
|
119
|
+
await this.driverHelper.waitDisappearance(WorkspaceDetails_1.SAVE_BUTTON, attempts, polling);
|
|
121
120
|
}
|
|
122
121
|
async clickOnSaveButton(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_CLICK_DASHBOARD_ITEM_TIMEOUT) {
|
|
123
|
-
await this.driverHelper.waitAndClick(
|
|
122
|
+
await this.driverHelper.waitAndClick(WorkspaceDetails_1.ENABLED_SAVE_BUTTON, timeout);
|
|
124
123
|
}
|
|
125
124
|
async clickOnOpenButton(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_CLICK_DASHBOARD_ITEM_TIMEOUT) {
|
|
126
|
-
await this.driverHelper.waitAndClick(
|
|
125
|
+
await this.driverHelper.waitAndClick(WorkspaceDetails_1.OPEN_BUTTON, timeout);
|
|
127
126
|
}
|
|
128
127
|
async clickOnTab(tabTitle, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_CLICK_DASHBOARD_ITEM_TIMEOUT) {
|
|
129
|
-
const workspaceDetailsTabLocator =
|
|
128
|
+
const workspaceDetailsTabLocator = this.getTabLocator(tabTitle);
|
|
130
129
|
await this.driverHelper.waitAndClick(workspaceDetailsTabLocator, timeout);
|
|
131
130
|
}
|
|
132
131
|
async waitTabSelected(tabTitle, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
133
|
-
const selectedTabLocator =
|
|
132
|
+
const selectedTabLocator = this.getSelectedTabLocator(tabTitle);
|
|
134
133
|
await this.driverHelper.waitVisibility(selectedTabLocator, timeout);
|
|
135
134
|
}
|
|
136
135
|
};
|
|
137
|
-
WorkspaceDetails.
|
|
138
|
-
WorkspaceDetails.
|
|
139
|
-
WorkspaceDetails.
|
|
140
|
-
WorkspaceDetails.
|
|
141
|
-
WorkspaceDetails.
|
|
136
|
+
WorkspaceDetails.RUN_BUTTON = selenium_webdriver_1.By.css('#run-workspace-button[che-button-title="Run"]');
|
|
137
|
+
WorkspaceDetails.OPEN_BUTTON = selenium_webdriver_1.By.css('#open-in-ide-button[che-button-title="Open"]');
|
|
138
|
+
WorkspaceDetails.SAVE_BUTTON = selenium_webdriver_1.By.css('button[name="save-button"]');
|
|
139
|
+
WorkspaceDetails.ENABLED_SAVE_BUTTON = selenium_webdriver_1.By.css('button[name="save-button"][aria-disabled="false"]');
|
|
140
|
+
WorkspaceDetails.WORKSPACE_DETAILS_LOADER = selenium_webdriver_1.By.css('workspace-details-overview md-progress-linear');
|
|
142
141
|
WorkspaceDetails = WorkspaceDetails_1 = __decorate([
|
|
143
|
-
inversify_1.injectable(),
|
|
144
|
-
__param(0, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
|
|
145
|
-
__param(1, inversify_1.inject(inversify_types_1.TYPES.WorkspaceUtil)),
|
|
146
|
-
__param(2, inversify_1.inject(inversify_types_1.CLASSES.ProjectAndFileTests)),
|
|
142
|
+
(0, inversify_1.injectable)(),
|
|
143
|
+
__param(0, (0, inversify_1.inject)(inversify_types_1.CLASSES.DriverHelper)),
|
|
144
|
+
__param(1, (0, inversify_1.inject)(inversify_types_1.TYPES.WorkspaceUtil)),
|
|
145
|
+
__param(2, (0, inversify_1.inject)(inversify_types_1.CLASSES.ProjectAndFileTests)),
|
|
147
146
|
__metadata("design:paramtypes", [DriverHelper_1.DriverHelper, Object, ProjectAndFileTests_1.ProjectAndFileTests])
|
|
148
147
|
], WorkspaceDetails);
|
|
149
148
|
exports.WorkspaceDetails = WorkspaceDetails;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WorkspaceDetails.js","sourceRoot":"","sources":["../../../../pageobjects/dashboard/workspace-details/WorkspaceDetails.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,8DAA2D;AAC3D,yCAA+C;AAC/C,sEAAkE;AAClE,4BAA0B;AAC1B,2DAAwC;AACxC,8EAA2E;AAC3E,kDAA+C;AAC/C,4EAAyE;AAEzE,oFAAiF;
|
|
1
|
+
{"version":3,"file":"WorkspaceDetails.js","sourceRoot":"","sources":["../../../../pageobjects/dashboard/workspace-details/WorkspaceDetails.ts"],"names":[],"mappings":"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"}
|
|
@@ -171,8 +171,8 @@ let OauthPage = OauthPage_1 = class OauthPage {
|
|
|
171
171
|
}
|
|
172
172
|
};
|
|
173
173
|
OauthPage = OauthPage_1 = __decorate([
|
|
174
|
-
inversify_1.injectable(),
|
|
175
|
-
__param(0, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
|
|
174
|
+
(0, inversify_1.injectable)(),
|
|
175
|
+
__param(0, (0, inversify_1.inject)(inversify_types_1.CLASSES.DriverHelper)),
|
|
176
176
|
__metadata("design:paramtypes", [DriverHelper_1.DriverHelper])
|
|
177
177
|
], OauthPage);
|
|
178
178
|
exports.OauthPage = OauthPage;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OauthPage.js","sourceRoot":"","sources":["../../../pageobjects/git-providers/OauthPage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,yCAA+C;AAC/C,2DAAwC;AACxC,mEAAwD;AACxD,2DAAwD;AACxD,+CAA4C;AAC5C,yEAAsE;AACtE,mFAAiG;AACjG,qEAAkE;
|
|
1
|
+
{"version":3,"file":"OauthPage.js","sourceRoot":"","sources":["../../../pageobjects/git-providers/OauthPage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
2
11
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
13
|
};
|
|
@@ -18,14 +27,15 @@ const vscode_extension_tester_locators_1 = require("vscode-extension-tester-loca
|
|
|
18
27
|
const selenium_webdriver_1 = require("selenium-webdriver");
|
|
19
28
|
const clone_deep_1 = __importDefault(require("clone-deep"));
|
|
20
29
|
const MONACO_CONSTANTS_1 = require("../../constants/MONACO_CONSTANTS");
|
|
30
|
+
const inversify_1 = require("inversify");
|
|
21
31
|
/**
|
|
22
32
|
* this class allows us to change or add some specific locators base on "monaco-page-object" and "vscode-extension-tester-locators".
|
|
23
33
|
* Use method webLocatorDiff(). To change place locator into field "locators", to add - "extras".
|
|
24
34
|
* To see full locators list check "node_modules/vscode-extension-tester-locators/out/lib".
|
|
25
35
|
*/
|
|
26
|
-
class CheCodeLocatorLoader extends loader_1.LocatorLoader {
|
|
36
|
+
let CheCodeLocatorLoader = class CheCodeLocatorLoader extends loader_1.LocatorLoader {
|
|
27
37
|
constructor() {
|
|
28
|
-
super(MONACO_CONSTANTS_1.MONACO_CONSTANTS.
|
|
38
|
+
super(MONACO_CONSTANTS_1.MONACO_CONSTANTS.TS_SELENIUM_MONACO_PAGE_OBJECTS_USE_VERSION, MONACO_CONSTANTS_1.MONACO_CONSTANTS.TS_SELENIUM_MONACO_PAGE_OBJECTS_BASE_VERSION, (0, vscode_extension_tester_locators_1.getLocatorsPath)());
|
|
29
39
|
this.webCheCodeLocators = this.mergeLocators();
|
|
30
40
|
}
|
|
31
41
|
webLocatorDiff() {
|
|
@@ -54,7 +64,7 @@ class CheCodeLocatorLoader extends loader_1.LocatorLoader {
|
|
|
54
64
|
target[key] = this.merge(newVal, oldVal);
|
|
55
65
|
}
|
|
56
66
|
else {
|
|
57
|
-
target[key] = clone_deep_1.default(oldVal);
|
|
67
|
+
target[key] = (0, clone_deep_1.default)(oldVal);
|
|
58
68
|
}
|
|
59
69
|
}
|
|
60
70
|
return target;
|
|
@@ -65,6 +75,10 @@ class CheCodeLocatorLoader extends loader_1.LocatorLoader {
|
|
|
65
75
|
this.merge(target, this.webLocatorDiff().extras);
|
|
66
76
|
return target;
|
|
67
77
|
}
|
|
68
|
-
}
|
|
78
|
+
};
|
|
79
|
+
CheCodeLocatorLoader = __decorate([
|
|
80
|
+
(0, inversify_1.injectable)(),
|
|
81
|
+
__metadata("design:paramtypes", [])
|
|
82
|
+
], CheCodeLocatorLoader);
|
|
69
83
|
exports.CheCodeLocatorLoader = CheCodeLocatorLoader;
|
|
70
84
|
//# sourceMappingURL=CheCodeLocatorLoader.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CheCodeLocatorLoader.js","sourceRoot":"","sources":["../../../pageobjects/ide/CheCodeLocatorLoader.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"CheCodeLocatorLoader.js","sourceRoot":"","sources":["../../../pageobjects/ide/CheCodeLocatorLoader.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,oEAAwE;AACxE,uFAAmE;AAEnE,2DAAwC;AACxC,4DAA+B;AAC/B,uEAAoE;AACpE,yCAAuC;AAEvC;;;;GAIG;AAGI,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,sBAAa;IAGtD;QACC,KAAK,CACJ,mCAAgB,CAAC,2CAA2C,EAC5D,mCAAgB,CAAC,4CAA4C,EAC7D,IAAA,kDAAe,GAAE,CACjB,CAAC;QACF,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;IAChD,CAAC;IAEO,cAAc;QACrB,OAAO;YACN,QAAQ,EAAE;gBACT,cAAc,EAAE;oBACf,IAAI,EAAE,uBAAE,CAAC,KAAK,CAAC,iEAAiE,CAAC;oBACjF,MAAM,EAAE,uBAAE,CAAC,KAAK,CAAC,2BAA2B,CAAC;iBAC7C;aACD;YACD,MAAM,EAAE;gBACP,qBAAqB,EAAE;oBACtB,mBAAmB,EAAE,uBAAE,CAAC,KAAK,CAAC,+BAA+B,CAAC;iBAC9D;aACD;SACD,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,MAAW,EAAE,GAAQ;QAClC,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE;YACtB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE;gBACpD,SAAS;aACT;YAED,MAAM,MAAM,GAAQ,GAAG,CAAC,GAAG,CAAC,CAAC;YAC7B,MAAM,MAAM,GAAQ,MAAM,CAAC,GAAG,CAAC,CAAC;YAEhC,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;gBAC7D,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;aACzC;iBAAM;gBACN,MAAM,CAAC,GAAG,CAAC,GAAG,IAAA,oBAAK,EAAC,MAAM,CAAC,CAAC;aAC5B;SACD;QACD,OAAO,MAAM,CAAC;IACf,CAAC;IAEO,aAAa;QACpB,MAAM,MAAM,GAAa,KAAK,CAAC,YAAY,EAAE,CAAC;QAE9C,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,QAAoB,CAAC,CAAC;QAC/D,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,MAAkB,CAAC,CAAC;QAE7D,OAAO,MAAM,CAAC;IACf,CAAC;CACD,CAAA;AAtDY,oBAAoB;IADhC,IAAA,sBAAU,GAAE;;GACA,oBAAoB,CAsDhC;AAtDY,oDAAoB"}
|
|
@@ -36,32 +36,32 @@ let DexLoginPage = DexLoginPage_1 = class DexLoginPage {
|
|
|
36
36
|
}
|
|
37
37
|
async waitDexLoginPage() {
|
|
38
38
|
Logger_1.Logger.debug();
|
|
39
|
-
await this.driverHelper.waitVisibility(DexLoginPage_1.
|
|
39
|
+
await this.driverHelper.waitVisibility(DexLoginPage_1.DEX_PAGE_CONTENT_CONTAINER, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
|
|
40
40
|
}
|
|
41
41
|
async clickOnLoginButton() {
|
|
42
42
|
Logger_1.Logger.debug();
|
|
43
|
-
await this.driverHelper.waitAndClick(DexLoginPage_1.
|
|
43
|
+
await this.driverHelper.waitAndClick(DexLoginPage_1.SUBMIT_BUTTON);
|
|
44
44
|
}
|
|
45
45
|
async enterUserNameKubernetes(userName) {
|
|
46
46
|
Logger_1.Logger.debug();
|
|
47
|
-
await this.driverHelper.enterValue(DexLoginPage_1.
|
|
47
|
+
await this.driverHelper.enterValue(DexLoginPage_1.LOGIN_INPUT, userName);
|
|
48
48
|
}
|
|
49
49
|
async enterPasswordKubernetes(password) {
|
|
50
50
|
Logger_1.Logger.debug();
|
|
51
|
-
await this.driverHelper.enterValue(DexLoginPage_1.
|
|
51
|
+
await this.driverHelper.enterValue(DexLoginPage_1.PASSWORD_INPUT, password);
|
|
52
52
|
}
|
|
53
53
|
async waitDexLoginPageDisappearance() {
|
|
54
54
|
Logger_1.Logger.debug();
|
|
55
|
-
await this.driverHelper.waitDisappearance(DexLoginPage_1.
|
|
55
|
+
await this.driverHelper.waitDisappearance(DexLoginPage_1.DEX_PAGE_CONTENT_CONTAINER, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
|
|
56
56
|
}
|
|
57
57
|
};
|
|
58
|
-
DexLoginPage.
|
|
59
|
-
DexLoginPage.
|
|
60
|
-
DexLoginPage.
|
|
61
|
-
DexLoginPage.
|
|
58
|
+
DexLoginPage.DEX_PAGE_CONTENT_CONTAINER = selenium_webdriver_1.By.className('dex-container');
|
|
59
|
+
DexLoginPage.LOGIN_INPUT = selenium_webdriver_1.By.id('login');
|
|
60
|
+
DexLoginPage.PASSWORD_INPUT = selenium_webdriver_1.By.id('password');
|
|
61
|
+
DexLoginPage.SUBMIT_BUTTON = selenium_webdriver_1.By.id('submit-login');
|
|
62
62
|
DexLoginPage = DexLoginPage_1 = __decorate([
|
|
63
|
-
inversify_1.injectable(),
|
|
64
|
-
__param(0, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
|
|
63
|
+
(0, inversify_1.injectable)(),
|
|
64
|
+
__param(0, (0, inversify_1.inject)(inversify_types_1.CLASSES.DriverHelper)),
|
|
65
65
|
__metadata("design:paramtypes", [DriverHelper_1.DriverHelper])
|
|
66
66
|
], DexLoginPage);
|
|
67
67
|
exports.DexLoginPage = DexLoginPage;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DexLoginPage.js","sourceRoot":"","sources":["../../../../pageobjects/login/kubernetes/DexLoginPage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,4BAA0B;AAC1B,yCAA+C;AAC/C,sEAA2D;AAC3D,kDAA+C;AAC/C,2DAAwC;AACxC,4EAAyE;AACzE,8DAA2D;
|
|
1
|
+
{"version":3,"file":"DexLoginPage.js","sourceRoot":"","sources":["../../../../pageobjects/login/kubernetes/DexLoginPage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,4BAA0B;AAC1B,yCAA+C;AAC/C,sEAA2D;AAC3D,kDAA+C;AAC/C,2DAAwC;AACxC,4EAAyE;AACzE,8DAA2D;AAGpD,IAAM,YAAY,oBAAlB,MAAM,YAAY;IAMxB,YAEkB,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAEJ,KAAK,CAAC,gBAAgB;QACrB,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,cAAY,CAAC,0BAA0B,EAAE,qCAAiB,CAAC,6BAA6B,CAAC,CAAC;IAClI,CAAC;IAED,KAAK,CAAC,kBAAkB;QACvB,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,cAAY,CAAC,aAAa,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,QAAgB;QAC7C,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,cAAY,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IACxE,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,QAAgB;QAC7C,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,cAAY,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;IAC3E,CAAC;IAED,KAAK,CAAC,6BAA6B;QAClC,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,cAAY,CAAC,0BAA0B,EAAE,qCAAiB,CAAC,6BAA6B,CAAC,CAAC;IACrI,CAAC;;AAtCuB,uCAA0B,GAAO,uBAAE,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;AAC/D,wBAAW,GAAO,uBAAE,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;AACjC,2BAAc,GAAO,uBAAE,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;AACvC,0BAAa,GAAO,uBAAE,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC;AAJtD,YAAY;IADxB,IAAA,sBAAU,GAAE;IAQV,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCACE,2BAAY;GARhC,YAAY,CAwCxB;AAxCY,oCAAY"}
|
|
@@ -42,8 +42,8 @@ let KubernetesLoginPage = class KubernetesLoginPage {
|
|
|
42
42
|
}
|
|
43
43
|
};
|
|
44
44
|
KubernetesLoginPage = __decorate([
|
|
45
|
-
inversify_1.injectable(),
|
|
46
|
-
__param(0, inversify_1.inject(inversify_types_1.CLASSES.DexLoginPage)),
|
|
45
|
+
(0, inversify_1.injectable)(),
|
|
46
|
+
__param(0, (0, inversify_1.inject)(inversify_types_1.CLASSES.DexLoginPage)),
|
|
47
47
|
__metadata("design:paramtypes", [DexLoginPage_1.DexLoginPage])
|
|
48
48
|
], KubernetesLoginPage);
|
|
49
49
|
exports.KubernetesLoginPage = KubernetesLoginPage;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KubernetesLoginPage.js","sourceRoot":"","sources":["../../../../pageobjects/login/kubernetes/KubernetesLoginPage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,4BAA0B;AAC1B,yCAA+C;AAC/C,sEAA2D;AAC3D,kDAA+C;AAE/C,iDAA8C;AAC9C,wEAAqE;
|
|
1
|
+
{"version":3,"file":"KubernetesLoginPage.js","sourceRoot":"","sources":["../../../../pageobjects/login/kubernetes/KubernetesLoginPage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,4BAA0B;AAC1B,yCAA+C;AAC/C,sEAA2D;AAC3D,kDAA+C;AAE/C,iDAA8C;AAC9C,wEAAqE;AAG9D,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC/B,YAEkB,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAEJ,KAAK,CAAC,KAAK;QACV,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,CAAC;QAC3C,MAAM,IAAI,CAAC,YAAY,CAAC,uBAAuB,CAAC,iCAAe,CAAC,wBAAwB,CAAC,CAAC;QAC1F,MAAM,IAAI,CAAC,YAAY,CAAC,uBAAuB,CAAC,iCAAe,CAAC,wBAAwB,CAAC,CAAC;QAC1F,MAAM,IAAI,CAAC,YAAY,CAAC,kBAAkB,EAAE,CAAC;QAC7C,MAAM,IAAI,CAAC,YAAY,CAAC,6BAA6B,EAAE,CAAC;IACzD,CAAC;CACD,CAAA;AAfY,mBAAmB;IAD/B,IAAA,sBAAU,GAAE;IAGV,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCACE,2BAAY;GAHhC,mBAAmB,CAe/B;AAfY,kDAAmB"}
|
|
@@ -37,55 +37,51 @@ let OcpLoginPage = OcpLoginPage_1 = class OcpLoginPage {
|
|
|
37
37
|
}
|
|
38
38
|
async waitOpenShiftLoginWelcomePage() {
|
|
39
39
|
Logger_1.Logger.debug();
|
|
40
|
-
await this.driverHelper.waitVisibility(
|
|
40
|
+
await this.driverHelper.waitVisibility(OcpLoginPage_1.LOGIN_PAGE_WELCOME_MESSAGE, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
|
|
41
41
|
}
|
|
42
|
-
async
|
|
42
|
+
async waitAndClickOnLoginProviderTitle() {
|
|
43
43
|
Logger_1.Logger.debug();
|
|
44
|
-
|
|
45
|
-
await this.driverHelper.waitAndClick(loginProviderTitleLocator, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_WAIT_FOR_URL);
|
|
44
|
+
await this.driverHelper.waitAndClick(OcpLoginPage_1.LOGIN_PROVIDER_BUTTON, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_WAIT_FOR_URL);
|
|
46
45
|
}
|
|
47
46
|
async isIdentityProviderLinkVisible() {
|
|
48
47
|
Logger_1.Logger.debug();
|
|
49
|
-
|
|
50
|
-
return await this.driverHelper.waitVisibilityBoolean(loginWithHtpaswdLocator, 3, 5000);
|
|
48
|
+
return await this.driverHelper.waitVisibilityBoolean(OcpLoginPage_1.LOGIN_PROVIDER_BUTTON, 3, 5000);
|
|
51
49
|
}
|
|
52
50
|
async isAuthorizeOpenShiftIdentityProviderPageVisible() {
|
|
53
51
|
Logger_1.Logger.debug();
|
|
54
|
-
|
|
55
|
-
return await this.driverHelper.isVisible(authorizeOpenshiftIdentityProviderPageLocator);
|
|
56
|
-
}
|
|
57
|
-
async waitAuthorizeOpenShiftIdentityProviderPage() {
|
|
58
|
-
Logger_1.Logger.debug();
|
|
59
|
-
const authorizeOpenshiftIdentityProviderPageLocator = selenium_webdriver_1.By.xpath('//h1[text()="Authorize Access"]');
|
|
60
|
-
await this.driverHelper.waitVisibility(authorizeOpenshiftIdentityProviderPageLocator, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
|
|
52
|
+
return await this.driverHelper.isVisible(OcpLoginPage_1.AUTHORIZE_OPENSHIFT_ACCESS_HEADER);
|
|
61
53
|
}
|
|
62
54
|
async clickOnApproveAuthorizeAccessButton() {
|
|
63
55
|
Logger_1.Logger.debug();
|
|
64
|
-
|
|
65
|
-
await this.driverHelper.waitAndClick(approveAuthorizeAccessOcpLocator);
|
|
56
|
+
await this.driverHelper.waitAndClick(OcpLoginPage_1.APPROVE_ACCESS_BUTTON);
|
|
66
57
|
}
|
|
67
58
|
async enterUserNameOpenShift(userName) {
|
|
68
59
|
Logger_1.Logger.debug(`"${userName}"`);
|
|
69
|
-
await this.driverHelper.enterValue(
|
|
60
|
+
await this.driverHelper.enterValue(OcpLoginPage_1.USERNAME_INPUT, userName);
|
|
70
61
|
}
|
|
71
|
-
async enterPasswordOpenShift(
|
|
62
|
+
async enterPasswordOpenShift(userPassword) {
|
|
72
63
|
Logger_1.Logger.debug();
|
|
73
|
-
await this.driverHelper.enterValue(
|
|
64
|
+
await this.driverHelper.enterValue(OcpLoginPage_1.PASSWORD_INPUT, userPassword);
|
|
74
65
|
}
|
|
75
66
|
async clickOnLoginButton() {
|
|
76
67
|
Logger_1.Logger.debug();
|
|
77
|
-
|
|
78
|
-
await this.driverHelper.waitAndClick(loginButtonLocator);
|
|
68
|
+
await this.driverHelper.waitAndClick(OcpLoginPage_1.LOGIN_BUTTON);
|
|
79
69
|
}
|
|
80
70
|
async waitDisappearanceOpenShiftLoginWelcomePage() {
|
|
81
71
|
Logger_1.Logger.debug();
|
|
82
|
-
await this.driverHelper.waitDisappearance(
|
|
72
|
+
await this.driverHelper.waitDisappearance(OcpLoginPage_1.LOGIN_PAGE_WELCOME_MESSAGE);
|
|
83
73
|
}
|
|
84
74
|
};
|
|
85
|
-
OcpLoginPage.
|
|
75
|
+
OcpLoginPage.LOGIN_PAGE_WELCOME_MESSAGE = selenium_webdriver_1.By.xpath('//*[contains(text(), "Welcome")]');
|
|
76
|
+
OcpLoginPage.LOGIN_BUTTON = selenium_webdriver_1.By.css('button[type=submit]');
|
|
77
|
+
OcpLoginPage.LOGIN_PROVIDER_BUTTON = selenium_webdriver_1.By.xpath(`//a[text()="${OAUTH_CONSTANTS_1.OAUTH_CONSTANTS.TS_OCP_LOGIN_PAGE_PROVIDER_TITLE}"]`);
|
|
78
|
+
OcpLoginPage.AUTHORIZE_OPENSHIFT_ACCESS_HEADER = selenium_webdriver_1.By.xpath('//h1[text()="Authorize Access"]');
|
|
79
|
+
OcpLoginPage.APPROVE_ACCESS_BUTTON = selenium_webdriver_1.By.css('input[name="approve"]');
|
|
80
|
+
OcpLoginPage.USERNAME_INPUT = selenium_webdriver_1.By.id('inputUsername');
|
|
81
|
+
OcpLoginPage.PASSWORD_INPUT = selenium_webdriver_1.By.id('inputPassword');
|
|
86
82
|
OcpLoginPage = OcpLoginPage_1 = __decorate([
|
|
87
|
-
inversify_1.injectable(),
|
|
88
|
-
__param(0, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
|
|
83
|
+
(0, inversify_1.injectable)(),
|
|
84
|
+
__param(0, (0, inversify_1.inject)(inversify_types_1.CLASSES.DriverHelper)),
|
|
89
85
|
__metadata("design:paramtypes", [DriverHelper_1.DriverHelper])
|
|
90
86
|
], OcpLoginPage);
|
|
91
87
|
exports.OcpLoginPage = OcpLoginPage;
|