@eclipse-che/che-e2e 7.74.0-dev-1d09cb7 → 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/.eslintignore +10 -0
- package/.eslintrc.js +197 -0
- package/.prettierignore +10 -0
- package/.prettierrc.json +10 -0
- package/CODE_STYLE.md +144 -0
- package/README.md +47 -47
- package/configs/inversify.config.ts +39 -14
- package/configs/inversify.types.ts +44 -30
- 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 +42 -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 +36 -9
- package/dist/configs/inversify.config.js.map +1 -1
- package/dist/configs/inversify.types.js +19 -5
- 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/CHROME_DRIVER_CONSTANTS.js +36 -0
- 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 -22
- package/dist/driver/ChromeDriver.js.map +1 -1
- package/dist/index.js +18 -12
- package/dist/index.js.map +1 -1
- package/dist/pageobjects/dashboard/CreateWorkspace.js +15 -15
- package/dist/pageobjects/dashboard/CreateWorkspace.js.map +1 -1
- package/dist/pageobjects/dashboard/Dashboard.js +20 -21
- package/dist/pageobjects/dashboard/Dashboard.js.map +1 -1
- package/dist/pageobjects/dashboard/Workspaces.js +55 -60
- package/dist/pageobjects/dashboard/Workspaces.js.map +1 -1
- package/dist/pageobjects/dashboard/workspace-details/WorkspaceDetails.js +58 -48
- package/dist/pageobjects/dashboard/workspace-details/WorkspaceDetails.js.map +1 -1
- package/dist/pageobjects/git-providers/OauthPage.js +22 -20
- package/dist/pageobjects/git-providers/OauthPage.js.map +1 -1
- package/dist/pageobjects/ide/CheCodeLocatorLoader.js +26 -12
- 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 +14 -14
- package/dist/pageobjects/login/kubernetes/DexLoginPage.js.map +1 -1
- package/dist/pageobjects/login/kubernetes/KubernetesLoginPage.js +7 -7
- package/dist/pageobjects/login/kubernetes/KubernetesLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/OcpLoginPage.js +24 -28
- package/dist/pageobjects/login/openshift/OcpLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/OcpRedHatLoginPage.js +13 -16
- package/dist/pageobjects/login/openshift/OcpRedHatLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/OcpUserLoginPage.js +9 -9
- package/dist/pageobjects/login/openshift/OcpUserLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/RedHatLoginPage.js +19 -23
- package/dist/pageobjects/login/openshift/RedHatLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/RegularUserOcpCheLoginPage.js +20 -19
- package/dist/pageobjects/login/openshift/RegularUserOcpCheLoginPage.js.map +1 -1
- package/dist/pageobjects/openshift/OcpApplicationPage.js +11 -11
- package/dist/pageobjects/openshift/OcpApplicationPage.js.map +1 -1
- package/dist/pageobjects/openshift/OcpImportFromGitPage.js +24 -24
- package/dist/pageobjects/openshift/OcpImportFromGitPage.js.map +1 -1
- package/dist/pageobjects/openshift/OcpMainPage.js +30 -30
- package/dist/pageobjects/openshift/OcpMainPage.js.map +1 -1
- package/dist/specs/MochaHooks.js +33 -27
- package/dist/specs/MochaHooks.js.map +1 -1
- package/dist/specs/SmokeTest.spec.js +17 -17
- package/dist/specs/SmokeTest.spec.js.map +1 -1
- package/dist/specs/api/ContainerOverridesAPI.spec.js +8 -6
- package/dist/specs/api/ContainerOverridesAPI.spec.js.map +1 -1
- package/dist/specs/api/DevfileAcceptanceTestAPI.spec.js +27 -24
- package/dist/specs/api/DevfileAcceptanceTestAPI.spec.js.map +1 -1
- package/dist/specs/api/EmptyWorkspaceAPI.spec.js +17 -17
- package/dist/specs/api/EmptyWorkspaceAPI.spec.js.map +1 -1
- package/dist/specs/api/PodOverridesAPI.spec.js +10 -8
- package/dist/specs/api/PodOverridesAPI.spec.js.map +1 -1
- package/dist/specs/dashboard-samples/EmptyWorkspace.spec.js +10 -10
- package/dist/specs/dashboard-samples/EmptyWorkspace.spec.js.map +1 -1
- package/dist/specs/dashboard-samples/Quarkus.spec.js +13 -13
- package/dist/specs/dashboard-samples/Quarkus.spec.js.map +1 -1
- package/dist/specs/dashboard-samples/RecommendedExtensions.spec.js +52 -52
- package/dist/specs/dashboard-samples/RecommendedExtensions.spec.js.map +1 -1
- package/dist/specs/devconsole-intergration/DevConsoleIntegration.spec.js +23 -19
- package/dist/specs/devconsole-intergration/DevConsoleIntegration.spec.js.map +1 -1
- package/dist/specs/factory/Factory.spec.js +38 -41
- package/dist/specs/factory/Factory.spec.js.map +1 -1
- package/dist/specs/factory/NoSetupRepoFactory.spec.js +52 -50
- package/dist/specs/factory/NoSetupRepoFactory.spec.js.map +1 -1
- package/dist/specs/factory/RefusedOAuthFactory.spec.js +49 -51
- package/dist/specs/factory/RefusedOAuthFactory.spec.js.map +1 -1
- package/dist/specs/miscellaneous/PredefinedNamespace.spec.js +45 -42
- package/dist/specs/miscellaneous/PredefinedNamespace.spec.js.map +1 -1
- package/dist/tests-library/LoginTests.js +13 -13
- package/dist/tests-library/LoginTests.js.map +1 -1
- package/dist/tests-library/ProjectAndFileTests.js +9 -7
- package/dist/tests-library/ProjectAndFileTests.js.map +1 -1
- package/dist/tests-library/WorkspaceHandlingTests.js +22 -19
- package/dist/tests-library/WorkspaceHandlingTests.js.map +1 -1
- package/dist/utils/BrowserTabsUtil.js +21 -21
- package/dist/utils/BrowserTabsUtil.js.map +1 -1
- package/dist/utils/CheReporter.js +91 -65
- package/dist/utils/CheReporter.js.map +1 -1
- package/dist/utils/DevWorkspaceConfigurationHelper.js +34 -15
- package/dist/utils/DevWorkspaceConfigurationHelper.js.map +1 -1
- package/dist/utils/DevfilesRegistryHelper.js +34 -18
- package/dist/utils/DevfilesRegistryHelper.js.map +1 -1
- package/dist/utils/DriverHelper.js +73 -68
- 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 +146 -107
- 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 +26 -16
- package/dist/utils/ScreenCatcher.js.map +1 -1
- package/dist/utils/ShellExecutor.js +29 -9
- package/dist/utils/ShellExecutor.js.map +1 -1
- package/dist/utils/StringUtil.js +19 -9
- package/dist/utils/StringUtil.js.map +1 -1
- package/dist/utils/request-handlers/CheApiRequestHandler.js +29 -29
- package/dist/utils/request-handlers/CheApiRequestHandler.js.map +1 -1
- package/dist/utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.js +12 -8
- 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 +5 -5
- package/dist/utils/workspace/ApiUrlResolver.js.map +1 -1
- package/dist/utils/workspace/ITestWorkspaceUtil.js +2 -2
- package/dist/utils/workspace/TestWorkspaceUtil.js +25 -23
- 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 +45 -58
- package/driver/IDriver.ts +3 -3
- package/index.ts +11 -9
- package/package.json +59 -49
- package/pageobjects/dashboard/CreateWorkspace.ts +65 -55
- package/pageobjects/dashboard/Dashboard.ts +100 -100
- package/pageobjects/dashboard/Workspaces.ts +210 -186
- package/pageobjects/dashboard/workspace-details/WorkspaceDetails.ts +153 -131
- package/pageobjects/git-providers/OauthPage.ts +177 -166
- package/pageobjects/ide/CheCodeLocatorLoader.ts +51 -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 +51 -56
- package/pageobjects/login/openshift/OcpRedHatLoginPage.ts +27 -27
- package/pageobjects/login/openshift/OcpUserLoginPage.ts +15 -18
- package/pageobjects/login/openshift/RedHatLoginPage.ts +49 -46
- package/pageobjects/login/openshift/RegularUserOcpCheLoginPage.ts +43 -34
- package/pageobjects/openshift/OcpApplicationPage.ts +21 -19
- package/pageobjects/openshift/OcpImportFromGitPage.ts +68 -68
- package/pageobjects/openshift/OcpMainPage.ts +69 -69
- package/specs/MochaHooks.ts +59 -52
- package/specs/SmokeTest.spec.ts +47 -45
- package/specs/api/ContainerOverridesAPI.spec.ts +39 -26
- package/specs/api/DevfileAcceptanceTestAPI.spec.ts +110 -97
- package/specs/api/EmptyWorkspaceAPI.spec.ts +67 -58
- package/specs/api/PodOverridesAPI.spec.ts +48 -34
- package/specs/dashboard-samples/EmptyWorkspace.spec.ts +36 -36
- package/specs/dashboard-samples/Quarkus.spec.ts +41 -40
- package/specs/dashboard-samples/RecommendedExtensions.spec.ts +202 -183
- package/specs/devconsole-intergration/DevConsoleIntegration.spec.ts +85 -75
- package/specs/factory/Factory.spec.ts +184 -178
- package/specs/factory/NoSetupRepoFactory.spec.ts +233 -219
- package/specs/factory/RefusedOAuthFactory.spec.ts +223 -211
- package/specs/miscellaneous/PredefinedNamespace.spec.ts +70 -64
- 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 +78 -74
- package/utils/CheReporter.ts +159 -157
- package/utils/DevWorkspaceConfigurationHelper.ts +63 -69
- package/utils/DevfilesRegistryHelper.ts +71 -57
- package/utils/DriverHelper.ts +728 -700
- package/utils/IContextParams.ts +26 -0
- package/utils/IKubernetesCommandLineToolsExecutor.ts +42 -0
- package/utils/KubernetesCommandLineToolsExecutor.ts +231 -183
- package/utils/Logger.ts +102 -125
- package/utils/ScreenCatcher.ts +57 -46
- package/utils/ShellExecutor.ts +23 -12
- package/utils/StringUtil.ts +49 -36
- 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 +0 -44
- 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 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
|
})
|
|
@@ -169,8 +171,8 @@ let OauthPage = OauthPage_1 = class OauthPage {
|
|
|
169
171
|
}
|
|
170
172
|
};
|
|
171
173
|
OauthPage = OauthPage_1 = __decorate([
|
|
172
|
-
inversify_1.injectable(),
|
|
173
|
-
__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)),
|
|
174
176
|
__metadata("design:paramtypes", [DriverHelper_1.DriverHelper])
|
|
175
177
|
], OauthPage);
|
|
176
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,
|
|
1
|
+
{"version":3,"file":"OauthPage.js","sourceRoot":"","sources":["../../../pageobjects/git-providers/OauthPage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,20 @@
|
|
|
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
|
};
|
|
5
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
15
|
exports.CheCodeLocatorLoader = void 0;
|
|
7
|
-
|
|
8
|
-
*
|
|
16
|
+
/** *******************************************************************
|
|
17
|
+
* copyright (c) 2019 Red Hat, Inc.
|
|
9
18
|
*
|
|
10
19
|
* This program and the accompanying materials are made
|
|
11
20
|
* available under the terms of the Eclipse Public License 2.0
|
|
@@ -17,15 +26,16 @@ const loader_1 = require("monaco-page-objects/out/locators/loader");
|
|
|
17
26
|
const vscode_extension_tester_locators_1 = require("vscode-extension-tester-locators");
|
|
18
27
|
const selenium_webdriver_1 = require("selenium-webdriver");
|
|
19
28
|
const clone_deep_1 = __importDefault(require("clone-deep"));
|
|
20
|
-
const
|
|
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(
|
|
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() {
|
|
@@ -38,7 +48,7 @@ class CheCodeLocatorLoader extends loader_1.LocatorLoader {
|
|
|
38
48
|
},
|
|
39
49
|
extras: {
|
|
40
50
|
ExtensionsViewSection: {
|
|
41
|
-
requireReloadButton: selenium_webdriver_1.By.xpath('//a[text()
|
|
51
|
+
requireReloadButton: selenium_webdriver_1.By.xpath('//a[text()="Reload Required"]')
|
|
42
52
|
}
|
|
43
53
|
}
|
|
44
54
|
};
|
|
@@ -48,13 +58,13 @@ class CheCodeLocatorLoader extends loader_1.LocatorLoader {
|
|
|
48
58
|
if (!Object.prototype.hasOwnProperty.call(obj, key)) {
|
|
49
59
|
continue;
|
|
50
60
|
}
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
if (typeof
|
|
61
|
+
const oldVal = obj[key];
|
|
62
|
+
const newVal = target[key];
|
|
63
|
+
if (typeof newVal === 'object' && typeof oldVal === 'object') {
|
|
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"}
|
|
@@ -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,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,
|
|
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"}
|
|
@@ -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,15 +35,15 @@ 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
|
}
|
|
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,
|
|
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"}
|
|
@@ -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,63 +29,59 @@ 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(
|
|
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, TimeoutConstants_1.TimeoutConstants.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, TimeoutConstants_1.TimeoutConstants.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;
|
|
@@ -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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"}
|
|
@@ -11,10 +11,11 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
12
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
13
|
};
|
|
14
|
+
var OcpRedHatLoginPage_1;
|
|
14
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
16
|
exports.OcpRedHatLoginPage = void 0;
|
|
16
|
-
|
|
17
|
-
*
|
|
17
|
+
/** *******************************************************************
|
|
18
|
+
* copyright (c) 2019 Red Hat, Inc.
|
|
18
19
|
*
|
|
19
20
|
* This program and the accompanying materials are made
|
|
20
21
|
* available under the terms of the Eclipse Public License 2.0
|
|
@@ -27,25 +28,20 @@ const inversify_1 = require("inversify");
|
|
|
27
28
|
const RedHatLoginPage_1 = require("./RedHatLoginPage");
|
|
28
29
|
const inversify_types_1 = require("../../../configs/inversify.types");
|
|
29
30
|
const selenium_webdriver_1 = require("selenium-webdriver");
|
|
30
|
-
const
|
|
31
|
+
const TIMEOUT_CONSTANTS_1 = require("../../../constants/TIMEOUT_CONSTANTS");
|
|
31
32
|
const OcpLoginPage_1 = require("./OcpLoginPage");
|
|
32
33
|
const DriverHelper_1 = require("../../../utils/DriverHelper");
|
|
33
34
|
const Logger_1 = require("../../../utils/Logger");
|
|
34
|
-
let OcpRedHatLoginPage = class OcpRedHatLoginPage {
|
|
35
|
+
let OcpRedHatLoginPage = OcpRedHatLoginPage_1 = class OcpRedHatLoginPage {
|
|
35
36
|
constructor(ocpLogin, redHatLogin, driverHelper) {
|
|
36
37
|
this.ocpLogin = ocpLogin;
|
|
37
38
|
this.redHatLogin = redHatLogin;
|
|
38
39
|
this.driverHelper = driverHelper;
|
|
39
|
-
this.OPEN_SHIFT_LOGIN_LANDING_PAGE_LOCATOR = `//div[@class='panel-login']`;
|
|
40
|
-
this.OPEN_SHIFT_LOGIN_LANDING_PAGE_BUTTON_LOCATOR = `${this.OPEN_SHIFT_LOGIN_LANDING_PAGE_LOCATOR}/div[contains(@class, 'panel-content')]/form/button`;
|
|
41
40
|
}
|
|
42
41
|
async login() {
|
|
43
42
|
Logger_1.Logger.debug();
|
|
44
|
-
|
|
45
|
-
await this.
|
|
46
|
-
await this.driverHelper.waitAndClick(selenium_webdriver_1.By.xpath(this.OPEN_SHIFT_LOGIN_LANDING_PAGE_BUTTON_LOCATOR));
|
|
47
|
-
await this.ocpLogin.isIdentityProviderLinkVisible();
|
|
48
|
-
await this.ocpLogin.clickOnLoginProviderTitle();
|
|
43
|
+
await this.driverHelper.waitAndClick(OcpRedHatLoginPage_1.OPENSHIFT_LOGIN_LANDING_PAGE_BUTTON, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
|
|
44
|
+
await this.ocpLogin.waitAndClickOnLoginProviderTitle();
|
|
49
45
|
await this.redHatLogin.waitRedHatLoginWelcomePage();
|
|
50
46
|
await this.redHatLogin.enterUserNameRedHat();
|
|
51
47
|
await this.redHatLogin.clickNextButton();
|
|
@@ -54,11 +50,12 @@ let OcpRedHatLoginPage = class OcpRedHatLoginPage {
|
|
|
54
50
|
await this.redHatLogin.waitDisappearanceRedHatLoginWelcomePage();
|
|
55
51
|
}
|
|
56
52
|
};
|
|
57
|
-
OcpRedHatLoginPage =
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
__param(
|
|
61
|
-
__param(
|
|
53
|
+
OcpRedHatLoginPage.OPENSHIFT_LOGIN_LANDING_PAGE_BUTTON = selenium_webdriver_1.By.xpath('//div[@class="panel-login"]/div[contains(@class, "panel-content")]/form/button');
|
|
54
|
+
OcpRedHatLoginPage = OcpRedHatLoginPage_1 = __decorate([
|
|
55
|
+
(0, inversify_1.injectable)(),
|
|
56
|
+
__param(0, (0, inversify_1.inject)(inversify_types_1.CLASSES.OcpLoginPage)),
|
|
57
|
+
__param(1, (0, inversify_1.inject)(inversify_types_1.CLASSES.RedHatLoginPage)),
|
|
58
|
+
__param(2, (0, inversify_1.inject)(inversify_types_1.CLASSES.DriverHelper)),
|
|
62
59
|
__metadata("design:paramtypes", [OcpLoginPage_1.OcpLoginPage,
|
|
63
60
|
RedHatLoginPage_1.RedHatLoginPage,
|
|
64
61
|
DriverHelper_1.DriverHelper])
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OcpRedHatLoginPage.js","sourceRoot":"","sources":["../../../../pageobjects/login/openshift/OcpRedHatLoginPage.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"OcpRedHatLoginPage.js","sourceRoot":"","sources":["../../../../pageobjects/login/openshift/OcpRedHatLoginPage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,4BAA0B;AAC1B,yCAA+C;AAC/C,uDAAoD;AACpD,sEAA2D;AAC3D,2DAAwC;AACxC,4EAAyE;AAEzE,iDAA8C;AAC9C,8DAA2D;AAC3D,kDAA+C;AAGxC,IAAM,kBAAkB,0BAAxB,MAAM,kBAAkB;IAK9B,YACgD,QAAsB,EAEpD,WAA4B,EAE5B,YAA0B;QAJI,aAAQ,GAAR,QAAQ,CAAc;QAEpD,gBAAW,GAAX,WAAW,CAAiB;QAE5B,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAEJ,KAAK,CAAC,KAAK;QACV,eAAM,CAAC,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CACnC,oBAAkB,CAAC,mCAAmC,EACtD,qCAAiB,CAAC,6BAA6B,CAC/C,CAAC;QACF,MAAM,IAAI,CAAC,QAAQ,CAAC,gCAAgC,EAAE,CAAC;QACvD,MAAM,IAAI,CAAC,WAAW,CAAC,0BAA0B,EAAE,CAAC;QACpD,MAAM,IAAI,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAAC;QAC7C,MAAM,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE,CAAC;QACzC,MAAM,IAAI,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAAC;QAC7C,MAAM,IAAI,CAAC,WAAW,CAAC,kBAAkB,EAAE,CAAC;QAC5C,MAAM,IAAI,CAAC,WAAW,CAAC,uCAAuC,EAAE,CAAC;IAClE,CAAC;;AAzBuB,sDAAmC,GAAO,uBAAE,CAAC,KAAK,CACzE,gFAAgF,CAChF,CAAC;AAHU,kBAAkB;IAD9B,IAAA,sBAAU,GAAE;IAOV,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;IAC5B,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,eAAe,CAAC,CAAA;IAE/B,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCAH4B,2BAAY;QAEvC,iCAAe;QAEd,2BAAY;GAVhC,kBAAkB,CA2B9B;AA3BY,gDAAkB"}
|