@eclipse-che/che-e2e 7.67.0 → 7.67.1-dev-e49f025
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/README.md +13 -4
- package/build/dockerfiles/Dockerfile +1 -1
- package/configs/inversify.config.ts +20 -17
- package/configs/inversify.types.ts +3 -3
- package/configs/mocharc.ts +14 -4
- package/configs/sh-scripts/generateIndex.sh +2 -3
- package/constants/APITestConstants.ts +56 -0
- package/constants/BaseTestConstants.ts +65 -0
- package/constants/ChromeDriverConstants.ts +46 -0
- package/constants/FactoryTestConstants.ts +45 -0
- package/constants/MonacoConstants.ts +22 -0
- package/constants/OAuthConstants.ts +56 -0
- package/constants/PluginsTestConstants.ts +15 -0
- package/constants/ReporterConstants.ts +45 -0
- package/constants/TimeoutConstants.ts +28 -146
- package/dist/configs/inversify.config.js +17 -13
- package/dist/configs/inversify.config.js.map +1 -1
- package/dist/configs/inversify.types.js +3 -2
- package/dist/configs/inversify.types.js.map +1 -1
- package/dist/configs/mocharc.js +13 -4
- package/dist/configs/mocharc.js.map +1 -1
- package/dist/constants/APITestConstants.js +54 -0
- package/dist/constants/APITestConstants.js.map +1 -0
- package/dist/constants/BaseTestConstants.js +61 -0
- package/dist/constants/BaseTestConstants.js.map +1 -0
- package/dist/constants/ChromeDriverConstants.js +44 -0
- package/dist/constants/ChromeDriverConstants.js.map +1 -0
- package/dist/constants/FactoryTestConstants.js +44 -0
- package/dist/constants/FactoryTestConstants.js.map +1 -0
- package/dist/constants/MonacoConstants.js +25 -0
- package/dist/constants/MonacoConstants.js.map +1 -0
- package/dist/constants/OAuthConstants.js +52 -0
- package/dist/constants/OAuthConstants.js.map +1 -0
- package/dist/constants/PluginsTestConstants.js +19 -0
- package/dist/constants/PluginsTestConstants.js.map +1 -0
- package/dist/constants/ReporterConstants.js +43 -0
- package/dist/constants/ReporterConstants.js.map +1 -0
- package/dist/constants/TimeoutConstants.js +22 -113
- package/dist/constants/TimeoutConstants.js.map +1 -1
- package/dist/driver/ChromeDriver.js +7 -7
- package/dist/driver/ChromeDriver.js.map +1 -1
- package/dist/index.js +22 -12
- package/dist/index.js.map +1 -1
- package/dist/pageobjects/dashboard/CreateWorkspace.js +2 -2
- package/dist/pageobjects/dashboard/CreateWorkspace.js.map +1 -1
- package/dist/pageobjects/dashboard/Dashboard.js +7 -6
- package/dist/pageobjects/dashboard/Dashboard.js.map +1 -1
- package/dist/pageobjects/dashboard/Workspaces.js +3 -4
- package/dist/pageobjects/dashboard/Workspaces.js.map +1 -1
- package/dist/pageobjects/dashboard/workspace-details/WorkspaceDetails.js +2 -3
- package/dist/pageobjects/dashboard/workspace-details/WorkspaceDetails.js.map +1 -1
- package/dist/pageobjects/git-providers/OauthPage.js +12 -19
- package/dist/pageobjects/git-providers/OauthPage.js.map +1 -1
- package/dist/pageobjects/ide/CheCodeLocatorLoader.js +2 -2
- package/dist/pageobjects/ide/CheCodeLocatorLoader.js.map +1 -1
- package/dist/pageobjects/login/interfaces/ICheLoginPage.js.map +1 -0
- package/dist/pageobjects/login/interfaces/IOcpLoginPage.js.map +1 -0
- package/dist/pageobjects/login/kubernetes/DexLoginPage.js +68 -0
- package/dist/pageobjects/login/kubernetes/DexLoginPage.js.map +1 -0
- package/dist/pageobjects/{openshift/CheLoginPage.js → login/kubernetes/KubernetesLoginPage.js} +21 -26
- package/dist/pageobjects/login/kubernetes/KubernetesLoginPage.js.map +1 -0
- package/dist/pageobjects/{openshift → login/openshift}/OcpLoginPage.js +7 -7
- package/dist/pageobjects/login/openshift/OcpLoginPage.js.map +1 -0
- package/dist/pageobjects/login/{OcpRedHatLoginPage.js → openshift/OcpRedHatLoginPage.js} +5 -5
- package/dist/pageobjects/login/openshift/OcpRedHatLoginPage.js.map +1 -0
- package/dist/pageobjects/login/{OcpUserLoginPage.js → openshift/OcpUserLoginPage.js} +7 -7
- package/dist/pageobjects/login/openshift/OcpUserLoginPage.js.map +1 -0
- package/dist/pageobjects/login/{RedHatLoginPage.js → openshift/RedHatLoginPage.js} +6 -6
- package/dist/pageobjects/login/openshift/RedHatLoginPage.js.map +1 -0
- package/dist/pageobjects/login/{RegularUserOcpCheLoginPage.js → openshift/RegularUserOcpCheLoginPage.js} +8 -8
- package/dist/pageobjects/login/openshift/RegularUserOcpCheLoginPage.js.map +1 -0
- package/dist/specs/MochaHooks.js +18 -11
- package/dist/specs/MochaHooks.js.map +1 -1
- package/dist/specs/SmokeTest.spec.js +5 -2
- package/dist/specs/SmokeTest.spec.js.map +1 -1
- package/dist/specs/api/ContainerOverridesAPI.spec.js +5 -4
- package/dist/specs/api/ContainerOverridesAPI.spec.js.map +1 -1
- package/dist/specs/api/DevfileAcceptanceTestAPI.spec.js +93 -0
- package/dist/specs/api/DevfileAcceptanceTestAPI.spec.js.map +1 -0
- package/dist/specs/api/EmptyWorkspaceAPI.spec.js +62 -0
- package/dist/specs/api/EmptyWorkspaceAPI.spec.js.map +1 -0
- package/dist/specs/api/PodOverridesAPI.spec.js +5 -4
- package/dist/specs/api/PodOverridesAPI.spec.js.map +1 -1
- package/dist/specs/dashboard-samples/EmptyWorkspace.spec.js +7 -2
- package/dist/specs/dashboard-samples/EmptyWorkspace.spec.js.map +1 -1
- package/dist/specs/dashboard-samples/RecomendedExtentions.spec.js +7 -6
- package/dist/specs/dashboard-samples/RecomendedExtentions.spec.js.map +1 -1
- package/dist/specs/devconsole-intergration/DevConsoleIntegration.spec.js +4 -4
- package/dist/specs/devconsole-intergration/DevConsoleIntegration.spec.js.map +1 -1
- package/dist/specs/factory/Factory.spec.js +20 -18
- package/dist/specs/factory/Factory.spec.js.map +1 -1
- package/dist/specs/factory/NoSetupRepoFactory.spec.js +28 -28
- package/dist/specs/factory/NoSetupRepoFactory.spec.js.map +1 -1
- package/dist/specs/factory/RefusedOAuthFactory.spec.js +28 -26
- package/dist/specs/factory/RefusedOAuthFactory.spec.js.map +1 -1
- package/dist/tests-library/LoginTests.js +4 -4
- package/dist/tests-library/LoginTests.js.map +1 -1
- package/dist/tests-library/ProjectAndFileTests.js.map +1 -1
- package/dist/tests-library/WorkspaceHandlingTests.js +1 -2
- package/dist/tests-library/WorkspaceHandlingTests.js.map +1 -1
- package/dist/utils/BrowserTabsUtil.js +2 -2
- package/dist/utils/BrowserTabsUtil.js.map +1 -1
- package/dist/utils/CheReporter.js +33 -36
- package/dist/utils/CheReporter.js.map +1 -1
- package/dist/utils/DevWorkspaceConfigurationHelper.js +72 -0
- package/dist/utils/DevWorkspaceConfigurationHelper.js.map +1 -0
- package/dist/utils/DevfilesRegistryHelper.js +82 -0
- package/dist/utils/DevfilesRegistryHelper.js.map +1 -0
- package/dist/utils/DriverHelper.js +20 -17
- package/dist/utils/DriverHelper.js.map +1 -1
- package/dist/utils/KubernetesCommandLineToolsExecutor.js +42 -29
- package/dist/utils/KubernetesCommandLineToolsExecutor.js.map +1 -1
- package/dist/utils/Logger.js +11 -11
- package/dist/utils/Logger.js.map +1 -1
- package/dist/utils/ScreenCatcher.js +9 -12
- package/dist/utils/ScreenCatcher.js.map +1 -1
- package/dist/utils/ShellExecutor.js +5 -2
- package/dist/utils/ShellExecutor.js.map +1 -1
- package/dist/utils/{vsc/GitUtil.js → StringUtil.js} +26 -8
- package/dist/utils/StringUtil.js.map +1 -0
- package/dist/utils/request-handlers/CheApiRequestHandler.js +2 -2
- package/dist/utils/request-handlers/CheApiRequestHandler.js.map +1 -1
- package/dist/utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.js +4 -2
- package/dist/utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.js.map +1 -1
- package/dist/utils/workspace/ApiUrlResolver.js.map +1 -1
- package/dist/utils/workspace/TestWorkspaceUtil.js +9 -7
- package/dist/utils/workspace/TestWorkspaceUtil.js.map +1 -1
- package/driver/ChromeDriver.ts +7 -7
- package/index.ts +22 -12
- package/package.json +4 -2
- package/pageobjects/dashboard/CreateWorkspace.ts +2 -2
- package/pageobjects/dashboard/Dashboard.ts +7 -6
- package/pageobjects/dashboard/Workspaces.ts +3 -4
- package/pageobjects/dashboard/workspace-details/WorkspaceDetails.ts +2 -3
- package/pageobjects/git-providers/OauthPage.ts +8 -16
- package/pageobjects/ide/CheCodeLocatorLoader.ts +2 -2
- package/pageobjects/login/kubernetes/DexLoginPage.ts +58 -0
- package/pageobjects/login/kubernetes/KubernetesLoginPage.ts +33 -0
- package/pageobjects/{openshift → login/openshift}/OcpLoginPage.ts +7 -7
- package/pageobjects/login/{OcpRedHatLoginPage.ts → openshift/OcpRedHatLoginPage.ts} +6 -6
- package/pageobjects/login/{OcpUserLoginPage.ts → openshift/OcpUserLoginPage.ts} +8 -8
- package/pageobjects/login/{RedHatLoginPage.ts → openshift/RedHatLoginPage.ts} +6 -6
- package/pageobjects/login/{RegularUserOcpCheLoginPage.ts → openshift/RegularUserOcpCheLoginPage.ts} +9 -9
- package/specs/MochaHooks.ts +18 -12
- package/specs/SmokeTest.spec.ts +5 -2
- package/specs/api/ContainerOverridesAPI.spec.ts +5 -4
- package/specs/api/DevfileAcceptanceTestAPI.spec.ts +106 -0
- package/specs/api/EmptyWorkspaceAPI.spec.ts +74 -0
- package/specs/api/PodOverridesAPI.spec.ts +5 -4
- package/specs/dashboard-samples/EmptyWorkspace.spec.ts +10 -2
- package/specs/dashboard-samples/RecomendedExtentions.spec.ts +8 -7
- package/specs/devconsole-intergration/DevConsoleIntegration.spec.ts +4 -4
- package/specs/factory/Factory.spec.ts +21 -19
- package/specs/factory/NoSetupRepoFactory.spec.ts +29 -30
- package/specs/factory/RefusedOAuthFactory.spec.ts +29 -28
- package/tests-library/LoginTests.ts +9 -9
- package/tests-library/ProjectAndFileTests.ts +1 -1
- package/tests-library/WorkspaceHandlingTests.ts +11 -12
- package/utils/BrowserTabsUtil.ts +2 -2
- package/utils/CheReporter.ts +35 -42
- package/utils/DevWorkspaceConfigurationHelper.ts +83 -0
- package/utils/DevfilesRegistryHelper.ts +77 -0
- package/utils/DriverHelper.ts +54 -50
- package/utils/KubernetesCommandLineToolsExecutor.ts +43 -28
- package/utils/Logger.ts +16 -17
- package/utils/ScreenCatcher.ts +8 -9
- package/utils/ShellExecutor.ts +6 -2
- package/utils/StringUtil.ts +46 -0
- package/utils/request-handlers/CheApiRequestHandler.ts +4 -4
- package/utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.ts +4 -2
- package/utils/workspace/ApiUrlResolver.ts +2 -2
- package/utils/workspace/TestWorkspaceUtil.ts +16 -14
- package/constants/TestConstants.ts +0 -247
- package/dist/constants/TestConstants.js +0 -198
- package/dist/constants/TestConstants.js.map +0 -1
- package/dist/pageobjects/login/ICheLoginPage.js.map +0 -1
- package/dist/pageobjects/login/IOcpLoginPage.js.map +0 -1
- package/dist/pageobjects/login/OcpRedHatLoginPage.js.map +0 -1
- package/dist/pageobjects/login/OcpUserLoginPage.js.map +0 -1
- package/dist/pageobjects/login/RedHatLoginPage.js.map +0 -1
- package/dist/pageobjects/login/RegularUserOcpCheLoginPage.js.map +0 -1
- package/dist/pageobjects/openshift/CheLoginPage.js.map +0 -1
- package/dist/pageobjects/openshift/OcpLoginPage.js.map +0 -1
- package/dist/specs/api/CloneGitRepoAPI.spec.js +0 -60
- package/dist/specs/api/CloneGitRepoAPI.spec.js.map +0 -1
- package/dist/utils/Sanitizer.js +0 -29
- package/dist/utils/Sanitizer.js.map +0 -1
- package/dist/utils/vsc/GitUtil.js.map +0 -1
- package/pageobjects/openshift/CheLoginPage.ts +0 -42
- package/specs/api/CloneGitRepoAPI.spec.ts +0 -72
- package/utils/Sanitizer.ts +0 -19
- package/utils/vsc/GitUtil.ts +0 -25
- /package/dist/pageobjects/login/{ICheLoginPage.js → interfaces/ICheLoginPage.js} +0 -0
- /package/dist/pageobjects/login/{IOcpLoginPage.js → interfaces/IOcpLoginPage.js} +0 -0
- /package/pageobjects/login/{ICheLoginPage.ts → interfaces/ICheLoginPage.ts} +0 -0
- /package/pageobjects/login/{IOcpLoginPage.ts → interfaces/IOcpLoginPage.ts} +0 -0
|
@@ -27,7 +27,6 @@ const DriverHelper_1 = require("../../../utils/DriverHelper");
|
|
|
27
27
|
const inversify_1 = require("inversify");
|
|
28
28
|
const inversify_types_1 = require("../../../configs/inversify.types");
|
|
29
29
|
require("reflect-metadata");
|
|
30
|
-
const TestConstants_1 = require("../../../constants/TestConstants");
|
|
31
30
|
const selenium_webdriver_1 = require("selenium-webdriver");
|
|
32
31
|
const WorkspaceStatus_1 = require("../../../utils/workspace/WorkspaceStatus");
|
|
33
32
|
const Logger_1 = require("../../../utils/Logger");
|
|
@@ -39,7 +38,7 @@ let WorkspaceDetails = WorkspaceDetails_1 = class WorkspaceDetails {
|
|
|
39
38
|
this.testWorkspaceUtil = testWorkspaceUtil;
|
|
40
39
|
this.testProjectAndFileCheCode = testProjectAndFileCheCode;
|
|
41
40
|
}
|
|
42
|
-
async waitLoaderDisappearance(attempts =
|
|
41
|
+
async waitLoaderDisappearance(attempts = TimeoutConstants_1.TimeoutConstants.TS_SELENIUM_DEFAULT_ATTEMPTS, polling = TimeoutConstants_1.TimeoutConstants.TS_SELENIUM_DEFAULT_POLLING) {
|
|
43
42
|
Logger_1.Logger.debug('WorkspaceDetails.waitLoaderDisappearance');
|
|
44
43
|
await this.driverHelper.waitDisappearance(selenium_webdriver_1.By.css(WorkspaceDetails_1.WORKSPACE_DETAILS_LOADER_CSS), attempts, polling);
|
|
45
44
|
}
|
|
@@ -106,7 +105,7 @@ let WorkspaceDetails = WorkspaceDetails_1 = class WorkspaceDetails {
|
|
|
106
105
|
async waitSaveButton(timeout = TimeoutConstants_1.TimeoutConstants.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
107
106
|
await this.driverHelper.waitVisibility(selenium_webdriver_1.By.css(WorkspaceDetails_1.ENABLED_SAVE_BUTTON_CSS), timeout);
|
|
108
107
|
}
|
|
109
|
-
async waitSaveButtonDisappearance(attempts =
|
|
108
|
+
async waitSaveButtonDisappearance(attempts = TimeoutConstants_1.TimeoutConstants.TS_SELENIUM_DEFAULT_ATTEMPTS, polling = TimeoutConstants_1.TimeoutConstants.TS_SELENIUM_DEFAULT_POLLING) {
|
|
110
109
|
await this.driverHelper.waitDisappearance(selenium_webdriver_1.By.css(WorkspaceDetails_1.SAVE_BUTTON_CSS), attempts, polling);
|
|
111
110
|
}
|
|
112
111
|
async clickOnSaveButton(timeout = TimeoutConstants_1.TimeoutConstants.TS_CLICK_DASHBOARD_ITEM_TIMEOUT) {
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"WorkspaceDetails.js","sourceRoot":"","sources":["../../../../pageobjects/dashboard/workspace-details/WorkspaceDetails.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,14 +26,15 @@ const inversify_1 = require("inversify");
|
|
|
26
26
|
const selenium_webdriver_1 = require("selenium-webdriver");
|
|
27
27
|
const inversify_types_1 = require("../../configs/inversify.types");
|
|
28
28
|
const DriverHelper_1 = require("../../utils/DriverHelper");
|
|
29
|
-
const TestConstants_1 = require("../../constants/TestConstants");
|
|
30
29
|
const Logger_1 = require("../../utils/Logger");
|
|
31
30
|
const TimeoutConstants_1 = require("../../constants/TimeoutConstants");
|
|
31
|
+
const FactoryTestConstants_1 = require("../../constants/FactoryTestConstants");
|
|
32
|
+
const OAuthConstants_1 = require("../../constants/OAuthConstants");
|
|
32
33
|
let OauthPage = class OauthPage {
|
|
33
34
|
constructor(driverHelper) {
|
|
34
35
|
this.driverHelper = driverHelper;
|
|
35
|
-
switch (
|
|
36
|
-
case
|
|
36
|
+
switch (FactoryTestConstants_1.FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER) {
|
|
37
|
+
case FactoryTestConstants_1.GitProviderType.BITBUCKET:
|
|
37
38
|
{
|
|
38
39
|
this.loginForm = selenium_webdriver_1.By.id('j_username');
|
|
39
40
|
this.passwordForm = selenium_webdriver_1.By.id('j_password');
|
|
@@ -42,16 +43,16 @@ let OauthPage = class OauthPage {
|
|
|
42
43
|
this.denyAccessButton = selenium_webdriver_1.By.xpath('//*[@id="deny"]');
|
|
43
44
|
}
|
|
44
45
|
break;
|
|
45
|
-
case
|
|
46
|
+
case FactoryTestConstants_1.GitProviderType.GITLAB:
|
|
46
47
|
{
|
|
47
|
-
this.loginForm =
|
|
48
|
-
this.passwordForm =
|
|
49
|
-
this.submitButton =
|
|
48
|
+
this.loginForm = selenium_webdriver_1.By.id('user_login');
|
|
49
|
+
this.passwordForm = selenium_webdriver_1.By.id('user_password');
|
|
50
|
+
this.submitButton = selenium_webdriver_1.By.xpath('//button[@data-qa-selector="sign_in_button"]');
|
|
50
51
|
this.approveButton = selenium_webdriver_1.By.xpath('//*[@value="Authorize"]');
|
|
51
52
|
this.denyAccessButton = selenium_webdriver_1.By.xpath('//input[@value="Deny"]');
|
|
52
53
|
}
|
|
53
54
|
break;
|
|
54
|
-
case
|
|
55
|
+
case FactoryTestConstants_1.GitProviderType.GITHUB:
|
|
55
56
|
{
|
|
56
57
|
this.loginForm = selenium_webdriver_1.By.id('login_field');
|
|
57
58
|
this.passwordForm = selenium_webdriver_1.By.id('password');
|
|
@@ -61,20 +62,12 @@ let OauthPage = class OauthPage {
|
|
|
61
62
|
}
|
|
62
63
|
break;
|
|
63
64
|
default: {
|
|
64
|
-
throw new Error(`Invalid git provider. The value should be ${
|
|
65
|
+
throw new Error(`Invalid git provider. The value should be ${FactoryTestConstants_1.GitProviderType.GITHUB}, ${FactoryTestConstants_1.GitProviderType.GITLAB} or ${FactoryTestConstants_1.GitProviderType.BITBUCKET}`);
|
|
65
66
|
}
|
|
66
67
|
}
|
|
67
68
|
}
|
|
68
69
|
async waitLoginPage() {
|
|
69
70
|
Logger_1.Logger.debug('OauthPage.waitLoginPage');
|
|
70
|
-
// for gitlab server https://gitlab.cee.redhat.com
|
|
71
|
-
if (!TestConstants_1.TestConstants.TS_SELENIUM_GIT_PROVIDER_IS_LDAP_LOGIN &&
|
|
72
|
-
TestConstants_1.TestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER === TestConstants_1.GitProviderType.GITLAB) {
|
|
73
|
-
{
|
|
74
|
-
Logger_1.Logger.debug(`OauthPage.login - go to ${TestConstants_1.TestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER} Standard login section`);
|
|
75
|
-
await this.driverHelper.waitAndClick(selenium_webdriver_1.By.xpath('//a[@data-qa-selector="standard_tab"]'));
|
|
76
|
-
}
|
|
77
|
-
}
|
|
78
71
|
await this.driverHelper.waitVisibility(this.loginForm, TimeoutConstants_1.TimeoutConstants.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM * 3);
|
|
79
72
|
}
|
|
80
73
|
async enterUserName(userName) {
|
|
@@ -112,8 +105,8 @@ let OauthPage = class OauthPage {
|
|
|
112
105
|
async login() {
|
|
113
106
|
Logger_1.Logger.debug('OauthPage.login');
|
|
114
107
|
await this.waitLoginPage();
|
|
115
|
-
await this.enterUserName(
|
|
116
|
-
await this.enterPassword(
|
|
108
|
+
await this.enterUserName(OAuthConstants_1.OAuthConstants.TS_SELENIUM_GIT_PROVIDER_USERNAME);
|
|
109
|
+
await this.enterPassword(OAuthConstants_1.OAuthConstants.TS_SELENIUM_GIT_PROVIDER_PASSWORD);
|
|
117
110
|
await this.clickOnLoginButton();
|
|
118
111
|
await this.waitClosingLoginPage();
|
|
119
112
|
}
|
|
@@ -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
|
|
1
|
+
{"version":3,"file":"OauthPage.js","sourceRoot":"","sources":["../../../pageobjects/git-providers/OauthPage.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ 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 MonacoConstants_1 = require("../../constants/MonacoConstants");
|
|
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".
|
|
@@ -25,7 +25,7 @@ const TestConstants_1 = require("../../constants/TestConstants");
|
|
|
25
25
|
*/
|
|
26
26
|
class CheCodeLocatorLoader extends loader_1.LocatorLoader {
|
|
27
27
|
constructor() {
|
|
28
|
-
super(
|
|
28
|
+
super(MonacoConstants_1.MonacoConstants.TS_SELENIUM_MONACO_PAGE_OBJECTS_BASE_VERSION, MonacoConstants_1.MonacoConstants.TS_SELENIUM_MONACO_PAGE_OBJECTS_BASE_VERSION, vscode_extension_tester_locators_1.getLocatorsPath());
|
|
29
29
|
this.webCheCodeLocators = this.mergeLocators();
|
|
30
30
|
}
|
|
31
31
|
webLocatorDiff() {
|
|
@@ -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,qEAAkE;AAElE;;;;GAIG;AAEH,MAAa,oBAAqB,SAAQ,sBAAa;IAGnD;QACI,KAAK,CAAC,iCAAe,CAAC,4CAA4C,EAAE,iCAAe,CAAC,4CAA4C,EAAE,kDAAe,EAAE,CAAC,CAAC;QACrJ,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,aAAa,EAAc,CAAC;IAC/D,CAAC;IAEO,cAAc;QAClB,OAAO;YACH,QAAQ,EAAE;gBACN,cAAc,EAAE;oBACZ,IAAI,EAAE,uBAAE,CAAC,KAAK,CAAC,iEAAiE,CAAC;oBACjF,MAAM,EAAE,uBAAE,CAAC,KAAK,CAAC,2BAA2B,CAAC;iBAChD;aACJ;YACD,MAAM,EAAE;gBACJ,qBAAqB,EAAE;oBACnB,mBAAmB,EAAE,uBAAE,CAAC,KAAK,CAAC,iCAAiC,CAAC;iBACnE;aACJ;SACJ,CAAC;IACN,CAAC;IAEO,KAAK,CAAC,MAAW,EAAE,GAAQ;QAC/B,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE;YACnB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE;gBACjD,SAAS;aACZ;YAED,IAAI,MAAM,GAAQ,GAAG,CAAC,GAAG,CAAC,CAAC;YAC3B,IAAI,MAAM,GAAQ,MAAM,CAAC,GAAG,CAAC,CAAC;YAE9B,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,QAAQ,EAAE;gBAC9D,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;aAC5C;iBAAM;gBACH,MAAM,CAAC,GAAG,CAAC,GAAG,oBAAK,CAAC,MAAM,CAAC,CAAC;aAC/B;SACJ;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAEO,aAAa;QACjB,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;IAClB,CAAC;CACJ;AAlDD,oDAkDC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ICheLoginPage.js","sourceRoot":"","sources":["../../../../pageobjects/login/interfaces/ICheLoginPage.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"IOcpLoginPage.js","sourceRoot":"","sources":["../../../../pageobjects/login/interfaces/IOcpLoginPage.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE"}
|
|
@@ -0,0 +1,68 @@
|
|
|
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
|
+
};
|
|
11
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
|
+
};
|
|
14
|
+
var DexLoginPage_1;
|
|
15
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
|
+
exports.DexLoginPage = void 0;
|
|
17
|
+
/*********************************************************************
|
|
18
|
+
* Copyright (c) 2019-2023 Red Hat, Inc.
|
|
19
|
+
*
|
|
20
|
+
* This program and the accompanying materials are made
|
|
21
|
+
* available under the terms of the Eclipse Public License 2.0
|
|
22
|
+
* which is available at https://www.eclipse.org/legal/epl-2.0/
|
|
23
|
+
*
|
|
24
|
+
* SPDX-License-Identifier: EPL-2.0
|
|
25
|
+
**********************************************************************/
|
|
26
|
+
require("reflect-metadata");
|
|
27
|
+
const inversify_1 = require("inversify");
|
|
28
|
+
const inversify_types_1 = require("../../../configs/inversify.types");
|
|
29
|
+
const Logger_1 = require("../../../utils/Logger");
|
|
30
|
+
const selenium_webdriver_1 = require("selenium-webdriver");
|
|
31
|
+
const TimeoutConstants_1 = require("../../../constants/TimeoutConstants");
|
|
32
|
+
const DriverHelper_1 = require("../../../utils/DriverHelper");
|
|
33
|
+
let DexLoginPage = DexLoginPage_1 = class DexLoginPage {
|
|
34
|
+
constructor(driverHelper) {
|
|
35
|
+
this.driverHelper = driverHelper;
|
|
36
|
+
}
|
|
37
|
+
async waitDexLoginPage() {
|
|
38
|
+
Logger_1.Logger.debug(`${this.constructor.name}.${this.waitDexLoginPage.name}`);
|
|
39
|
+
await this.driverHelper.waitVisibility(DexLoginPage_1.dexPageContentContainer, TimeoutConstants_1.TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
|
|
40
|
+
}
|
|
41
|
+
async clickOnLoginButton() {
|
|
42
|
+
Logger_1.Logger.debug(`${this.constructor.name}.${this.clickOnLoginButton.name}`);
|
|
43
|
+
await this.driverHelper.waitAndClick(DexLoginPage_1.submitButton);
|
|
44
|
+
}
|
|
45
|
+
async enterUserNameKubernetes(userName) {
|
|
46
|
+
Logger_1.Logger.debug(`${this.constructor.name}.${this.enterUserNameKubernetes.name}`);
|
|
47
|
+
await this.driverHelper.enterValue(DexLoginPage_1.loginInput, userName);
|
|
48
|
+
}
|
|
49
|
+
async enterPasswordKubernetes(password) {
|
|
50
|
+
Logger_1.Logger.debug(`${this.constructor.name}.${this.enterPasswordKubernetes.name}`);
|
|
51
|
+
await this.driverHelper.enterValue(DexLoginPage_1.passwordInput, password);
|
|
52
|
+
}
|
|
53
|
+
async waitDexLoginPageDisappearance() {
|
|
54
|
+
Logger_1.Logger.debug(`${this.constructor.name}.${this.waitDexLoginPageDisappearance.name}`);
|
|
55
|
+
await this.driverHelper.waitDisappearance(DexLoginPage_1.dexPageContentContainer, TimeoutConstants_1.TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
|
|
56
|
+
}
|
|
57
|
+
};
|
|
58
|
+
DexLoginPage.dexPageContentContainer = selenium_webdriver_1.By.className('dex-container');
|
|
59
|
+
DexLoginPage.loginInput = selenium_webdriver_1.By.id('login');
|
|
60
|
+
DexLoginPage.passwordInput = selenium_webdriver_1.By.id('password');
|
|
61
|
+
DexLoginPage.submitButton = selenium_webdriver_1.By.id('submit-login');
|
|
62
|
+
DexLoginPage = DexLoginPage_1 = __decorate([
|
|
63
|
+
inversify_1.injectable(),
|
|
64
|
+
__param(0, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
|
|
65
|
+
__metadata("design:paramtypes", [DriverHelper_1.DriverHelper])
|
|
66
|
+
], DexLoginPage);
|
|
67
|
+
exports.DexLoginPage = DexLoginPage;
|
|
68
|
+
//# sourceMappingURL=DexLoginPage.js.map
|
|
@@ -0,0 +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,0EAAuE;AACvE,8DAA2D;AAG3D,IAAa,YAAY,oBAAzB,MAAa,YAAY;IAOrB,YACmD,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IAAI,CAAC;IAElF,KAAK,CAAC,gBAAgB;QAClB,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC;QAEvE,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,cAAY,CAAC,uBAAuB,EAAE,mCAAgB,CAAC,6BAA6B,CAAC,CAAC;IACjI,CAAC;IAED,KAAK,CAAC,kBAAkB;QACpB,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,CAAC,CAAC;QAEzE,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,cAAY,CAAC,YAAY,CAAC,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,QAAgB;QAC1C,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,CAAC,CAAC;QAE9E,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,cAAY,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAC1E,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,QAAgB;QAC1C,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,CAAC,CAAC;QAE9E,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,cAAY,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;IAC7E,CAAC;IAED,KAAK,CAAC,6BAA6B;QAC/B,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,6BAA6B,CAAC,IAAI,EAAE,CAAC,CAAC;QAEpF,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,cAAY,CAAC,uBAAuB,EAAE,mCAAgB,CAAC,6BAA6B,CAAC,CAAC;IACpI,CAAC;CACJ,CAAA;AArC2B,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;AALxD,YAAY;IADxB,sBAAU,EAAE;IASJ,WAAA,kBAAM,CAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCAAgC,2BAAY;GARpE,YAAY,CAuCxB;AAvCY,oCAAY"}
|
package/dist/pageobjects/{openshift/CheLoginPage.js → login/kubernetes/KubernetesLoginPage.js}
RENAMED
|
@@ -12,7 +12,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
12
12
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.
|
|
15
|
+
exports.KubernetesLoginPage = void 0;
|
|
16
16
|
/*********************************************************************
|
|
17
17
|
* Copyright (c) 2019-2023 Red Hat, Inc.
|
|
18
18
|
*
|
|
@@ -24,32 +24,27 @@ exports.CheLoginPage = void 0;
|
|
|
24
24
|
**********************************************************************/
|
|
25
25
|
require("reflect-metadata");
|
|
26
26
|
const inversify_1 = require("inversify");
|
|
27
|
-
const
|
|
28
|
-
const
|
|
29
|
-
const
|
|
30
|
-
const
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
this.driverHelper = driverHelper;
|
|
27
|
+
const inversify_types_1 = require("../../../configs/inversify.types");
|
|
28
|
+
const Logger_1 = require("../../../utils/Logger");
|
|
29
|
+
const DexLoginPage_1 = require("./DexLoginPage");
|
|
30
|
+
const OAuthConstants_1 = require("../../../constants/OAuthConstants");
|
|
31
|
+
let KubernetesLoginPage = class KubernetesLoginPage {
|
|
32
|
+
constructor(dexLoginPage) {
|
|
33
|
+
this.dexLoginPage = dexLoginPage;
|
|
35
34
|
}
|
|
36
|
-
async
|
|
37
|
-
Logger_1.Logger.debug(
|
|
38
|
-
await this.
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
await this.
|
|
43
|
-
}
|
|
44
|
-
async clickEclipseCheLoginButton() {
|
|
45
|
-
Logger_1.Logger.debug('CheLoginPage.clickEclipseCheLoginButton');
|
|
46
|
-
await this.driverHelper.waitAndClick(selenium_webdriver_1.By.id('submit-login'));
|
|
35
|
+
async login() {
|
|
36
|
+
Logger_1.Logger.debug(`${this.constructor.name}.${this.login.name}`);
|
|
37
|
+
await this.dexLoginPage.waitDexLoginPage();
|
|
38
|
+
await this.dexLoginPage.enterUserNameKubernetes(OAuthConstants_1.OAuthConstants.TS_SELENIUM_K8S_USERNAME);
|
|
39
|
+
await this.dexLoginPage.enterPasswordKubernetes(OAuthConstants_1.OAuthConstants.TS_SELENIUM_K8S_PASSWORD);
|
|
40
|
+
await this.dexLoginPage.clickOnLoginButton();
|
|
41
|
+
await this.dexLoginPage.waitDexLoginPageDisappearance();
|
|
47
42
|
}
|
|
48
43
|
};
|
|
49
|
-
|
|
44
|
+
KubernetesLoginPage = __decorate([
|
|
50
45
|
inversify_1.injectable(),
|
|
51
|
-
__param(0, inversify_1.inject(inversify_types_1.CLASSES.
|
|
52
|
-
__metadata("design:paramtypes", [
|
|
53
|
-
],
|
|
54
|
-
exports.
|
|
55
|
-
//# sourceMappingURL=
|
|
46
|
+
__param(0, inversify_1.inject(inversify_types_1.CLASSES.DexLoginPage)),
|
|
47
|
+
__metadata("design:paramtypes", [DexLoginPage_1.DexLoginPage])
|
|
48
|
+
], KubernetesLoginPage);
|
|
49
|
+
exports.KubernetesLoginPage = KubernetesLoginPage;
|
|
50
|
+
//# sourceMappingURL=KubernetesLoginPage.js.map
|
|
@@ -0,0 +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,sEAAmE;AAGnE,IAAa,mBAAmB,GAAhC,MAAa,mBAAmB;IAE5B,YACmD,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IAAI,CAAC;IAElF,KAAK,CAAC,KAAK;QACP,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;QAE5D,MAAM,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,CAAC;QAC3C,MAAM,IAAI,CAAC,YAAY,CAAC,uBAAuB,CAAC,+BAAc,CAAC,wBAAwB,CAAC,CAAC;QACzF,MAAM,IAAI,CAAC,YAAY,CAAC,uBAAuB,CAAC,+BAAc,CAAC,wBAAwB,CAAC,CAAC;QACzF,MAAM,IAAI,CAAC,YAAY,CAAC,kBAAkB,EAAE,CAAC;QAC7C,MAAM,IAAI,CAAC,YAAY,CAAC,6BAA6B,EAAE,CAAC;IAC5D,CAAC;CACJ,CAAA;AAdY,mBAAmB;IAD/B,sBAAU,EAAE;IAIJ,WAAA,kBAAM,CAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCAAgC,2BAAY;GAHpE,mBAAmB,CAc/B;AAdY,kDAAmB"}
|
|
@@ -25,12 +25,12 @@ exports.OcpLoginPage = void 0;
|
|
|
25
25
|
**********************************************************************/
|
|
26
26
|
require("reflect-metadata");
|
|
27
27
|
const inversify_1 = require("inversify");
|
|
28
|
-
const DriverHelper_1 = require("
|
|
29
|
-
const inversify_types_1 = require("
|
|
28
|
+
const DriverHelper_1 = require("../../../utils/DriverHelper");
|
|
29
|
+
const inversify_types_1 = require("../../../configs/inversify.types");
|
|
30
30
|
const selenium_webdriver_1 = require("selenium-webdriver");
|
|
31
|
-
const Logger_1 = require("
|
|
32
|
-
const
|
|
33
|
-
const
|
|
31
|
+
const Logger_1 = require("../../../utils/Logger");
|
|
32
|
+
const TimeoutConstants_1 = require("../../../constants/TimeoutConstants");
|
|
33
|
+
const OAuthConstants_1 = require("../../../constants/OAuthConstants");
|
|
34
34
|
let OcpLoginPage = OcpLoginPage_1 = class OcpLoginPage {
|
|
35
35
|
constructor(driverHelper) {
|
|
36
36
|
this.driverHelper = driverHelper;
|
|
@@ -41,12 +41,12 @@ let OcpLoginPage = OcpLoginPage_1 = class OcpLoginPage {
|
|
|
41
41
|
}
|
|
42
42
|
async clickOnLoginProviderTitle() {
|
|
43
43
|
Logger_1.Logger.debug('OcpLoginPage.clickOnLoginProviderTitle');
|
|
44
|
-
const loginProviderTitleLocator = selenium_webdriver_1.By.xpath(`//a[text()=\'${
|
|
44
|
+
const loginProviderTitleLocator = selenium_webdriver_1.By.xpath(`//a[text()=\'${OAuthConstants_1.OAuthConstants.TS_OCP_LOGIN_PAGE_PROVIDER_TITLE}\']`);
|
|
45
45
|
await this.driverHelper.waitAndClick(loginProviderTitleLocator, TimeoutConstants_1.TimeoutConstants.TS_SELENIUM_WAIT_FOR_URL);
|
|
46
46
|
}
|
|
47
47
|
async isIdentityProviderLinkVisible() {
|
|
48
48
|
Logger_1.Logger.debug('OcpLoginPage.isIdentityProviderLinkVisible');
|
|
49
|
-
const loginWithHtpaswdLocator = selenium_webdriver_1.By.xpath(`//a[text()=\'${
|
|
49
|
+
const loginWithHtpaswdLocator = selenium_webdriver_1.By.xpath(`//a[text()=\'${OAuthConstants_1.OAuthConstants.TS_OCP_LOGIN_PAGE_PROVIDER_TITLE}\']`);
|
|
50
50
|
return await this.driverHelper.waitVisibilityBoolean(loginWithHtpaswdLocator, 3, 5000);
|
|
51
51
|
}
|
|
52
52
|
async isAuthorizeOpenShiftIdentityProviderPageVisible() {
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"OcpLoginPage.js","sourceRoot":"","sources":["../../../../pageobjects/login/openshift/OcpLoginPage.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,12 +25,12 @@ exports.OcpRedHatLoginPage = void 0;
|
|
|
25
25
|
require("reflect-metadata");
|
|
26
26
|
const inversify_1 = require("inversify");
|
|
27
27
|
const RedHatLoginPage_1 = require("./RedHatLoginPage");
|
|
28
|
-
const inversify_types_1 = require("
|
|
28
|
+
const inversify_types_1 = require("../../../configs/inversify.types");
|
|
29
29
|
const selenium_webdriver_1 = require("selenium-webdriver");
|
|
30
|
-
const TimeoutConstants_1 = require("
|
|
31
|
-
const OcpLoginPage_1 = require("
|
|
32
|
-
const DriverHelper_1 = require("
|
|
33
|
-
const Logger_1 = require("
|
|
30
|
+
const TimeoutConstants_1 = require("../../../constants/TimeoutConstants");
|
|
31
|
+
const OcpLoginPage_1 = require("./OcpLoginPage");
|
|
32
|
+
const DriverHelper_1 = require("../../../utils/DriverHelper");
|
|
33
|
+
const Logger_1 = require("../../../utils/Logger");
|
|
34
34
|
let OcpRedHatLoginPage = class OcpRedHatLoginPage {
|
|
35
35
|
constructor(ocpLogin, redHatLogin, driverHelper) {
|
|
36
36
|
this.ocpLogin = ocpLogin;
|
|
@@ -0,0 +1 @@
|
|
|
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,0EAAuE;AAEvE,iDAA8C;AAC9C,8DAA2D;AAC3D,kDAA+C;AAG/C,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAK3B,YACmD,QAAsB,EACnB,WAA4B,EAC/B,YAA0B;QAF1B,aAAQ,GAAR,QAAQ,CAAc;QACnB,gBAAW,GAAX,WAAW,CAAiB;QAC/B,iBAAY,GAAZ,YAAY,CAAc;QAN5D,0CAAqC,GAAW,6BAA6B,CAAC;QAC9E,iDAA4C,GAAW,GAAG,IAAI,CAAC,qCAAqC,qDAAqD,CAAC;IAK1F,CAAC;IAElF,KAAK,CAAC,KAAK;QACP,eAAM,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAEzC,eAAM,CAAC,KAAK,CAAC,4EAA4E,CAAC,CAAC;QAC3F,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,uBAAE,CAAC,KAAK,CAAC,IAAI,CAAC,qCAAqC,CAAC,EAAE,mCAAgB,CAAC,6BAA6B,CAAC,CAAC;QAC3I,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,uBAAE,CAAC,KAAK,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAC,CAAC;QAElG,MAAM,IAAI,CAAC,QAAQ,CAAC,6BAA6B,EAAE,CAAC;QACpD,MAAM,IAAI,CAAC,QAAQ,CAAC,yBAAyB,EAAE,CAAC;QAEhD,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;IACrE,CAAC;CACJ,CAAA;AA3BY,kBAAkB;IAD9B,sBAAU,EAAE;IAOJ,WAAA,kBAAM,CAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;IAC5B,WAAA,kBAAM,CAAC,yBAAO,CAAC,eAAe,CAAC,CAAA;IAC/B,WAAA,kBAAM,CAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCAF4B,2BAAY;QACN,iCAAe;QACjB,2BAAY;GARpE,kBAAkB,CA2B9B;AA3BY,gDAAkB"}
|
|
@@ -24,22 +24,22 @@ exports.OcpUserLoginPage = void 0;
|
|
|
24
24
|
**********************************************************************/
|
|
25
25
|
require("reflect-metadata");
|
|
26
26
|
const inversify_1 = require("inversify");
|
|
27
|
-
const OcpLoginPage_1 = require("
|
|
28
|
-
const inversify_types_1 = require("
|
|
29
|
-
const
|
|
30
|
-
const
|
|
27
|
+
const OcpLoginPage_1 = require("./OcpLoginPage");
|
|
28
|
+
const inversify_types_1 = require("../../../configs/inversify.types");
|
|
29
|
+
const Logger_1 = require("../../../utils/Logger");
|
|
30
|
+
const OAuthConstants_1 = require("../../../constants/OAuthConstants");
|
|
31
31
|
let OcpUserLoginPage = class OcpUserLoginPage {
|
|
32
32
|
constructor(ocpLogin) {
|
|
33
33
|
this.ocpLogin = ocpLogin;
|
|
34
34
|
}
|
|
35
35
|
async login() {
|
|
36
36
|
Logger_1.Logger.debug('OcpUserLoginPage.login');
|
|
37
|
-
if (
|
|
37
|
+
if (OAuthConstants_1.OAuthConstants.TS_OCP_LOGIN_PAGE_PROVIDER_TITLE !== '') {
|
|
38
38
|
await this.ocpLogin.clickOnLoginProviderTitle();
|
|
39
39
|
}
|
|
40
40
|
await this.ocpLogin.waitOpenShiftLoginWelcomePage();
|
|
41
|
-
await this.ocpLogin.enterUserNameOpenShift(
|
|
42
|
-
await this.ocpLogin.enterPasswordOpenShift(
|
|
41
|
+
await this.ocpLogin.enterUserNameOpenShift(OAuthConstants_1.OAuthConstants.TS_SELENIUM_OCP_USERNAME);
|
|
42
|
+
await this.ocpLogin.enterPasswordOpenShift(OAuthConstants_1.OAuthConstants.TS_SELENIUM_OCP_PASSWORD);
|
|
43
43
|
await this.ocpLogin.clickOnLoginButton();
|
|
44
44
|
await this.ocpLogin.waitDisappearanceOpenShiftLoginWelcomePage();
|
|
45
45
|
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"OcpUserLoginPage.js","sourceRoot":"","sources":["../../../../pageobjects/login/openshift/OcpUserLoginPage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,4BAA0B;AAE1B,yCAA+C;AAC/C,iDAA8C;AAC9C,sEAA2D;AAC3D,kDAA+C;AAC/C,sEAAmE;AAGnE,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;IAEzB,YACmD,QAAsB;QAAtB,aAAQ,GAAR,QAAQ,CAAc;IAAI,CAAC;IAE9E,KAAK,CAAC,KAAK;QACP,eAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAEvC,IAAI,+BAAc,CAAC,gCAAgC,KAAK,EAAE,EAAE;YACxD,MAAM,IAAI,CAAC,QAAQ,CAAC,yBAAyB,EAAE,CAAC;SACnD;QAED,MAAM,IAAI,CAAC,QAAQ,CAAC,6BAA6B,EAAE,CAAC;QACpD,MAAM,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,+BAAc,CAAC,wBAAwB,CAAC,CAAC;QACpF,MAAM,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,+BAAc,CAAC,wBAAwB,CAAC,CAAC;QACpF,MAAM,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE,CAAC;QACzC,MAAM,IAAI,CAAC,QAAQ,CAAC,0CAA0C,EAAE,CAAC;IACrE,CAAC;CAEJ,CAAA;AAnBY,gBAAgB;IAD5B,sBAAU,EAAE;IAIJ,WAAA,kBAAM,CAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCAA4B,2BAAY;GAHhE,gBAAgB,CAmB5B;AAnBY,4CAAgB"}
|
|
@@ -25,10 +25,10 @@ exports.RedHatLoginPage = void 0;
|
|
|
25
25
|
require("reflect-metadata");
|
|
26
26
|
const inversify_1 = require("inversify");
|
|
27
27
|
const selenium_webdriver_1 = require("selenium-webdriver");
|
|
28
|
-
const inversify_types_1 = require("
|
|
29
|
-
const DriverHelper_1 = require("
|
|
30
|
-
const Logger_1 = require("
|
|
31
|
-
const
|
|
28
|
+
const inversify_types_1 = require("../../../configs/inversify.types");
|
|
29
|
+
const DriverHelper_1 = require("../../../utils/DriverHelper");
|
|
30
|
+
const Logger_1 = require("../../../utils/Logger");
|
|
31
|
+
const OAuthConstants_1 = require("../../../constants/OAuthConstants");
|
|
32
32
|
let RedHatLoginPage = class RedHatLoginPage {
|
|
33
33
|
constructor(driverHelper) {
|
|
34
34
|
this.driverHelper = driverHelper;
|
|
@@ -45,7 +45,7 @@ let RedHatLoginPage = class RedHatLoginPage {
|
|
|
45
45
|
Logger_1.Logger.debug('RedHatLoginPage.enterPasswordRedHat');
|
|
46
46
|
const passwordFieldLocator = selenium_webdriver_1.By.id(this.PASSWORD_INPUT_ID);
|
|
47
47
|
await this.driverHelper.waitVisibility(passwordFieldLocator, 3000);
|
|
48
|
-
await this.driverHelper.enterValue(passwordFieldLocator,
|
|
48
|
+
await this.driverHelper.enterValue(passwordFieldLocator, OAuthConstants_1.OAuthConstants.TS_SELENIUM_OCP_PASSWORD);
|
|
49
49
|
}
|
|
50
50
|
async clickOnLoginButton() {
|
|
51
51
|
Logger_1.Logger.debug('RedHatLoginPage.clickOnLoginButton');
|
|
@@ -60,7 +60,7 @@ let RedHatLoginPage = class RedHatLoginPage {
|
|
|
60
60
|
Logger_1.Logger.debug('RedHatLoginPage.enterUserNameRedHat');
|
|
61
61
|
const usernameFieldLocator = selenium_webdriver_1.By.id(this.USERNAME_INPUT_ID);
|
|
62
62
|
await this.driverHelper.waitVisibility(usernameFieldLocator, 20000);
|
|
63
|
-
await this.driverHelper.enterValue(usernameFieldLocator,
|
|
63
|
+
await this.driverHelper.enterValue(usernameFieldLocator, OAuthConstants_1.OAuthConstants.TS_SELENIUM_OCP_USERNAME);
|
|
64
64
|
}
|
|
65
65
|
async clickNextButton() {
|
|
66
66
|
Logger_1.Logger.debug('RedHatLoginPage.clickNextButton');
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"RedHatLoginPage.js","sourceRoot":"","sources":["../../../../pageobjects/login/openshift/RedHatLoginPage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,4BAA0B;AAC1B,yCAA+C;AAC/C,2DAAwC;AACxC,sEAA2D;AAC3D,8DAA2D;AAC3D,kDAA+C;AAC/C,sEAAmE;AAGnE,IAAa,eAAe,GAA5B,MAAa,eAAe;IAMxB,YACmD,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;QAN5D,sBAAiB,GAAW,uBAAuB,CAAC;QACpD,sBAAiB,GAAW,UAAU,CAAC;QACvC,mBAAc,GAAW,kBAAkB,CAAC;QAC5C,oBAAe,GAAW,wCAAwC,CAAC;IAGH,CAAC;IAElF,KAAK,CAAC,0BAA0B;QAC5B,eAAM,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;QAC3D,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,uBAAE,CAAC,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED,KAAK,CAAC,mBAAmB;QACrB,eAAM,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;QACpD,MAAM,oBAAoB,GAAO,uBAAE,CAAC,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC/D,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC;QACnE,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,oBAAoB,EAAE,+BAAc,CAAC,wBAAwB,CAAC,CAAC;IACtG,CAAC;IACD,KAAK,CAAC,kBAAkB;QACpB,eAAM,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;QACnD,MAAM,kBAAkB,GAAO,uBAAE,CAAC,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC3D,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC;IAC7D,CAAC;IACD,KAAK,CAAC,uCAAuC;QACzC,eAAM,CAAC,KAAK,CAAC,yDAAyD,CAAC,CAAC;QACxE,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,uBAAE,CAAC,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC;IAC3E,CAAC;IACD,KAAK,CAAC,mBAAmB;QACrB,eAAM,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;QACpD,MAAM,oBAAoB,GAAO,uBAAE,CAAC,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC/D,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;QACpE,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,oBAAoB,EAAE,+BAAc,CAAC,wBAAwB,CAAC,CAAC;IACtG,CAAC;IAED,KAAK,CAAC,eAAe;QACjB,eAAM,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;QAChD,MAAM,iBAAiB,GAAO,uBAAE,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACzD,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC;IAC5D,CAAC;CACJ,CAAA;AAzCY,eAAe;IAD3B,sBAAU,EAAE;IAQJ,WAAA,kBAAM,CAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCAAgC,2BAAY;GAPpE,eAAe,CAyC3B;AAzCY,0CAAe"}
|
|
@@ -23,14 +23,14 @@ exports.RegularUserOcpCheLoginPage = void 0;
|
|
|
23
23
|
* SPDX-License-Identifier: EPL-2.0
|
|
24
24
|
**********************************************************************/
|
|
25
25
|
require("reflect-metadata");
|
|
26
|
-
const OcpLoginPage_1 = require("
|
|
26
|
+
const OcpLoginPage_1 = require("./OcpLoginPage");
|
|
27
27
|
const inversify_1 = require("inversify");
|
|
28
|
-
const inversify_types_1 = require("
|
|
29
|
-
const
|
|
30
|
-
const
|
|
31
|
-
const TimeoutConstants_1 = require("../../constants/TimeoutConstants");
|
|
28
|
+
const inversify_types_1 = require("../../../configs/inversify.types");
|
|
29
|
+
const Logger_1 = require("../../../utils/Logger");
|
|
30
|
+
const TimeoutConstants_1 = require("../../../constants/TimeoutConstants");
|
|
32
31
|
const selenium_webdriver_1 = require("selenium-webdriver");
|
|
33
|
-
const DriverHelper_1 = require("
|
|
32
|
+
const DriverHelper_1 = require("../../../utils/DriverHelper");
|
|
33
|
+
const OAuthConstants_1 = require("../../../constants/OAuthConstants");
|
|
34
34
|
let RegularUserOcpCheLoginPage = class RegularUserOcpCheLoginPage {
|
|
35
35
|
constructor(ocpLogin, driverHelper) {
|
|
36
36
|
this.ocpLogin = ocpLogin;
|
|
@@ -47,8 +47,8 @@ let RegularUserOcpCheLoginPage = class RegularUserOcpCheLoginPage {
|
|
|
47
47
|
await this.ocpLogin.clickOnLoginProviderTitle();
|
|
48
48
|
}
|
|
49
49
|
await this.ocpLogin.waitOpenShiftLoginWelcomePage();
|
|
50
|
-
await this.ocpLogin.enterUserNameOpenShift(
|
|
51
|
-
await this.ocpLogin.enterPasswordOpenShift(
|
|
50
|
+
await this.ocpLogin.enterUserNameOpenShift(OAuthConstants_1.OAuthConstants.TS_SELENIUM_OCP_USERNAME);
|
|
51
|
+
await this.ocpLogin.enterPasswordOpenShift(OAuthConstants_1.OAuthConstants.TS_SELENIUM_OCP_PASSWORD);
|
|
52
52
|
await this.ocpLogin.clickOnLoginButton();
|
|
53
53
|
await this.ocpLogin.waitDisappearanceOpenShiftLoginWelcomePage();
|
|
54
54
|
if (await this.ocpLogin.isAuthorizeOpenShiftIdentityProviderPageVisible()) {
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"RegularUserOcpCheLoginPage.js","sourceRoot":"","sources":["../../../../pageobjects/login/openshift/RegularUserOcpCheLoginPage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,4BAA0B;AAE1B,iDAA8C;AAC9C,yCAA+C;AAC/C,sEAA2D;AAC3D,kDAA+C;AAC/C,0EAAuE;AACvE,2DAAwC;AACxC,8DAA2D;AAC3D,sEAAmE;AAGnE,IAAa,0BAA0B,GAAvC,MAAa,0BAA0B;IAKnC,YACmD,QAAsB,EACtB,YAA0B;QAD1B,aAAQ,GAAR,QAAQ,CAAc;QACtB,iBAAY,GAAZ,YAAY,CAAc;QAL5D,0CAAqC,GAAW,6BAA6B,CAAC;QAC9E,iDAA4C,GAAW,GAAG,IAAI,CAAC,qCAAqC,qDAAqD,CAAC;IAI1F,CAAC;IAElF,KAAK,CAAC,KAAK;QACP,eAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;QAEjD,eAAM,CAAC,KAAK,CAAC,oFAAoF,CAAC,CAAC;QACnG,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,uBAAE,CAAC,KAAK,CAAC,IAAI,CAAC,qCAAqC,CAAC,EAAE,mCAAgB,CAAC,6BAA6B,CAAC,CAAC;QAC3I,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,uBAAE,CAAC,KAAK,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAC,CAAC;QAElG,IAAI,MAAM,IAAI,CAAC,QAAQ,CAAC,6BAA6B,EAAE,EAAE;YACrD,MAAM,IAAI,CAAC,QAAQ,CAAC,yBAAyB,EAAE,CAAC;SACnD;QAED,MAAM,IAAI,CAAC,QAAQ,CAAC,6BAA6B,EAAE,CAAC;QACpD,MAAM,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,+BAAc,CAAC,wBAAwB,CAAC,CAAC;QACpF,MAAM,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,+BAAc,CAAC,wBAAwB,CAAC,CAAC;QACpF,MAAM,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE,CAAC;QACzC,MAAM,IAAI,CAAC,QAAQ,CAAC,0CAA0C,EAAE,CAAC;QAEjE,IAAI,MAAM,IAAI,CAAC,QAAQ,CAAC,+CAA+C,EAAE,EAAE;YACvE,MAAM,IAAI,CAAC,QAAQ,CAAC,0CAA0C,EAAE,CAAC;YACjE,MAAM,IAAI,CAAC,QAAQ,CAAC,mCAAmC,EAAE,CAAC;SAC7D;IACL,CAAC;CACJ,CAAA;AA/BY,0BAA0B;IADtC,sBAAU,EAAE;IAOJ,WAAA,kBAAM,CAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;IAC5B,WAAA,kBAAM,CAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCAD4B,2BAAY;QACR,2BAAY;GAPpE,0BAA0B,CA+BtC;AA/BY,gEAA0B"}
|
package/dist/specs/MochaHooks.js
CHANGED
|
@@ -31,13 +31,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
31
31
|
exports.registerRunningWorkspace = void 0;
|
|
32
32
|
require("reflect-metadata");
|
|
33
33
|
const inversify_types_1 = require("../configs/inversify.types");
|
|
34
|
-
const TestConstants_1 = require("../constants/TestConstants");
|
|
35
34
|
const CheApiRequestHandler_1 = require("../utils/request-handlers/CheApiRequestHandler");
|
|
36
35
|
const TimeoutConstants_1 = require("../constants/TimeoutConstants");
|
|
37
36
|
const monacoPageObjects = __importStar(require("monaco-page-objects"));
|
|
38
37
|
const vscodeExtensionTesterLocators = __importStar(require("vscode-extension-tester-locators"));
|
|
39
38
|
const inversify_config_1 = require("../configs/inversify.config");
|
|
40
39
|
const Logger_1 = require("../utils/Logger");
|
|
40
|
+
const BaseTestConstants_1 = require("../constants/BaseTestConstants");
|
|
41
|
+
const ChromeDriverConstants_1 = require("../constants/ChromeDriverConstants");
|
|
42
|
+
const MonacoConstants_1 = require("../constants/MonacoConstants");
|
|
41
43
|
const driverHelper = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.DriverHelper);
|
|
42
44
|
const testWorkspaceUtil = inversify_config_1.e2eContainer.get(inversify_types_1.TYPES.WorkspaceUtil);
|
|
43
45
|
let latestWorkspace = '';
|
|
@@ -49,37 +51,42 @@ exports.registerRunningWorkspace = registerRunningWorkspace;
|
|
|
49
51
|
exports.mochaHooks = {
|
|
50
52
|
beforeAll: [
|
|
51
53
|
async function enableRequestInterceptor() {
|
|
52
|
-
if (
|
|
54
|
+
if (BaseTestConstants_1.BaseTestConstants.TS_SELENIUM_REQUEST_INTERCEPTOR) {
|
|
53
55
|
CheApiRequestHandler_1.CheApiRequestHandler.enableRequestInterceptor();
|
|
54
56
|
}
|
|
55
57
|
},
|
|
56
58
|
async function enableResponseInterceptor() {
|
|
57
|
-
if (
|
|
59
|
+
if (BaseTestConstants_1.BaseTestConstants.TS_SELENIUM_RESPONSE_INTERCEPTOR) {
|
|
58
60
|
CheApiRequestHandler_1.CheApiRequestHandler.enableResponseInterceptor();
|
|
59
61
|
}
|
|
60
62
|
},
|
|
61
63
|
async function initMonacoPageObjects() {
|
|
62
64
|
// init vscode-extension-tester monaco-page-objects
|
|
63
|
-
monacoPageObjects.initPageObjects(
|
|
65
|
+
monacoPageObjects.initPageObjects(MonacoConstants_1.MonacoConstants.TS_SELENIUM_MONACO_PAGE_OBJECTS_USE_VERSION, MonacoConstants_1.MonacoConstants.TS_SELENIUM_MONACO_PAGE_OBJECTS_BASE_VERSION, vscodeExtensionTesterLocators.getLocatorsPath(), driverHelper.getDriver(), 'google-chrome');
|
|
64
66
|
},
|
|
65
67
|
async function prolongTimeoutConstantsInDebugMode() {
|
|
66
|
-
if (
|
|
68
|
+
if (BaseTestConstants_1.BaseTestConstants.TS_DEBUG_MODE) {
|
|
67
69
|
for (let [timeout, seconds] of Object.entries(TimeoutConstants_1.TimeoutConstants)) {
|
|
68
70
|
Object.defineProperty(TimeoutConstants_1.TimeoutConstants, timeout, { value: seconds * 100 });
|
|
69
71
|
}
|
|
70
72
|
}
|
|
71
73
|
},
|
|
72
74
|
],
|
|
73
|
-
|
|
75
|
+
afterEach: [
|
|
74
76
|
// stop and remove running workspace
|
|
75
|
-
async ()
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
77
|
+
async function () {
|
|
78
|
+
var _a;
|
|
79
|
+
if (((_a = this.currentTest) === null || _a === void 0 ? void 0 : _a.state) === 'failed') {
|
|
80
|
+
if (BaseTestConstants_1.BaseTestConstants.DELETE_WORKSPACE_ON_FAILED_TEST) {
|
|
81
|
+
Logger_1.Logger.info('Property DELETE_WORKSPACE_ON_FAILED_TEST is true - trying to stop and delete running workspace with API.');
|
|
82
|
+
await testWorkspaceUtil.stopAndDeleteWorkspaceByName(latestWorkspace);
|
|
83
|
+
}
|
|
79
84
|
}
|
|
80
85
|
},
|
|
86
|
+
],
|
|
87
|
+
afterAll: [
|
|
81
88
|
async function stopTheDriver() {
|
|
82
|
-
if (!
|
|
89
|
+
if (!BaseTestConstants_1.BaseTestConstants.TS_DEBUG_MODE && ChromeDriverConstants_1.ChromeDriverConstants.TS_USE_WEB_DRIVER_FOR_TEST) {
|
|
83
90
|
await driverHelper.getDriver().quit();
|
|
84
91
|
Logger_1.Logger.info('Chrome driver session stopped.');
|
|
85
92
|
}
|