@eclipse-che/che-e2e 7.74.0-dev-1d09cb7 → 7.74.0-dev-41d1364
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/.eslintignore +10 -0
- package/.eslintrc.js +183 -0
- package/.prettierignore +10 -0
- package/.prettierrc.json +10 -0
- package/README.md +47 -47
- package/configs/inversify.config.ts +13 -9
- package/configs/inversify.types.ts +29 -29
- package/configs/mocharc.ts +21 -24
- package/constants/API_TEST_CONSTANTS.ts +67 -0
- package/constants/BASE_TEST_CONSTANTS.ts +80 -0
- package/constants/CHROME_DRIVER_CONSTANTS.ts +54 -0
- package/constants/FACTORY_TEST_CONSTANTS.ts +61 -0
- package/constants/MONACO_CONSTANTS.ts +25 -0
- package/constants/OAUTH_CONSTANTS.ts +67 -0
- package/constants/PLUGIN_TEST_CONSTANTS.ts +15 -0
- package/constants/REPORTER_CONSTANTS.ts +53 -0
- package/constants/TIMEOUT_CONSTANTS.ts +131 -0
- package/dist/configs/inversify.config.js +14 -8
- package/dist/configs/inversify.config.js.map +1 -1
- package/dist/configs/inversify.types.js +2 -2
- package/dist/configs/inversify.types.js.map +1 -1
- package/dist/configs/mocharc.js +13 -16
- package/dist/configs/mocharc.js.map +1 -1
- package/dist/constants/{APITestConstants.js → API_TEST_CONSTANTS.js} +12 -12
- package/dist/constants/API_TEST_CONSTANTS.js.map +1 -0
- package/dist/constants/{BaseTestConstants.js → BASE_TEST_CONSTANTS.js} +16 -16
- package/dist/constants/BASE_TEST_CONSTANTS.js.map +1 -0
- package/dist/constants/{ChromeDriverConstants.js → CHROME_DRIVER_CONSTANTS.js} +13 -13
- package/dist/constants/CHROME_DRIVER_CONSTANTS.js.map +1 -0
- package/dist/constants/{FactoryTestConstants.js → FACTORY_TEST_CONSTANTS.js} +14 -13
- package/dist/constants/FACTORY_TEST_CONSTANTS.js.map +1 -0
- package/dist/constants/{MonacoConstants.js → MONACO_CONSTANTS.js} +7 -7
- package/dist/constants/MONACO_CONSTANTS.js.map +1 -0
- package/dist/constants/{OAuthConstants.js → OAUTH_CONSTANTS.js} +14 -14
- package/dist/constants/OAUTH_CONSTANTS.js.map +1 -0
- package/dist/constants/{PluginsTestConstants.js → PLUGIN_TEST_CONSTANTS.js} +7 -7
- package/dist/constants/PLUGIN_TEST_CONSTANTS.js.map +1 -0
- package/dist/constants/{ReporterConstants.js → REPORTER_CONSTANTS.js} +12 -12
- package/dist/constants/REPORTER_CONSTANTS.js.map +1 -0
- package/dist/constants/{TimeoutConstants.js → TIMEOUT_CONSTANTS.js} +24 -24
- package/dist/constants/TIMEOUT_CONSTANTS.js.map +1 -0
- package/dist/driver/ChromeDriver.js +12 -16
- package/dist/driver/ChromeDriver.js.map +1 -1
- package/dist/index.js +9 -9
- package/dist/index.js.map +1 -1
- package/dist/pageobjects/dashboard/CreateWorkspace.js +11 -11
- package/dist/pageobjects/dashboard/CreateWorkspace.js.map +1 -1
- package/dist/pageobjects/dashboard/Dashboard.js +16 -16
- package/dist/pageobjects/dashboard/Dashboard.js.map +1 -1
- package/dist/pageobjects/dashboard/Workspaces.js +28 -28
- package/dist/pageobjects/dashboard/Workspaces.js.map +1 -1
- package/dist/pageobjects/dashboard/workspace-details/WorkspaceDetails.js +36 -25
- package/dist/pageobjects/dashboard/workspace-details/WorkspaceDetails.js.map +1 -1
- package/dist/pageobjects/git-providers/OauthPage.js +20 -18
- package/dist/pageobjects/git-providers/OauthPage.js.map +1 -1
- package/dist/pageobjects/ide/CheCodeLocatorLoader.js +9 -9
- package/dist/pageobjects/ide/CheCodeLocatorLoader.js.map +1 -1
- package/dist/pageobjects/login/interfaces/ICheLoginPage.js +2 -2
- package/dist/pageobjects/login/interfaces/IOcpLoginPage.js +2 -2
- package/dist/pageobjects/login/kubernetes/DexLoginPage.js +5 -5
- package/dist/pageobjects/login/kubernetes/DexLoginPage.js.map +1 -1
- package/dist/pageobjects/login/kubernetes/KubernetesLoginPage.js +5 -5
- package/dist/pageobjects/login/kubernetes/KubernetesLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/OcpLoginPage.js +13 -13
- package/dist/pageobjects/login/openshift/OcpLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/OcpRedHatLoginPage.js +5 -5
- package/dist/pageobjects/login/openshift/OcpRedHatLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/OcpUserLoginPage.js +6 -6
- package/dist/pageobjects/login/openshift/OcpUserLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/RedHatLoginPage.js +5 -5
- package/dist/pageobjects/login/openshift/RedHatLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/RegularUserOcpCheLoginPage.js +8 -8
- package/dist/pageobjects/login/openshift/RegularUserOcpCheLoginPage.js.map +1 -1
- package/dist/pageobjects/openshift/OcpApplicationPage.js +5 -5
- package/dist/pageobjects/openshift/OcpApplicationPage.js.map +1 -1
- package/dist/pageobjects/openshift/OcpImportFromGitPage.js +4 -4
- package/dist/pageobjects/openshift/OcpImportFromGitPage.js.map +1 -1
- package/dist/pageobjects/openshift/OcpMainPage.js +6 -6
- package/dist/pageobjects/openshift/OcpMainPage.js.map +1 -1
- package/dist/specs/MochaHooks.js +26 -23
- package/dist/specs/MochaHooks.js.map +1 -1
- package/dist/specs/SmokeTest.spec.js +11 -11
- package/dist/specs/SmokeTest.spec.js.map +1 -1
- package/dist/specs/api/ContainerOverridesAPI.spec.js +10 -1
- package/dist/specs/api/ContainerOverridesAPI.spec.js.map +1 -1
- package/dist/specs/api/DevfileAcceptanceTestAPI.spec.js +26 -15
- package/dist/specs/api/DevfileAcceptanceTestAPI.spec.js.map +1 -1
- package/dist/specs/api/EmptyWorkspaceAPI.spec.js +17 -11
- package/dist/specs/api/EmptyWorkspaceAPI.spec.js.map +1 -1
- package/dist/specs/api/PodOverridesAPI.spec.js +12 -3
- 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 +7 -7
- package/dist/specs/dashboard-samples/Quarkus.spec.js.map +1 -1
- package/dist/specs/dashboard-samples/RecommendedExtensions.spec.js +41 -41
- package/dist/specs/dashboard-samples/RecommendedExtensions.spec.js.map +1 -1
- package/dist/specs/devconsole-intergration/DevConsoleIntegration.spec.js +14 -9
- package/dist/specs/devconsole-intergration/DevConsoleIntegration.spec.js.map +1 -1
- package/dist/specs/factory/Factory.spec.js +25 -25
- package/dist/specs/factory/Factory.spec.js.map +1 -1
- package/dist/specs/factory/NoSetupRepoFactory.spec.js +37 -34
- package/dist/specs/factory/NoSetupRepoFactory.spec.js.map +1 -1
- package/dist/specs/factory/RefusedOAuthFactory.spec.js +33 -33
- package/dist/specs/factory/RefusedOAuthFactory.spec.js.map +1 -1
- package/dist/specs/miscellaneous/PredefinedNamespace.spec.js +12 -3
- package/dist/specs/miscellaneous/PredefinedNamespace.spec.js.map +1 -1
- package/dist/tests-library/LoginTests.js +7 -7
- package/dist/tests-library/LoginTests.js.map +1 -1
- package/dist/tests-library/ProjectAndFileTests.js +7 -5
- package/dist/tests-library/ProjectAndFileTests.js.map +1 -1
- package/dist/tests-library/WorkspaceHandlingTests.js +16 -13
- package/dist/tests-library/WorkspaceHandlingTests.js.map +1 -1
- package/dist/utils/BrowserTabsUtil.js +19 -14
- package/dist/utils/BrowserTabsUtil.js.map +1 -1
- package/dist/utils/CheReporter.js +44 -44
- package/dist/utils/CheReporter.js.map +1 -1
- package/dist/utils/DevWorkspaceConfigurationHelper.js +17 -8
- package/dist/utils/DevWorkspaceConfigurationHelper.js.map +1 -1
- package/dist/utils/DevfilesRegistryHelper.js +19 -13
- package/dist/utils/DevfilesRegistryHelper.js.map +1 -1
- package/dist/utils/DriverHelper.js +64 -66
- package/dist/utils/DriverHelper.js.map +1 -1
- package/dist/utils/KubernetesCommandLineToolsExecutor.js +28 -24
- package/dist/utils/KubernetesCommandLineToolsExecutor.js.map +1 -1
- package/dist/utils/Logger.js +18 -19
- package/dist/utils/Logger.js.map +1 -1
- package/dist/utils/ScreenCatcher.js +18 -12
- package/dist/utils/ScreenCatcher.js.map +1 -1
- package/dist/utils/ShellExecutor.js +9 -0
- package/dist/utils/ShellExecutor.js.map +1 -1
- package/dist/utils/StringUtil.js +15 -7
- package/dist/utils/StringUtil.js.map +1 -1
- package/dist/utils/request-handlers/CheApiRequestHandler.js +27 -27
- package/dist/utils/request-handlers/CheApiRequestHandler.js.map +1 -1
- package/dist/utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.js +10 -6
- package/dist/utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.js.map +1 -1
- package/dist/utils/request-handlers/headers/IAuthorizationHeaderHandler.js +2 -2
- package/dist/utils/workspace/ApiUrlResolver.js +3 -3
- package/dist/utils/workspace/ApiUrlResolver.js.map +1 -1
- package/dist/utils/workspace/ITestWorkspaceUtil.js +2 -2
- package/dist/utils/workspace/TestWorkspaceUtil.js +21 -19
- package/dist/utils/workspace/TestWorkspaceUtil.js.map +1 -1
- package/dist/utils/workspace/WorkspaceStatus.js +2 -2
- package/dist/utils/workspace/WorkspaceStatus.js.map +1 -1
- package/driver/ChromeDriver.ts +44 -50
- package/driver/IDriver.ts +3 -3
- package/index.ts +9 -9
- package/package.json +59 -49
- package/pageobjects/dashboard/CreateWorkspace.ts +64 -55
- package/pageobjects/dashboard/Dashboard.ts +101 -100
- package/pageobjects/dashboard/Workspaces.ts +196 -164
- package/pageobjects/dashboard/workspace-details/WorkspaceDetails.ts +150 -125
- package/pageobjects/git-providers/OauthPage.ts +177 -166
- package/pageobjects/ide/CheCodeLocatorLoader.ts +49 -46
- package/pageobjects/login/interfaces/ICheLoginPage.ts +3 -3
- package/pageobjects/login/interfaces/IOcpLoginPage.ts +3 -3
- package/pageobjects/login/kubernetes/DexLoginPage.ts +31 -30
- package/pageobjects/login/kubernetes/KubernetesLoginPage.ts +15 -14
- package/pageobjects/login/openshift/OcpLoginPage.ts +61 -54
- package/pageobjects/login/openshift/OcpRedHatLoginPage.ts +29 -24
- package/pageobjects/login/openshift/OcpUserLoginPage.ts +15 -18
- package/pageobjects/login/openshift/RedHatLoginPage.ts +48 -46
- package/pageobjects/login/openshift/RegularUserOcpCheLoginPage.ts +38 -34
- package/pageobjects/openshift/OcpApplicationPage.ts +21 -20
- package/pageobjects/openshift/OcpImportFromGitPage.ts +70 -68
- package/pageobjects/openshift/OcpMainPage.ts +69 -68
- package/specs/MochaHooks.ts +59 -50
- package/specs/SmokeTest.spec.ts +43 -40
- package/specs/api/ContainerOverridesAPI.spec.ts +33 -26
- package/specs/api/DevfileAcceptanceTestAPI.spec.ts +106 -95
- package/specs/api/EmptyWorkspaceAPI.spec.ts +62 -57
- package/specs/api/PodOverridesAPI.spec.ts +42 -33
- package/specs/dashboard-samples/EmptyWorkspace.spec.ts +31 -31
- package/specs/dashboard-samples/Quarkus.spec.ts +34 -34
- package/specs/dashboard-samples/RecommendedExtensions.spec.ts +192 -174
- package/specs/devconsole-intergration/DevConsoleIntegration.spec.ts +61 -52
- package/specs/factory/Factory.spec.ts +178 -168
- package/specs/factory/NoSetupRepoFactory.spec.ts +226 -211
- package/specs/factory/RefusedOAuthFactory.spec.ts +218 -204
- package/specs/miscellaneous/PredefinedNamespace.spec.ts +64 -54
- package/tests-library/LoginTests.ts +34 -32
- package/tests-library/ProjectAndFileTests.ts +21 -18
- package/tests-library/WorkspaceHandlingTests.ts +98 -89
- package/tsconfig.json +15 -15
- package/utils/BrowserTabsUtil.ts +103 -97
- package/utils/CheReporter.ts +141 -145
- package/utils/DevWorkspaceConfigurationHelper.ts +70 -61
- package/utils/DevfilesRegistryHelper.ts +67 -58
- package/utils/DriverHelper.ts +726 -700
- package/utils/KubernetesCommandLineToolsExecutor.ts +196 -180
- package/utils/Logger.ts +102 -125
- package/utils/ScreenCatcher.ts +57 -46
- package/utils/ShellExecutor.ts +19 -11
- package/utils/StringUtil.ts +40 -32
- package/utils/request-handlers/CheApiRequestHandler.ts +91 -88
- package/utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.ts +32 -21
- package/utils/request-handlers/headers/IAuthorizationHeaderHandler.ts +3 -3
- package/utils/workspace/ApiUrlResolver.ts +31 -26
- package/utils/workspace/ITestWorkspaceUtil.ts +31 -31
- package/utils/workspace/TestWorkspaceUtil.ts +152 -145
- package/utils/workspace/WorkspaceStatus.ts +5 -5
- package/constants/APITestConstants.ts +0 -57
- package/constants/BaseTestConstants.ts +0 -68
- package/constants/ChromeDriverConstants.ts +0 -46
- package/constants/FactoryTestConstants.ts +0 -51
- package/constants/MonacoConstants.ts +0 -22
- package/constants/OAuthConstants.ts +0 -57
- package/constants/PluginsTestConstants.ts +0 -15
- package/constants/ReporterConstants.ts +0 -45
- package/constants/TimeoutConstants.ts +0 -113
- package/dist/constants/APITestConstants.js.map +0 -1
- package/dist/constants/BaseTestConstants.js.map +0 -1
- package/dist/constants/ChromeDriverConstants.js.map +0 -1
- package/dist/constants/FactoryTestConstants.js.map +0 -1
- package/dist/constants/MonacoConstants.js.map +0 -1
- package/dist/constants/OAuthConstants.js.map +0 -1
- package/dist/constants/PluginsTestConstants.js.map +0 -1
- package/dist/constants/ReporterConstants.js.map +0 -1
- package/dist/constants/TimeoutConstants.js.map +0 -1
- package/tslint.json +0 -126
|
@@ -14,8 +14,8 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
var WorkspaceDetails_1;
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
16
|
exports.WorkspaceDetails = void 0;
|
|
17
|
-
|
|
18
|
-
*
|
|
17
|
+
/** *******************************************************************
|
|
18
|
+
* copyright (c) 2019-2023 Red Hat, Inc.
|
|
19
19
|
*
|
|
20
20
|
* This program and the accompanying materials are made
|
|
21
21
|
* available under the terms of the Eclipse Public License 2.0
|
|
@@ -30,7 +30,7 @@ require("reflect-metadata");
|
|
|
30
30
|
const selenium_webdriver_1 = require("selenium-webdriver");
|
|
31
31
|
const WorkspaceStatus_1 = require("../../../utils/workspace/WorkspaceStatus");
|
|
32
32
|
const Logger_1 = require("../../../utils/Logger");
|
|
33
|
-
const
|
|
33
|
+
const TIMEOUT_CONSTANTS_1 = require("../../../constants/TIMEOUT_CONSTANTS");
|
|
34
34
|
const ProjectAndFileTests_1 = require("../../../tests-library/ProjectAndFileTests");
|
|
35
35
|
let WorkspaceDetails = WorkspaceDetails_1 = class WorkspaceDetails {
|
|
36
36
|
constructor(driverHelper, testWorkspaceUtil, testProjectAndFileCheCode) {
|
|
@@ -38,7 +38,7 @@ let WorkspaceDetails = WorkspaceDetails_1 = class WorkspaceDetails {
|
|
|
38
38
|
this.testWorkspaceUtil = testWorkspaceUtil;
|
|
39
39
|
this.testProjectAndFileCheCode = testProjectAndFileCheCode;
|
|
40
40
|
}
|
|
41
|
-
async waitLoaderDisappearance(attempts =
|
|
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
43
|
await this.driverHelper.waitDisappearance(selenium_webdriver_1.By.css(WorkspaceDetails_1.WORKSPACE_DETAILS_LOADER_CSS), attempts, polling);
|
|
44
44
|
}
|
|
@@ -48,7 +48,7 @@ let WorkspaceDetails = WorkspaceDetails_1 = class WorkspaceDetails {
|
|
|
48
48
|
await this.clickOnSaveButton();
|
|
49
49
|
await this.waitSaveButtonDisappearance();
|
|
50
50
|
}
|
|
51
|
-
async waitPage(workspaceName, timeout =
|
|
51
|
+
async waitPage(workspaceName, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT) {
|
|
52
52
|
Logger_1.Logger.debug(`workspace: "${workspaceName}"`);
|
|
53
53
|
await this.waitWorkspaceTitle(workspaceName, timeout);
|
|
54
54
|
await this.waitOpenButton(timeout);
|
|
@@ -56,39 +56,50 @@ let WorkspaceDetails = WorkspaceDetails_1 = class WorkspaceDetails {
|
|
|
56
56
|
await this.waitTabsPresence(timeout);
|
|
57
57
|
await this.waitLoaderDisappearance(timeout);
|
|
58
58
|
}
|
|
59
|
-
async waitWorkspaceTitle(workspaceName, timeout =
|
|
59
|
+
async waitWorkspaceTitle(workspaceName, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
60
60
|
Logger_1.Logger.debug(`title: "${workspaceName}"`);
|
|
61
61
|
const workspaceTitleLocator = selenium_webdriver_1.By.css(this.getWorkspaceTitleCssLocator(workspaceName));
|
|
62
62
|
await this.driverHelper.waitVisibility(workspaceTitleLocator, timeout);
|
|
63
63
|
}
|
|
64
|
-
async waitRunButton(timeout =
|
|
64
|
+
async waitRunButton(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
65
65
|
Logger_1.Logger.debug();
|
|
66
66
|
await this.driverHelper.waitVisibility(selenium_webdriver_1.By.css(WorkspaceDetails_1.RUN_BUTTON_CSS), timeout);
|
|
67
67
|
}
|
|
68
|
-
async clickOnRunButton(timeout =
|
|
68
|
+
async clickOnRunButton(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_CLICK_DASHBOARD_ITEM_TIMEOUT) {
|
|
69
69
|
Logger_1.Logger.debug();
|
|
70
70
|
await this.driverHelper.waitAndClick(selenium_webdriver_1.By.css(WorkspaceDetails_1.RUN_BUTTON_CSS), timeout);
|
|
71
71
|
}
|
|
72
|
-
async waitOpenButton(timeout =
|
|
72
|
+
async waitOpenButton(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
73
73
|
Logger_1.Logger.debug();
|
|
74
74
|
await this.driverHelper.waitVisibility(selenium_webdriver_1.By.css(WorkspaceDetails_1.OPEN_BUTTON_CSS), timeout);
|
|
75
75
|
}
|
|
76
|
-
async openWorkspace(namespace, workspaceName, timeout =
|
|
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
|
|
80
|
+
// await
|
|
81
|
+
this.testWorkspaceUtil.waitWorkspaceStatus(namespace, workspaceName, WorkspaceStatus_1.WorkspaceStatus.STARTING);
|
|
81
82
|
}
|
|
82
|
-
async waitTabsPresence(timeout =
|
|
83
|
+
async waitTabsPresence(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
83
84
|
Logger_1.Logger.debug('WorkspaceDetails.waitTabsPresence');
|
|
84
|
-
const workspaceDetailsTabs = [
|
|
85
|
-
'
|
|
85
|
+
const workspaceDetailsTabs = [
|
|
86
|
+
'Overview',
|
|
87
|
+
'Projects',
|
|
88
|
+
'Containers',
|
|
89
|
+
'Servers',
|
|
90
|
+
'Env Variables',
|
|
91
|
+
'Volumes',
|
|
92
|
+
'Config',
|
|
93
|
+
'SSH',
|
|
94
|
+
'Plugins',
|
|
95
|
+
'Editors'
|
|
96
|
+
];
|
|
86
97
|
for (const tabTitle of workspaceDetailsTabs) {
|
|
87
98
|
const workspaceDetailsTabLocator = selenium_webdriver_1.By.xpath(this.getTabXpathLocator(tabTitle));
|
|
88
99
|
await this.driverHelper.waitVisibility(workspaceDetailsTabLocator, timeout);
|
|
89
100
|
}
|
|
90
101
|
}
|
|
91
|
-
async selectTab(tabTitle, timeout =
|
|
102
|
+
async selectTab(tabTitle, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
92
103
|
Logger_1.Logger.debug(`WorkspaceDetails.selectTab ${tabTitle}`);
|
|
93
104
|
await this.clickOnTab(tabTitle, timeout);
|
|
94
105
|
await this.waitTabSelected(tabTitle, timeout);
|
|
@@ -102,31 +113,31 @@ let WorkspaceDetails = WorkspaceDetails_1 = class WorkspaceDetails {
|
|
|
102
113
|
getSelectedTabXpathLocator(tabTitle) {
|
|
103
114
|
return `//md-tabs-canvas[@role='tablist']//md-tab-item[@aria-selected='true']//span[text()='${tabTitle}']`;
|
|
104
115
|
}
|
|
105
|
-
async waitSaveButton(timeout =
|
|
116
|
+
async waitSaveButton(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
106
117
|
await this.driverHelper.waitVisibility(selenium_webdriver_1.By.css(WorkspaceDetails_1.ENABLED_SAVE_BUTTON_CSS), timeout);
|
|
107
118
|
}
|
|
108
|
-
async waitSaveButtonDisappearance(attempts =
|
|
119
|
+
async waitSaveButtonDisappearance(attempts = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_ATTEMPTS, polling = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_POLLING) {
|
|
109
120
|
await this.driverHelper.waitDisappearance(selenium_webdriver_1.By.css(WorkspaceDetails_1.SAVE_BUTTON_CSS), attempts, polling);
|
|
110
121
|
}
|
|
111
|
-
async clickOnSaveButton(timeout =
|
|
122
|
+
async clickOnSaveButton(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_CLICK_DASHBOARD_ITEM_TIMEOUT) {
|
|
112
123
|
await this.driverHelper.waitAndClick(selenium_webdriver_1.By.css(WorkspaceDetails_1.ENABLED_SAVE_BUTTON_CSS), timeout);
|
|
113
124
|
}
|
|
114
|
-
async clickOnOpenButton(timeout =
|
|
125
|
+
async clickOnOpenButton(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_CLICK_DASHBOARD_ITEM_TIMEOUT) {
|
|
115
126
|
await this.driverHelper.waitAndClick(selenium_webdriver_1.By.css(WorkspaceDetails_1.OPEN_BUTTON_CSS), timeout);
|
|
116
127
|
}
|
|
117
|
-
async clickOnTab(tabTitle, timeout =
|
|
128
|
+
async clickOnTab(tabTitle, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_CLICK_DASHBOARD_ITEM_TIMEOUT) {
|
|
118
129
|
const workspaceDetailsTabLocator = selenium_webdriver_1.By.xpath(this.getTabXpathLocator(tabTitle));
|
|
119
130
|
await this.driverHelper.waitAndClick(workspaceDetailsTabLocator, timeout);
|
|
120
131
|
}
|
|
121
|
-
async waitTabSelected(tabTitle, timeout =
|
|
132
|
+
async waitTabSelected(tabTitle, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
122
133
|
const selectedTabLocator = selenium_webdriver_1.By.xpath(this.getSelectedTabXpathLocator(tabTitle));
|
|
123
134
|
await this.driverHelper.waitVisibility(selectedTabLocator, timeout);
|
|
124
135
|
}
|
|
125
136
|
};
|
|
126
|
-
WorkspaceDetails.RUN_BUTTON_CSS = '#run-workspace-button[che-button-title
|
|
127
|
-
WorkspaceDetails.OPEN_BUTTON_CSS = '#open-in-ide-button[che-button-title
|
|
128
|
-
WorkspaceDetails.SAVE_BUTTON_CSS = 'button[name
|
|
129
|
-
WorkspaceDetails.ENABLED_SAVE_BUTTON_CSS = 'button[name
|
|
137
|
+
WorkspaceDetails.RUN_BUTTON_CSS = '#run-workspace-button[che-button-title="Run"]';
|
|
138
|
+
WorkspaceDetails.OPEN_BUTTON_CSS = '#open-in-ide-button[che-button-title="Open"]';
|
|
139
|
+
WorkspaceDetails.SAVE_BUTTON_CSS = 'button[name="save-button"]';
|
|
140
|
+
WorkspaceDetails.ENABLED_SAVE_BUTTON_CSS = 'button[name="save-button"][aria-disabled="false"]';
|
|
130
141
|
WorkspaceDetails.WORKSPACE_DETAILS_LOADER_CSS = 'workspace-details-overview md-progress-linear';
|
|
131
142
|
WorkspaceDetails = WorkspaceDetails_1 = __decorate([
|
|
132
143
|
inversify_1.injectable(),
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"WorkspaceDetails.js","sourceRoot":"","sources":["../../../../pageobjects/dashboard/workspace-details/WorkspaceDetails.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,8 +14,8 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
var OauthPage_1;
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
16
|
exports.OauthPage = void 0;
|
|
17
|
-
|
|
18
|
-
*
|
|
17
|
+
/** *******************************************************************
|
|
18
|
+
* copyright (c) 2019 Red Hat, Inc.
|
|
19
19
|
*
|
|
20
20
|
* This program and the accompanying materials are made
|
|
21
21
|
* available under the terms of the Eclipse Public License 2.0
|
|
@@ -28,14 +28,14 @@ const selenium_webdriver_1 = require("selenium-webdriver");
|
|
|
28
28
|
const inversify_types_1 = require("../../configs/inversify.types");
|
|
29
29
|
const DriverHelper_1 = require("../../utils/DriverHelper");
|
|
30
30
|
const Logger_1 = require("../../utils/Logger");
|
|
31
|
-
const
|
|
32
|
-
const
|
|
33
|
-
const
|
|
31
|
+
const TIMEOUT_CONSTANTS_1 = require("../../constants/TIMEOUT_CONSTANTS");
|
|
32
|
+
const FACTORY_TEST_CONSTANTS_1 = require("../../constants/FACTORY_TEST_CONSTANTS");
|
|
33
|
+
const OAUTH_CONSTANTS_1 = require("../../constants/OAUTH_CONSTANTS");
|
|
34
34
|
let OauthPage = OauthPage_1 = class OauthPage {
|
|
35
35
|
constructor(driverHelper) {
|
|
36
36
|
this.driverHelper = driverHelper;
|
|
37
|
-
switch (
|
|
38
|
-
case
|
|
37
|
+
switch (FACTORY_TEST_CONSTANTS_1.FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_PROVIDER) {
|
|
38
|
+
case FACTORY_TEST_CONSTANTS_1.GitProviderType.BITBUCKET:
|
|
39
39
|
{
|
|
40
40
|
OauthPage_1.LOGIN_FORM = selenium_webdriver_1.By.id('j_username');
|
|
41
41
|
OauthPage_1.PASSWORD_FORM = selenium_webdriver_1.By.id('j_password');
|
|
@@ -44,7 +44,7 @@ let OauthPage = OauthPage_1 = class OauthPage {
|
|
|
44
44
|
OauthPage_1.DENY_ACCESS_BUTTON = selenium_webdriver_1.By.id('deny');
|
|
45
45
|
}
|
|
46
46
|
break;
|
|
47
|
-
case
|
|
47
|
+
case FACTORY_TEST_CONSTANTS_1.GitProviderType.GITLAB:
|
|
48
48
|
{
|
|
49
49
|
OauthPage_1.LOGIN_FORM = selenium_webdriver_1.By.id('user_login');
|
|
50
50
|
OauthPage_1.PASSWORD_FORM = selenium_webdriver_1.By.id('user_password');
|
|
@@ -53,7 +53,7 @@ let OauthPage = OauthPage_1 = class OauthPage {
|
|
|
53
53
|
OauthPage_1.DENY_ACCESS_BUTTON = selenium_webdriver_1.By.xpath('//input[@value="Deny"]');
|
|
54
54
|
}
|
|
55
55
|
break;
|
|
56
|
-
case
|
|
56
|
+
case FACTORY_TEST_CONSTANTS_1.GitProviderType.GITHUB:
|
|
57
57
|
{
|
|
58
58
|
OauthPage_1.LOGIN_FORM = selenium_webdriver_1.By.id('login_field');
|
|
59
59
|
OauthPage_1.PASSWORD_FORM = selenium_webdriver_1.By.id('password');
|
|
@@ -62,7 +62,7 @@ let OauthPage = OauthPage_1 = class OauthPage {
|
|
|
62
62
|
OauthPage_1.DENY_ACCESS_BUTTON = selenium_webdriver_1.By.xpath('//button[contains(., "Cancel")]');
|
|
63
63
|
}
|
|
64
64
|
break;
|
|
65
|
-
case
|
|
65
|
+
case FACTORY_TEST_CONSTANTS_1.GitProviderType.AZURE_DEVOPS:
|
|
66
66
|
{
|
|
67
67
|
OauthPage_1.LOGIN_FORM = selenium_webdriver_1.By.xpath('//input[@type="email"]');
|
|
68
68
|
OauthPage_1.PASSWORD_FORM = selenium_webdriver_1.By.xpath('//input[@type="password"]');
|
|
@@ -73,13 +73,13 @@ let OauthPage = OauthPage_1 = class OauthPage {
|
|
|
73
73
|
}
|
|
74
74
|
break;
|
|
75
75
|
default: {
|
|
76
|
-
throw new Error(`Invalid git provider. The value should be ${
|
|
76
|
+
throw new Error(`Invalid git provider. The value should be ${FACTORY_TEST_CONSTANTS_1.GitProviderType.GITHUB}, ${FACTORY_TEST_CONSTANTS_1.GitProviderType.GITLAB}, ${FACTORY_TEST_CONSTANTS_1.GitProviderType.AZURE_DEVOPS} or ${FACTORY_TEST_CONSTANTS_1.GitProviderType.BITBUCKET}`);
|
|
77
77
|
}
|
|
78
78
|
}
|
|
79
79
|
}
|
|
80
80
|
async waitLoginPage() {
|
|
81
81
|
Logger_1.Logger.debug();
|
|
82
|
-
await this.driverHelper.waitVisibility(OauthPage_1.LOGIN_FORM,
|
|
82
|
+
await this.driverHelper.waitVisibility(OauthPage_1.LOGIN_FORM, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM * 3);
|
|
83
83
|
}
|
|
84
84
|
async enterUserName(userName) {
|
|
85
85
|
Logger_1.Logger.debug(`"${userName}"`);
|
|
@@ -120,13 +120,13 @@ let OauthPage = OauthPage_1 = class OauthPage {
|
|
|
120
120
|
async login() {
|
|
121
121
|
Logger_1.Logger.debug();
|
|
122
122
|
await this.waitLoginPage();
|
|
123
|
-
await this.enterUserName(
|
|
124
|
-
if (
|
|
123
|
+
await this.enterUserName(OAUTH_CONSTANTS_1.OAUTH_CONSTANTS.TS_SELENIUM_GIT_PROVIDER_USERNAME);
|
|
124
|
+
if (FACTORY_TEST_CONSTANTS_1.FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_PROVIDER === FACTORY_TEST_CONSTANTS_1.GitProviderType.AZURE_DEVOPS) {
|
|
125
125
|
await this.clickOnSubmitButton();
|
|
126
126
|
}
|
|
127
|
-
await this.enterPassword(
|
|
127
|
+
await this.enterPassword(OAUTH_CONSTANTS_1.OAUTH_CONSTANTS.TS_SELENIUM_GIT_PROVIDER_PASSWORD);
|
|
128
128
|
await this.clickOnSubmitButton();
|
|
129
|
-
if (
|
|
129
|
+
if (FACTORY_TEST_CONSTANTS_1.FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_PROVIDER === FACTORY_TEST_CONSTANTS_1.GitProviderType.AZURE_DEVOPS) {
|
|
130
130
|
await this.clickOnNotRememberCredentialsButton();
|
|
131
131
|
}
|
|
132
132
|
await this.waitClosingLoginPage();
|
|
@@ -140,7 +140,8 @@ let OauthPage = OauthPage_1 = class OauthPage {
|
|
|
140
140
|
catch (e) {
|
|
141
141
|
Logger_1.Logger.debug('access was not confirmed, retrying to click confirmation button');
|
|
142
142
|
// workaround for GITHUB, AZURE_DEVOPS oauth confirmation page (bot security)
|
|
143
|
-
await this.driverHelper
|
|
143
|
+
await this.driverHelper
|
|
144
|
+
.getAction()
|
|
144
145
|
.move({
|
|
145
146
|
origin: await this.driverHelper.waitPresence(OauthPage_1.APPROVE_BUTTON)
|
|
146
147
|
})
|
|
@@ -158,7 +159,8 @@ let OauthPage = OauthPage_1 = class OauthPage {
|
|
|
158
159
|
catch (e) {
|
|
159
160
|
Logger_1.Logger.debug('deny access was not confirmed, retrying to click confirmation button');
|
|
160
161
|
// workaround for GITHUB, AZURE_DEVOPS oauth confirmation page (bot security)
|
|
161
|
-
await this.driverHelper
|
|
162
|
+
await this.driverHelper
|
|
163
|
+
.getAction()
|
|
162
164
|
.move({
|
|
163
165
|
origin: await this.driverHelper.waitPresence(OauthPage_1.DENY_ACCESS_BUTTON)
|
|
164
166
|
})
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"OauthPage.js","sourceRoot":"","sources":["../../../pageobjects/git-providers/OauthPage.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.CheCodeLocatorLoader = void 0;
|
|
7
|
-
|
|
8
|
-
*
|
|
7
|
+
/** *******************************************************************
|
|
8
|
+
* copyright (c) 2019 Red Hat, Inc.
|
|
9
9
|
*
|
|
10
10
|
* This program and the accompanying materials are made
|
|
11
11
|
* available under the terms of the Eclipse Public License 2.0
|
|
@@ -17,15 +17,15 @@ const loader_1 = require("monaco-page-objects/out/locators/loader");
|
|
|
17
17
|
const vscode_extension_tester_locators_1 = require("vscode-extension-tester-locators");
|
|
18
18
|
const selenium_webdriver_1 = require("selenium-webdriver");
|
|
19
19
|
const clone_deep_1 = __importDefault(require("clone-deep"));
|
|
20
|
-
const
|
|
20
|
+
const MONACO_CONSTANTS_1 = require("../../constants/MONACO_CONSTANTS");
|
|
21
21
|
/**
|
|
22
|
-
*
|
|
22
|
+
* this class allows us to change or add some specific locators base on "monaco-page-object" and "vscode-extension-tester-locators".
|
|
23
23
|
* Use method webLocatorDiff(). To change place locator into field "locators", to add - "extras".
|
|
24
24
|
* To see full locators list check "node_modules/vscode-extension-tester-locators/out/lib".
|
|
25
25
|
*/
|
|
26
26
|
class CheCodeLocatorLoader extends loader_1.LocatorLoader {
|
|
27
27
|
constructor() {
|
|
28
|
-
super(
|
|
28
|
+
super(MONACO_CONSTANTS_1.MONACO_CONSTANTS.TS_SELENIUM_MONACO_PAGE_OBJECTS_BASE_VERSION, MONACO_CONSTANTS_1.MONACO_CONSTANTS.TS_SELENIUM_MONACO_PAGE_OBJECTS_BASE_VERSION, vscode_extension_tester_locators_1.getLocatorsPath());
|
|
29
29
|
this.webCheCodeLocators = this.mergeLocators();
|
|
30
30
|
}
|
|
31
31
|
webLocatorDiff() {
|
|
@@ -38,7 +38,7 @@ class CheCodeLocatorLoader extends loader_1.LocatorLoader {
|
|
|
38
38
|
},
|
|
39
39
|
extras: {
|
|
40
40
|
ExtensionsViewSection: {
|
|
41
|
-
requireReloadButton: selenium_webdriver_1.By.xpath('//a[text()
|
|
41
|
+
requireReloadButton: selenium_webdriver_1.By.xpath('//a[text()="Reload Required"]')
|
|
42
42
|
}
|
|
43
43
|
}
|
|
44
44
|
};
|
|
@@ -48,9 +48,9 @@ class CheCodeLocatorLoader extends loader_1.LocatorLoader {
|
|
|
48
48
|
if (!Object.prototype.hasOwnProperty.call(obj, key)) {
|
|
49
49
|
continue;
|
|
50
50
|
}
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
if (typeof
|
|
51
|
+
const oldVal = obj[key];
|
|
52
|
+
const newVal = target[key];
|
|
53
|
+
if (typeof newVal === 'object' && typeof oldVal === 'object') {
|
|
54
54
|
target[key] = this.merge(newVal, oldVal);
|
|
55
55
|
}
|
|
56
56
|
else {
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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;AAEpE;;;;GAIG;AAEH,MAAa,oBAAqB,SAAQ,sBAAa;IAGtD;QACC,KAAK,CACJ,mCAAgB,CAAC,4CAA4C,EAC7D,mCAAgB,CAAC,4CAA4C,EAC7D,kDAAe,EAAE,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,oBAAK,CAAC,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;AAtDD,oDAsDC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
3
|
-
*
|
|
2
|
+
/** *******************************************************************
|
|
3
|
+
* copyright (c) 2019-2023 Red Hat, Inc.
|
|
4
4
|
*
|
|
5
5
|
* This program and the accompanying materials are made
|
|
6
6
|
* available under the terms of the Eclipse Public License 2.0
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
3
|
-
*
|
|
2
|
+
/** *******************************************************************
|
|
3
|
+
* copyright (c) 2019-2023 Red Hat, Inc.
|
|
4
4
|
*
|
|
5
5
|
* This program and the accompanying materials are made
|
|
6
6
|
* available under the terms of the Eclipse Public License 2.0
|
|
@@ -14,8 +14,8 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
var DexLoginPage_1;
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
16
|
exports.DexLoginPage = void 0;
|
|
17
|
-
|
|
18
|
-
*
|
|
17
|
+
/** *******************************************************************
|
|
18
|
+
* copyright (c) 2019-2023 Red Hat, Inc.
|
|
19
19
|
*
|
|
20
20
|
* This program and the accompanying materials are made
|
|
21
21
|
* available under the terms of the Eclipse Public License 2.0
|
|
@@ -28,7 +28,7 @@ const inversify_1 = require("inversify");
|
|
|
28
28
|
const inversify_types_1 = require("../../../configs/inversify.types");
|
|
29
29
|
const Logger_1 = require("../../../utils/Logger");
|
|
30
30
|
const selenium_webdriver_1 = require("selenium-webdriver");
|
|
31
|
-
const
|
|
31
|
+
const TIMEOUT_CONSTANTS_1 = require("../../../constants/TIMEOUT_CONSTANTS");
|
|
32
32
|
const DriverHelper_1 = require("../../../utils/DriverHelper");
|
|
33
33
|
let DexLoginPage = DexLoginPage_1 = class DexLoginPage {
|
|
34
34
|
constructor(driverHelper) {
|
|
@@ -36,7 +36,7 @@ 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.dexPageContentContainer,
|
|
39
|
+
await this.driverHelper.waitVisibility(DexLoginPage_1.dexPageContentContainer, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
|
|
40
40
|
}
|
|
41
41
|
async clickOnLoginButton() {
|
|
42
42
|
Logger_1.Logger.debug();
|
|
@@ -52,7 +52,7 @@ let DexLoginPage = DexLoginPage_1 = class DexLoginPage {
|
|
|
52
52
|
}
|
|
53
53
|
async waitDexLoginPageDisappearance() {
|
|
54
54
|
Logger_1.Logger.debug();
|
|
55
|
-
await this.driverHelper.waitDisappearance(DexLoginPage_1.dexPageContentContainer,
|
|
55
|
+
await this.driverHelper.waitDisappearance(DexLoginPage_1.dexPageContentContainer, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
|
|
56
56
|
}
|
|
57
57
|
};
|
|
58
58
|
DexLoginPage.dexPageContentContainer = selenium_webdriver_1.By.className('dex-container');
|
|
@@ -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,
|
|
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;AAG3D,IAAa,YAAY,oBAAzB,MAAa,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,uBAAuB,EAAE,qCAAiB,CAAC,6BAA6B,CAAC,CAAC;IAC/H,CAAC;IAED,KAAK,CAAC,kBAAkB;QACvB,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,cAAY,CAAC,YAAY,CAAC,CAAC;IACjE,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,QAAgB;QAC7C,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,cAAY,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IACvE,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,QAAgB;QAC7C,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,cAAY,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;IAC1E,CAAC;IAED,KAAK,CAAC,6BAA6B;QAClC,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,cAAY,CAAC,uBAAuB,EAAE,qCAAiB,CAAC,6BAA6B,CAAC,CAAC;IAClI,CAAC;CACD,CAAA;AAvCwB,oCAAuB,GAAO,uBAAE,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;AAC5D,uBAAU,GAAO,uBAAE,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;AAChC,0BAAa,GAAO,uBAAE,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;AACtC,yBAAY,GAAO,uBAAE,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC;AAJrD,YAAY;IADxB,sBAAU,EAAE;IAQV,WAAA,kBAAM,CAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCACE,2BAAY;GARhC,YAAY,CAwCxB;AAxCY,oCAAY"}
|
|
@@ -13,8 +13,8 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.KubernetesLoginPage = void 0;
|
|
16
|
-
|
|
17
|
-
*
|
|
16
|
+
/** *******************************************************************
|
|
17
|
+
* copyright (c) 2019-2023 Red Hat, Inc.
|
|
18
18
|
*
|
|
19
19
|
* This program and the accompanying materials are made
|
|
20
20
|
* available under the terms of the Eclipse Public License 2.0
|
|
@@ -27,7 +27,7 @@ const inversify_1 = require("inversify");
|
|
|
27
27
|
const inversify_types_1 = require("../../../configs/inversify.types");
|
|
28
28
|
const Logger_1 = require("../../../utils/Logger");
|
|
29
29
|
const DexLoginPage_1 = require("./DexLoginPage");
|
|
30
|
-
const
|
|
30
|
+
const OAUTH_CONSTANTS_1 = require("../../../constants/OAUTH_CONSTANTS");
|
|
31
31
|
let KubernetesLoginPage = class KubernetesLoginPage {
|
|
32
32
|
constructor(dexLoginPage) {
|
|
33
33
|
this.dexLoginPage = dexLoginPage;
|
|
@@ -35,8 +35,8 @@ let KubernetesLoginPage = class KubernetesLoginPage {
|
|
|
35
35
|
async login() {
|
|
36
36
|
Logger_1.Logger.debug();
|
|
37
37
|
await this.dexLoginPage.waitDexLoginPage();
|
|
38
|
-
await this.dexLoginPage.enterUserNameKubernetes(
|
|
39
|
-
await this.dexLoginPage.enterPasswordKubernetes(
|
|
38
|
+
await this.dexLoginPage.enterUserNameKubernetes(OAUTH_CONSTANTS_1.OAUTH_CONSTANTS.TS_SELENIUM_K8S_USERNAME);
|
|
39
|
+
await this.dexLoginPage.enterPasswordKubernetes(OAUTH_CONSTANTS_1.OAUTH_CONSTANTS.TS_SELENIUM_K8S_PASSWORD);
|
|
40
40
|
await this.dexLoginPage.clickOnLoginButton();
|
|
41
41
|
await this.dexLoginPage.waitDexLoginPageDisappearance();
|
|
42
42
|
}
|
|
@@ -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,
|
|
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;AAGrE,IAAa,mBAAmB,GAAhC,MAAa,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,sBAAU,EAAE;IAGV,WAAA,kBAAM,CAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCACE,2BAAY;GAHhC,mBAAmB,CAe/B;AAfY,kDAAmB"}
|
|
@@ -14,8 +14,8 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
var OcpLoginPage_1;
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
16
|
exports.OcpLoginPage = void 0;
|
|
17
|
-
|
|
18
|
-
*
|
|
17
|
+
/** *******************************************************************
|
|
18
|
+
* copyright (c) 2019-2023 Red Hat, Inc.
|
|
19
19
|
*
|
|
20
20
|
* This program and the accompanying materials are made
|
|
21
21
|
* available under the terms of the Eclipse Public License 2.0
|
|
@@ -29,39 +29,39 @@ const DriverHelper_1 = require("../../../utils/DriverHelper");
|
|
|
29
29
|
const inversify_types_1 = require("../../../configs/inversify.types");
|
|
30
30
|
const selenium_webdriver_1 = require("selenium-webdriver");
|
|
31
31
|
const Logger_1 = require("../../../utils/Logger");
|
|
32
|
-
const
|
|
33
|
-
const
|
|
32
|
+
const TIMEOUT_CONSTANTS_1 = require("../../../constants/TIMEOUT_CONSTANTS");
|
|
33
|
+
const OAUTH_CONSTANTS_1 = require("../../../constants/OAUTH_CONSTANTS");
|
|
34
34
|
let OcpLoginPage = OcpLoginPage_1 = class OcpLoginPage {
|
|
35
35
|
constructor(driverHelper) {
|
|
36
36
|
this.driverHelper = driverHelper;
|
|
37
37
|
}
|
|
38
38
|
async waitOpenShiftLoginWelcomePage() {
|
|
39
39
|
Logger_1.Logger.debug();
|
|
40
|
-
await this.driverHelper.waitVisibility(selenium_webdriver_1.By.xpath(OcpLoginPage_1.LOGIN_PAGE_OPENSHIFT_XPATH),
|
|
40
|
+
await this.driverHelper.waitVisibility(selenium_webdriver_1.By.xpath(OcpLoginPage_1.LOGIN_PAGE_OPENSHIFT_XPATH), TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
|
|
41
41
|
}
|
|
42
42
|
async clickOnLoginProviderTitle() {
|
|
43
43
|
Logger_1.Logger.debug();
|
|
44
|
-
const loginProviderTitleLocator = selenium_webdriver_1.By.xpath(`//a[text()
|
|
45
|
-
await this.driverHelper.waitAndClick(loginProviderTitleLocator,
|
|
44
|
+
const loginProviderTitleLocator = selenium_webdriver_1.By.xpath(`//a[text()="${OAUTH_CONSTANTS_1.OAUTH_CONSTANTS.TS_OCP_LOGIN_PAGE_PROVIDER_TITLE}"]`);
|
|
45
|
+
await this.driverHelper.waitAndClick(loginProviderTitleLocator, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_WAIT_FOR_URL);
|
|
46
46
|
}
|
|
47
47
|
async isIdentityProviderLinkVisible() {
|
|
48
48
|
Logger_1.Logger.debug();
|
|
49
|
-
const loginWithHtpaswdLocator = selenium_webdriver_1.By.xpath(`//a[text()
|
|
49
|
+
const loginWithHtpaswdLocator = selenium_webdriver_1.By.xpath(`//a[text()="${OAUTH_CONSTANTS_1.OAUTH_CONSTANTS.TS_OCP_LOGIN_PAGE_PROVIDER_TITLE}"]`);
|
|
50
50
|
return await this.driverHelper.waitVisibilityBoolean(loginWithHtpaswdLocator, 3, 5000);
|
|
51
51
|
}
|
|
52
52
|
async isAuthorizeOpenShiftIdentityProviderPageVisible() {
|
|
53
53
|
Logger_1.Logger.debug();
|
|
54
|
-
const authorizeOpenshiftIdentityProviderPageLocator = selenium_webdriver_1.By.xpath('//h1[text()
|
|
54
|
+
const authorizeOpenshiftIdentityProviderPageLocator = selenium_webdriver_1.By.xpath('//h1[text()="Authorize Access"]');
|
|
55
55
|
return await this.driverHelper.isVisible(authorizeOpenshiftIdentityProviderPageLocator);
|
|
56
56
|
}
|
|
57
57
|
async waitAuthorizeOpenShiftIdentityProviderPage() {
|
|
58
58
|
Logger_1.Logger.debug();
|
|
59
|
-
const authorizeOpenshiftIdentityProviderPageLocator = selenium_webdriver_1.By.xpath('//h1[text()
|
|
60
|
-
await this.driverHelper.waitVisibility(authorizeOpenshiftIdentityProviderPageLocator,
|
|
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);
|
|
61
61
|
}
|
|
62
62
|
async clickOnApproveAuthorizeAccessButton() {
|
|
63
63
|
Logger_1.Logger.debug();
|
|
64
|
-
const approveAuthorizeAccessOcpLocator = selenium_webdriver_1.By.css('input[name
|
|
64
|
+
const approveAuthorizeAccessOcpLocator = selenium_webdriver_1.By.css('input[name="approve"]');
|
|
65
65
|
await this.driverHelper.waitAndClick(approveAuthorizeAccessOcpLocator);
|
|
66
66
|
}
|
|
67
67
|
async enterUserNameOpenShift(userName) {
|
|
@@ -82,7 +82,7 @@ let OcpLoginPage = OcpLoginPage_1 = class OcpLoginPage {
|
|
|
82
82
|
await this.driverHelper.waitDisappearance(selenium_webdriver_1.By.xpath(OcpLoginPage_1.LOGIN_PAGE_OPENSHIFT_XPATH));
|
|
83
83
|
}
|
|
84
84
|
};
|
|
85
|
-
OcpLoginPage.LOGIN_PAGE_OPENSHIFT_XPATH = '//*[contains(text(),
|
|
85
|
+
OcpLoginPage.LOGIN_PAGE_OPENSHIFT_XPATH = '//*[contains(text(), "Welcome")]';
|
|
86
86
|
OcpLoginPage = OcpLoginPage_1 = __decorate([
|
|
87
87
|
inversify_1.injectable(),
|
|
88
88
|
__param(0, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OcpLoginPage.js","sourceRoot":"","sources":["../../../../pageobjects/login/openshift/OcpLoginPage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,4BAA0B;AAC1B,yCAA+C;AAC/C,8DAA2D;AAC3D,sEAA2D;AAC3D,2DAAwC;AACxC,kDAA+C;AAC/C,
|
|
1
|
+
{"version":3,"file":"OcpLoginPage.js","sourceRoot":"","sources":["../../../../pageobjects/login/openshift/OcpLoginPage.ts"],"names":[],"mappings":"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"}
|