@eclipse-che/che-e2e 7.74.0-dev-41d1364 → 7.74.0-dev-aace77a
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.eslintrc.js +15 -1
- package/CODE_STYLE.md +144 -0
- package/configs/inversify.config.ts +26 -5
- package/configs/inversify.types.ts +17 -3
- package/constants/CHROME_DRIVER_CONSTANTS.ts +1 -13
- package/dist/configs/inversify.config.js +22 -1
- package/dist/configs/inversify.config.js.map +1 -1
- package/dist/configs/inversify.types.js +17 -3
- package/dist/configs/inversify.types.js.map +1 -1
- package/dist/constants/CHROME_DRIVER_CONSTANTS.js +1 -9
- package/dist/constants/CHROME_DRIVER_CONSTANTS.js.map +1 -1
- package/dist/driver/ChromeDriver.js +1 -7
- package/dist/driver/ChromeDriver.js.map +1 -1
- package/dist/index.js +9 -3
- package/dist/index.js.map +1 -1
- package/dist/pageobjects/dashboard/CreateWorkspace.js +5 -5
- package/dist/pageobjects/dashboard/CreateWorkspace.js.map +1 -1
- package/dist/pageobjects/dashboard/Dashboard.js +5 -6
- package/dist/pageobjects/dashboard/Dashboard.js.map +1 -1
- package/dist/pageobjects/dashboard/Workspaces.js +34 -39
- package/dist/pageobjects/dashboard/Workspaces.js.map +1 -1
- package/dist/pageobjects/dashboard/workspace-details/WorkspaceDetails.js +27 -28
- package/dist/pageobjects/dashboard/workspace-details/WorkspaceDetails.js.map +1 -1
- package/dist/pageobjects/git-providers/OauthPage.js +2 -2
- package/dist/pageobjects/git-providers/OauthPage.js.map +1 -1
- package/dist/pageobjects/ide/CheCodeLocatorLoader.js +18 -4
- package/dist/pageobjects/ide/CheCodeLocatorLoader.js.map +1 -1
- package/dist/pageobjects/login/kubernetes/DexLoginPage.js +11 -11
- package/dist/pageobjects/login/kubernetes/DexLoginPage.js.map +1 -1
- package/dist/pageobjects/login/kubernetes/KubernetesLoginPage.js +2 -2
- package/dist/pageobjects/login/kubernetes/KubernetesLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/OcpLoginPage.js +20 -24
- package/dist/pageobjects/login/openshift/OcpLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/OcpRedHatLoginPage.js +10 -13
- package/dist/pageobjects/login/openshift/OcpRedHatLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/OcpUserLoginPage.js +3 -3
- package/dist/pageobjects/login/openshift/OcpUserLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/RedHatLoginPage.js +16 -20
- package/dist/pageobjects/login/openshift/RedHatLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/RegularUserOcpCheLoginPage.js +16 -15
- package/dist/pageobjects/login/openshift/RegularUserOcpCheLoginPage.js.map +1 -1
- package/dist/pageobjects/openshift/OcpApplicationPage.js +7 -7
- package/dist/pageobjects/openshift/OcpApplicationPage.js.map +1 -1
- package/dist/pageobjects/openshift/OcpImportFromGitPage.js +20 -20
- package/dist/pageobjects/openshift/OcpImportFromGitPage.js.map +1 -1
- package/dist/pageobjects/openshift/OcpMainPage.js +25 -25
- package/dist/pageobjects/openshift/OcpMainPage.js.map +1 -1
- package/dist/specs/MochaHooks.js +9 -6
- package/dist/specs/MochaHooks.js.map +1 -1
- package/dist/specs/SmokeTest.spec.js +6 -6
- package/dist/specs/SmokeTest.spec.js.map +1 -1
- package/dist/specs/api/ContainerOverridesAPI.spec.js +7 -14
- package/dist/specs/api/ContainerOverridesAPI.spec.js.map +1 -1
- package/dist/specs/api/DevfileAcceptanceTestAPI.spec.js +11 -19
- package/dist/specs/api/DevfileAcceptanceTestAPI.spec.js.map +1 -1
- package/dist/specs/api/EmptyWorkspaceAPI.spec.js +10 -16
- package/dist/specs/api/EmptyWorkspaceAPI.spec.js.map +1 -1
- package/dist/specs/api/PodOverridesAPI.spec.js +7 -14
- package/dist/specs/api/PodOverridesAPI.spec.js.map +1 -1
- package/dist/specs/dashboard-samples/EmptyWorkspace.spec.js +5 -5
- package/dist/specs/dashboard-samples/EmptyWorkspace.spec.js.map +1 -1
- package/dist/specs/dashboard-samples/Quarkus.spec.js +6 -6
- package/dist/specs/dashboard-samples/Quarkus.spec.js.map +1 -1
- package/dist/specs/dashboard-samples/RecommendedExtensions.spec.js +11 -11
- package/dist/specs/dashboard-samples/RecommendedExtensions.spec.js.map +1 -1
- package/dist/specs/devconsole-intergration/DevConsoleIntegration.spec.js +11 -12
- package/dist/specs/devconsole-intergration/DevConsoleIntegration.spec.js.map +1 -1
- package/dist/specs/factory/Factory.spec.js +13 -16
- package/dist/specs/factory/Factory.spec.js.map +1 -1
- package/dist/specs/factory/NoSetupRepoFactory.spec.js +17 -18
- package/dist/specs/factory/NoSetupRepoFactory.spec.js.map +1 -1
- package/dist/specs/factory/RefusedOAuthFactory.spec.js +17 -19
- package/dist/specs/factory/RefusedOAuthFactory.spec.js.map +1 -1
- package/dist/specs/miscellaneous/PredefinedNamespace.spec.js +35 -41
- package/dist/specs/miscellaneous/PredefinedNamespace.spec.js.map +1 -1
- package/dist/tests-library/LoginTests.js +8 -8
- package/dist/tests-library/LoginTests.js.map +1 -1
- package/dist/tests-library/ProjectAndFileTests.js +2 -2
- package/dist/tests-library/ProjectAndFileTests.js.map +1 -1
- package/dist/tests-library/WorkspaceHandlingTests.js +8 -8
- package/dist/tests-library/WorkspaceHandlingTests.js.map +1 -1
- package/dist/utils/BrowserTabsUtil.js +4 -9
- package/dist/utils/BrowserTabsUtil.js.map +1 -1
- package/dist/utils/CheReporter.js +49 -23
- package/dist/utils/CheReporter.js.map +1 -1
- package/dist/utils/DevWorkspaceConfigurationHelper.js +27 -17
- package/dist/utils/DevWorkspaceConfigurationHelper.js.map +1 -1
- package/dist/utils/DevfilesRegistryHelper.js +15 -5
- package/dist/utils/DevfilesRegistryHelper.js.map +1 -1
- package/dist/utils/DriverHelper.js +9 -2
- package/dist/utils/DriverHelper.js.map +1 -1
- package/dist/utils/IContextParams.js +12 -0
- package/dist/utils/IContextParams.js.map +1 -0
- package/dist/utils/IKubernetesCommandLineToolsExecutor.js +3 -0
- package/dist/utils/IKubernetesCommandLineToolsExecutor.js.map +1 -0
- package/dist/utils/KubernetesCommandLineToolsExecutor.js +133 -98
- package/dist/utils/KubernetesCommandLineToolsExecutor.js.map +1 -1
- package/dist/utils/ScreenCatcher.js +8 -4
- package/dist/utils/ScreenCatcher.js.map +1 -1
- package/dist/utils/ShellExecutor.js +20 -9
- package/dist/utils/ShellExecutor.js.map +1 -1
- package/dist/utils/StringUtil.js +4 -2
- package/dist/utils/StringUtil.js.map +1 -1
- package/dist/utils/request-handlers/CheApiRequestHandler.js +2 -2
- package/dist/utils/request-handlers/CheApiRequestHandler.js.map +1 -1
- package/dist/utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.js +2 -2
- package/dist/utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.js.map +1 -1
- package/dist/utils/workspace/ApiUrlResolver.js +2 -2
- package/dist/utils/workspace/ApiUrlResolver.js.map +1 -1
- package/dist/utils/workspace/TestWorkspaceUtil.js +4 -4
- package/dist/utils/workspace/TestWorkspaceUtil.js.map +1 -1
- package/driver/ChromeDriver.ts +0 -7
- package/index.ts +2 -0
- package/package.json +3 -3
- package/pageobjects/dashboard/CreateWorkspace.ts +5 -4
- package/pageobjects/dashboard/Dashboard.ts +3 -4
- package/pageobjects/dashboard/Workspaces.ts +40 -48
- package/pageobjects/dashboard/workspace-details/WorkspaceDetails.ts +23 -26
- package/pageobjects/ide/CheCodeLocatorLoader.ts +3 -1
- package/pageobjects/login/interfaces/ICheLoginPage.ts +1 -1
- package/pageobjects/login/interfaces/IOcpLoginPage.ts +1 -1
- package/pageobjects/login/kubernetes/DexLoginPage.ts +9 -9
- package/pageobjects/login/openshift/OcpLoginPage.ts +18 -30
- package/pageobjects/login/openshift/OcpRedHatLoginPage.ts +6 -11
- package/pageobjects/login/openshift/OcpUserLoginPage.ts +1 -1
- package/pageobjects/login/openshift/RedHatLoginPage.ts +17 -16
- package/pageobjects/login/openshift/RegularUserOcpCheLoginPage.ts +16 -11
- package/pageobjects/openshift/OcpApplicationPage.ts +5 -4
- package/pageobjects/openshift/OcpImportFromGitPage.ts +18 -20
- package/pageobjects/openshift/OcpMainPage.ts +24 -25
- package/specs/MochaHooks.ts +3 -5
- package/specs/SmokeTest.spec.ts +4 -5
- package/specs/api/ContainerOverridesAPI.spec.ts +8 -2
- package/specs/api/DevfileAcceptanceTestAPI.spec.ts +9 -7
- package/specs/api/EmptyWorkspaceAPI.spec.ts +8 -4
- package/specs/api/PodOverridesAPI.spec.ts +8 -3
- package/specs/dashboard-samples/EmptyWorkspace.spec.ts +5 -5
- package/specs/dashboard-samples/Quarkus.spec.ts +7 -6
- package/specs/dashboard-samples/RecommendedExtensions.spec.ts +8 -7
- package/specs/devconsole-intergration/DevConsoleIntegration.spec.ts +12 -11
- package/specs/factory/Factory.spec.ts +8 -12
- package/specs/factory/NoSetupRepoFactory.spec.ts +10 -11
- package/specs/factory/RefusedOAuthFactory.spec.ts +8 -10
- package/specs/miscellaneous/PredefinedNamespace.spec.ts +40 -44
- package/tests-library/LoginTests.ts +3 -3
- package/tests-library/WorkspaceHandlingTests.ts +2 -2
- package/utils/BrowserTabsUtil.ts +7 -9
- package/utils/CheReporter.ts +26 -20
- package/utils/DevWorkspaceConfigurationHelper.ts +9 -24
- package/utils/DevfilesRegistryHelper.ts +8 -3
- package/utils/DriverHelper.ts +14 -12
- package/utils/IContextParams.ts +26 -0
- package/utils/IKubernetesCommandLineToolsExecutor.ts +42 -0
- package/utils/KubernetesCommandLineToolsExecutor.ts +133 -101
- package/utils/ShellExecutor.ts +10 -7
- package/utils/StringUtil.ts +6 -1
|
@@ -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,4EAAyE;AACzE,wEAAqE;
|
|
1
|
+
{"version":3,"file":"OcpLoginPage.js","sourceRoot":"","sources":["../../../../pageobjects/login/openshift/OcpLoginPage.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ 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
|
/** *******************************************************************
|
|
@@ -31,21 +32,16 @@ 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"}
|
|
@@ -35,7 +35,7 @@ let OcpUserLoginPage = class OcpUserLoginPage {
|
|
|
35
35
|
async login() {
|
|
36
36
|
Logger_1.Logger.debug();
|
|
37
37
|
if (OAUTH_CONSTANTS_1.OAUTH_CONSTANTS.TS_OCP_LOGIN_PAGE_PROVIDER_TITLE !== '') {
|
|
38
|
-
await this.ocpLogin.
|
|
38
|
+
await this.ocpLogin.waitAndClickOnLoginProviderTitle();
|
|
39
39
|
}
|
|
40
40
|
await this.ocpLogin.waitOpenShiftLoginWelcomePage();
|
|
41
41
|
await this.ocpLogin.enterUserNameOpenShift(OAUTH_CONSTANTS_1.OAUTH_CONSTANTS.TS_SELENIUM_OCP_USERNAME);
|
|
@@ -45,8 +45,8 @@ let OcpUserLoginPage = class OcpUserLoginPage {
|
|
|
45
45
|
}
|
|
46
46
|
};
|
|
47
47
|
OcpUserLoginPage = __decorate([
|
|
48
|
-
inversify_1.injectable(),
|
|
49
|
-
__param(0, inversify_1.inject(inversify_types_1.CLASSES.OcpLoginPage)),
|
|
48
|
+
(0, inversify_1.injectable)(),
|
|
49
|
+
__param(0, (0, inversify_1.inject)(inversify_types_1.CLASSES.OcpLoginPage)),
|
|
50
50
|
__metadata("design:paramtypes", [OcpLoginPage_1.OcpLoginPage])
|
|
51
51
|
], OcpUserLoginPage);
|
|
52
52
|
exports.OcpUserLoginPage = OcpUserLoginPage;
|
|
@@ -1 +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,wEAAqE;
|
|
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,wEAAqE;AAG9D,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC5B,YAA2D,QAAsB;QAAtB,aAAQ,GAAR,QAAQ,CAAc;IAAG,CAAC;IAErF,KAAK,CAAC,KAAK;QACV,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,IAAI,iCAAe,CAAC,gCAAgC,KAAK,EAAE,EAAE;YAC5D,MAAM,IAAI,CAAC,QAAQ,CAAC,gCAAgC,EAAE,CAAC;SACvD;QAED,MAAM,IAAI,CAAC,QAAQ,CAAC,6BAA6B,EAAE,CAAC;QACpD,MAAM,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,iCAAe,CAAC,wBAAwB,CAAC,CAAC;QACrF,MAAM,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,iCAAe,CAAC,wBAAwB,CAAC,CAAC;QACrF,MAAM,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE,CAAC;QACzC,MAAM,IAAI,CAAC,QAAQ,CAAC,0CAA0C,EAAE,CAAC;IAClE,CAAC;CACD,CAAA;AAhBY,gBAAgB;IAD5B,IAAA,sBAAU,GAAE;IAEC,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCAA4B,2BAAY;GADrE,gBAAgB,CAgB5B;AAhBY,4CAAgB"}
|
|
@@ -11,6 +11,7 @@ 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 RedHatLoginPage_1;
|
|
14
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
16
|
exports.RedHatLoginPage = void 0;
|
|
16
17
|
/** *******************************************************************
|
|
@@ -29,48 +30,43 @@ const inversify_types_1 = require("../../../configs/inversify.types");
|
|
|
29
30
|
const DriverHelper_1 = require("../../../utils/DriverHelper");
|
|
30
31
|
const Logger_1 = require("../../../utils/Logger");
|
|
31
32
|
const OAUTH_CONSTANTS_1 = require("../../../constants/OAUTH_CONSTANTS");
|
|
32
|
-
|
|
33
|
+
const TIMEOUT_CONSTANTS_1 = require("../../../constants/TIMEOUT_CONSTANTS");
|
|
34
|
+
let RedHatLoginPage = RedHatLoginPage_1 = class RedHatLoginPage {
|
|
33
35
|
constructor(driverHelper) {
|
|
34
36
|
this.driverHelper = driverHelper;
|
|
35
|
-
this.USERNAME_INPUT_ID = 'username-verification';
|
|
36
|
-
this.PASSWORD_INPUT_ID = 'password';
|
|
37
|
-
this.NEXT_BUTTON_ID = 'login-show-step2';
|
|
38
|
-
this.LOGIN_BUTTON_ID = 'rh-password-verification-submit-button';
|
|
39
37
|
}
|
|
40
38
|
async waitRedHatLoginWelcomePage() {
|
|
41
39
|
Logger_1.Logger.debug();
|
|
42
|
-
await this.driverHelper.waitVisibility(
|
|
40
|
+
await this.driverHelper.waitVisibility(RedHatLoginPage_1.USERNAME_INPUT, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
|
|
43
41
|
}
|
|
44
42
|
async enterPasswordRedHat() {
|
|
45
43
|
Logger_1.Logger.debug();
|
|
46
|
-
|
|
47
|
-
await this.driverHelper.waitVisibility(passwordFieldLocator, 3000);
|
|
48
|
-
await this.driverHelper.enterValue(passwordFieldLocator, OAUTH_CONSTANTS_1.OAUTH_CONSTANTS.TS_SELENIUM_OCP_PASSWORD);
|
|
44
|
+
await this.driverHelper.enterValue(RedHatLoginPage_1.PASSWORD_INPUT, OAUTH_CONSTANTS_1.OAUTH_CONSTANTS.TS_SELENIUM_OCP_PASSWORD);
|
|
49
45
|
}
|
|
50
46
|
async clickOnLoginButton() {
|
|
51
47
|
Logger_1.Logger.debug();
|
|
52
|
-
|
|
53
|
-
await this.driverHelper.waitAndClick(loginButtonLocator);
|
|
48
|
+
await this.driverHelper.waitAndClick(RedHatLoginPage_1.LOGIN_BUTTON);
|
|
54
49
|
}
|
|
55
50
|
async waitDisappearanceRedHatLoginWelcomePage() {
|
|
56
51
|
Logger_1.Logger.debug();
|
|
57
|
-
await this.driverHelper.waitDisappearance(
|
|
52
|
+
await this.driverHelper.waitDisappearance(RedHatLoginPage_1.LOGIN_BUTTON);
|
|
58
53
|
}
|
|
59
54
|
async enterUserNameRedHat() {
|
|
60
55
|
Logger_1.Logger.debug();
|
|
61
|
-
|
|
62
|
-
await this.driverHelper.waitVisibility(usernameFieldLocator, 20000);
|
|
63
|
-
await this.driverHelper.enterValue(usernameFieldLocator, OAUTH_CONSTANTS_1.OAUTH_CONSTANTS.TS_SELENIUM_OCP_USERNAME);
|
|
56
|
+
await this.driverHelper.enterValue(RedHatLoginPage_1.USERNAME_INPUT, OAUTH_CONSTANTS_1.OAUTH_CONSTANTS.TS_SELENIUM_OCP_USERNAME);
|
|
64
57
|
}
|
|
65
58
|
async clickNextButton() {
|
|
66
59
|
Logger_1.Logger.debug();
|
|
67
|
-
|
|
68
|
-
await this.driverHelper.waitAndClick(nextButtonLocator);
|
|
60
|
+
await this.driverHelper.waitAndClick(RedHatLoginPage_1.NEXT_BUTTON);
|
|
69
61
|
}
|
|
70
62
|
};
|
|
71
|
-
RedHatLoginPage =
|
|
72
|
-
|
|
73
|
-
|
|
63
|
+
RedHatLoginPage.USERNAME_INPUT = selenium_webdriver_1.By.id('username-verification');
|
|
64
|
+
RedHatLoginPage.PASSWORD_INPUT = selenium_webdriver_1.By.id('password');
|
|
65
|
+
RedHatLoginPage.NEXT_BUTTON = selenium_webdriver_1.By.id('login-show-step2');
|
|
66
|
+
RedHatLoginPage.LOGIN_BUTTON = selenium_webdriver_1.By.id('rh-password-verification-submit-button');
|
|
67
|
+
RedHatLoginPage = RedHatLoginPage_1 = __decorate([
|
|
68
|
+
(0, inversify_1.injectable)(),
|
|
69
|
+
__param(0, (0, inversify_1.inject)(inversify_types_1.CLASSES.DriverHelper)),
|
|
74
70
|
__metadata("design:paramtypes", [DriverHelper_1.DriverHelper])
|
|
75
71
|
], RedHatLoginPage);
|
|
76
72
|
exports.RedHatLoginPage = RedHatLoginPage;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RedHatLoginPage.js","sourceRoot":"","sources":["../../../../pageobjects/login/openshift/RedHatLoginPage.ts"],"names":[],"mappings":"
|
|
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,wEAAqE;AACrE,4EAAyE;AAGlE,IAAM,eAAe,uBAArB,MAAM,eAAe;IAM3B,YAEkB,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAEJ,KAAK,CAAC,0BAA0B;QAC/B,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,iBAAe,CAAC,cAAc,EAAE,qCAAiB,CAAC,6BAA6B,CAAC,CAAC;IACzH,CAAC;IAED,KAAK,CAAC,mBAAmB;QACxB,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,iBAAe,CAAC,cAAc,EAAE,iCAAe,CAAC,wBAAwB,CAAC,CAAC;IAC9G,CAAC;IAED,KAAK,CAAC,kBAAkB;QACvB,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,iBAAe,CAAC,YAAY,CAAC,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,uCAAuC;QAC5C,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,iBAAe,CAAC,YAAY,CAAC,CAAC;IACzE,CAAC;IAED,KAAK,CAAC,mBAAmB;QACxB,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,iBAAe,CAAC,cAAc,EAAE,iCAAe,CAAC,wBAAwB,CAAC,CAAC;IAC9G,CAAC;IAED,KAAK,CAAC,eAAe;QACpB,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,iBAAe,CAAC,WAAW,CAAC,CAAC;IACnE,CAAC;;AA5CuB,8BAAc,GAAO,uBAAE,CAAC,EAAE,CAAC,uBAAuB,CAAC,CAAC;AACpD,8BAAc,GAAO,uBAAE,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;AACvC,2BAAW,GAAO,uBAAE,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC;AAC5C,4BAAY,GAAO,uBAAE,CAAC,EAAE,CAAC,wCAAwC,CAAC,CAAC;AAJ/E,eAAe;IAD3B,IAAA,sBAAU,GAAE;IAQV,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCACE,2BAAY;GARhC,eAAe,CA8C3B;AA9CY,0CAAe"}
|
|
@@ -11,6 +11,7 @@ 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 RegularUserOcpCheLoginPage_1;
|
|
14
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
16
|
exports.RegularUserOcpCheLoginPage = void 0;
|
|
16
17
|
/** *******************************************************************
|
|
@@ -31,36 +32,36 @@ const TIMEOUT_CONSTANTS_1 = require("../../../constants/TIMEOUT_CONSTANTS");
|
|
|
31
32
|
const selenium_webdriver_1 = require("selenium-webdriver");
|
|
32
33
|
const DriverHelper_1 = require("../../../utils/DriverHelper");
|
|
33
34
|
const OAUTH_CONSTANTS_1 = require("../../../constants/OAUTH_CONSTANTS");
|
|
34
|
-
let RegularUserOcpCheLoginPage = class RegularUserOcpCheLoginPage {
|
|
35
|
+
let RegularUserOcpCheLoginPage = RegularUserOcpCheLoginPage_1 = class RegularUserOcpCheLoginPage {
|
|
35
36
|
constructor(ocpLogin, driverHelper) {
|
|
36
37
|
this.ocpLogin = ocpLogin;
|
|
37
38
|
this.driverHelper = driverHelper;
|
|
38
|
-
this.OPEN_SHIFT_LOGIN_LANDING_PAGE_LOCATOR = '//div[@class="panel-login"]';
|
|
39
|
-
this.OPEN_SHIFT_LOGIN_LANDING_PAGE_BUTTON_LOCATOR = `${this.OPEN_SHIFT_LOGIN_LANDING_PAGE_LOCATOR}/div[contains(@class, 'panel-content')]/form/button`;
|
|
40
39
|
}
|
|
41
|
-
|
|
40
|
+
/**
|
|
41
|
+
* @param userName
|
|
42
|
+
* @param password
|
|
43
|
+
*/
|
|
44
|
+
async login(userName = OAUTH_CONSTANTS_1.OAUTH_CONSTANTS.TS_SELENIUM_OCP_USERNAME, password = OAUTH_CONSTANTS_1.OAUTH_CONSTANTS.TS_SELENIUM_OCP_PASSWORD) {
|
|
42
45
|
Logger_1.Logger.debug();
|
|
43
|
-
|
|
44
|
-
await this.driverHelper.waitPresence(selenium_webdriver_1.By.xpath(this.OPEN_SHIFT_LOGIN_LANDING_PAGE_LOCATOR), TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
|
|
45
|
-
await this.driverHelper.waitAndClick(selenium_webdriver_1.By.xpath(this.OPEN_SHIFT_LOGIN_LANDING_PAGE_BUTTON_LOCATOR));
|
|
46
|
+
await this.driverHelper.waitAndClick(RegularUserOcpCheLoginPage_1.OPENSHIFT_LOGIN_LANDING_PAGE_BUTTON, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
|
|
46
47
|
if (await this.ocpLogin.isIdentityProviderLinkVisible()) {
|
|
47
|
-
await this.ocpLogin.
|
|
48
|
+
await this.ocpLogin.waitAndClickOnLoginProviderTitle();
|
|
48
49
|
}
|
|
49
50
|
await this.ocpLogin.waitOpenShiftLoginWelcomePage();
|
|
50
|
-
await this.ocpLogin.enterUserNameOpenShift(
|
|
51
|
-
await this.ocpLogin.enterPasswordOpenShift(
|
|
51
|
+
await this.ocpLogin.enterUserNameOpenShift(userName);
|
|
52
|
+
await this.ocpLogin.enterPasswordOpenShift(password);
|
|
52
53
|
await this.ocpLogin.clickOnLoginButton();
|
|
53
54
|
await this.ocpLogin.waitDisappearanceOpenShiftLoginWelcomePage();
|
|
54
55
|
if (await this.ocpLogin.isAuthorizeOpenShiftIdentityProviderPageVisible()) {
|
|
55
|
-
await this.ocpLogin.waitAuthorizeOpenShiftIdentityProviderPage();
|
|
56
56
|
await this.ocpLogin.clickOnApproveAuthorizeAccessButton();
|
|
57
57
|
}
|
|
58
58
|
}
|
|
59
59
|
};
|
|
60
|
-
RegularUserOcpCheLoginPage =
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
__param(
|
|
60
|
+
RegularUserOcpCheLoginPage.OPENSHIFT_LOGIN_LANDING_PAGE_BUTTON = selenium_webdriver_1.By.xpath('//div[@class="panel-login"]/div[contains(@class, "panel-content")]/form/button');
|
|
61
|
+
RegularUserOcpCheLoginPage = RegularUserOcpCheLoginPage_1 = __decorate([
|
|
62
|
+
(0, inversify_1.injectable)(),
|
|
63
|
+
__param(0, (0, inversify_1.inject)(inversify_types_1.CLASSES.OcpLoginPage)),
|
|
64
|
+
__param(1, (0, inversify_1.inject)(inversify_types_1.CLASSES.DriverHelper)),
|
|
64
65
|
__metadata("design:paramtypes", [OcpLoginPage_1.OcpLoginPage,
|
|
65
66
|
DriverHelper_1.DriverHelper])
|
|
66
67
|
], RegularUserOcpCheLoginPage);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RegularUserOcpCheLoginPage.js","sourceRoot":"","sources":["../../../../pageobjects/login/openshift/RegularUserOcpCheLoginPage.ts"],"names":[],"mappings":"
|
|
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,4EAAyE;AACzE,2DAAwC;AACxC,8DAA2D;AAC3D,wEAAqE;AAG9D,IAAM,0BAA0B,kCAAhC,MAAM,0BAA0B;IAKtC,YACgD,QAAsB,EAEpD,YAA0B;QAFI,aAAQ,GAAR,QAAQ,CAAc;QAEpD,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAEJ;;;OAGG;IACH,KAAK,CAAC,KAAK,CACV,WAAmB,iCAAe,CAAC,wBAAwB,EAC3D,WAAmB,iCAAe,CAAC,wBAAwB;QAE3D,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CACnC,4BAA0B,CAAC,mCAAmC,EAC9D,qCAAiB,CAAC,6BAA6B,CAC/C,CAAC;QAEF,IAAI,MAAM,IAAI,CAAC,QAAQ,CAAC,6BAA6B,EAAE,EAAE;YACxD,MAAM,IAAI,CAAC,QAAQ,CAAC,gCAAgC,EAAE,CAAC;SACvD;QAED,MAAM,IAAI,CAAC,QAAQ,CAAC,6BAA6B,EAAE,CAAC;QACpD,MAAM,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC;QACrD,MAAM,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC;QACrD,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;YAC1E,MAAM,IAAI,CAAC,QAAQ,CAAC,mCAAmC,EAAE,CAAC;SAC1D;IACF,CAAC;;AAtCuB,8DAAmC,GAAO,uBAAE,CAAC,KAAK,CACzE,gFAAgF,CAChF,CAAC;AAHU,0BAA0B;IADtC,IAAA,sBAAU,GAAE;IAOV,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;IAC5B,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCAD4B,2BAAY;QAEtC,2BAAY;GARhC,0BAA0B,CAwCtC;AAxCY,gEAA0B"}
|
|
@@ -38,21 +38,21 @@ let OcpApplicationPage = OcpApplicationPage_1 = class OcpApplicationPage {
|
|
|
38
38
|
}
|
|
39
39
|
async waitApplicationIcon() {
|
|
40
40
|
Logger_1.Logger.debug();
|
|
41
|
-
await this.driverHelper.waitPresence(OcpApplicationPage_1.
|
|
41
|
+
await this.driverHelper.waitPresence(OcpApplicationPage_1.APPLICATION_ICON, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
|
|
42
42
|
}
|
|
43
43
|
async waitAndOpenEditSourceCodeIcon() {
|
|
44
44
|
Logger_1.Logger.debug();
|
|
45
45
|
const parentGUID = await this.browserTabsUtil.getCurrentWindowHandle();
|
|
46
|
-
await this.driverHelper.waitAndClick(OcpApplicationPage_1.
|
|
46
|
+
await this.driverHelper.waitAndClick(OcpApplicationPage_1.EDIT_SOURCE_CODE_ICON);
|
|
47
47
|
await this.browserTabsUtil.waitAndSwitchToAnotherWindow(parentGUID, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
|
|
48
48
|
}
|
|
49
49
|
};
|
|
50
|
-
OcpApplicationPage.
|
|
51
|
-
OcpApplicationPage.
|
|
50
|
+
OcpApplicationPage.APPLICATION_ICON = selenium_webdriver_1.By.xpath('//*[@data-test-id="base-node-handler"]');
|
|
51
|
+
OcpApplicationPage.EDIT_SOURCE_CODE_ICON = selenium_webdriver_1.By.xpath('//*[@aria-label="Edit source code"]');
|
|
52
52
|
OcpApplicationPage = OcpApplicationPage_1 = __decorate([
|
|
53
|
-
inversify_1.injectable(),
|
|
54
|
-
__param(0, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
|
|
55
|
-
__param(1, inversify_1.inject(inversify_types_1.CLASSES.BrowserTabsUtil)),
|
|
53
|
+
(0, inversify_1.injectable)(),
|
|
54
|
+
__param(0, (0, inversify_1.inject)(inversify_types_1.CLASSES.DriverHelper)),
|
|
55
|
+
__param(1, (0, inversify_1.inject)(inversify_types_1.CLASSES.BrowserTabsUtil)),
|
|
56
56
|
__metadata("design:paramtypes", [DriverHelper_1.DriverHelper,
|
|
57
57
|
BrowserTabsUtil_1.BrowserTabsUtil])
|
|
58
58
|
], OcpApplicationPage);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OcpApplicationPage.js","sourceRoot":"","sources":["../../../pageobjects/openshift/OcpApplicationPage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,4BAA0B;AAC1B,yCAA+C;AAC/C,2DAAwD;AACxD,mEAAwD;AACxD,2DAAwC;AACxC,+CAA4C;AAC5C,yEAAsE;AACtE,iEAA8D;
|
|
1
|
+
{"version":3,"file":"OcpApplicationPage.js","sourceRoot":"","sources":["../../../pageobjects/openshift/OcpApplicationPage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,4BAA0B;AAC1B,yCAA+C;AAC/C,2DAAwD;AACxD,mEAAwD;AACxD,2DAAwC;AACxC,+CAA4C;AAC5C,yEAAsE;AACtE,iEAA8D;AAGvD,IAAM,kBAAkB,0BAAxB,MAAM,kBAAkB;IAI9B,YAEkB,YAA0B,EAE1B,eAAgC;QAFhC,iBAAY,GAAZ,YAAY,CAAc;QAE1B,oBAAe,GAAf,eAAe,CAAiB;IAC/C,CAAC;IAEJ,KAAK,CAAC,mBAAmB;QACxB,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,oBAAkB,CAAC,gBAAgB,EAAE,qCAAiB,CAAC,6BAA6B,CAAC,CAAC;IAC5H,CAAC;IAED,KAAK,CAAC,6BAA6B;QAClC,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,UAAU,GAAW,MAAM,IAAI,CAAC,eAAe,CAAC,sBAAsB,EAAE,CAAC;QAC/E,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,oBAAkB,CAAC,qBAAqB,CAAC,CAAC;QAC/E,MAAM,IAAI,CAAC,eAAe,CAAC,4BAA4B,CAAC,UAAU,EAAE,qCAAiB,CAAC,6BAA6B,CAAC,CAAC;IACtH,CAAC;;AAtBuB,mCAAgB,GAAO,uBAAE,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;AAC1E,wCAAqB,GAAO,uBAAE,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;AAFxF,kBAAkB;IAD9B,IAAA,sBAAU,GAAE;IAMV,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;IAE5B,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,eAAe,CAAC,CAAA;qCADD,2BAAY;QAET,iCAAe;GARtC,kBAAkB,CAwB9B;AAxBY,gDAAkB"}
|
|
@@ -36,31 +36,31 @@ let OcpImportFromGitPage = OcpImportFromGitPage_1 = class OcpImportFromGitPage {
|
|
|
36
36
|
}
|
|
37
37
|
async enterGitRepoUrl(gitRepoUrl) {
|
|
38
38
|
Logger_1.Logger.debug();
|
|
39
|
-
await this.driverHelper.enterValue(OcpImportFromGitPage_1.
|
|
39
|
+
await this.driverHelper.enterValue(OcpImportFromGitPage_1.GIT_URL_INPUT, gitRepoUrl);
|
|
40
40
|
}
|
|
41
41
|
async clickOnAdvancedOptionsButton() {
|
|
42
42
|
Logger_1.Logger.debug();
|
|
43
|
-
if (!(await this.driverHelper.isVisible(OcpImportFromGitPage_1.
|
|
44
|
-
await this.driverHelper.waitAndClick(OcpImportFromGitPage_1.
|
|
43
|
+
if (!(await this.driverHelper.isVisible(OcpImportFromGitPage_1.HIDE_ADVANCED_GIT_OPTIONS))) {
|
|
44
|
+
await this.driverHelper.waitAndClick(OcpImportFromGitPage_1.SHOW_ADVANCED_GIT_OPTIONS_LINK);
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
47
|
async enterGitReference(gitReference) {
|
|
48
48
|
Logger_1.Logger.debug(`"${gitReference}"`);
|
|
49
|
-
await this.driverHelper.enterValue(OcpImportFromGitPage_1.
|
|
49
|
+
await this.driverHelper.enterValue(OcpImportFromGitPage_1.GIT_REFERENCE_INPUT, gitReference);
|
|
50
50
|
}
|
|
51
51
|
async selectBuilderImageImportStrategy() {
|
|
52
52
|
Logger_1.Logger.debug();
|
|
53
|
-
await this.driverHelper.scrollToAndClick(OcpImportFromGitPage_1.
|
|
54
|
-
await this.driverHelper.scrollToAndClick(OcpImportFromGitPage_1.
|
|
53
|
+
await this.driverHelper.scrollToAndClick(OcpImportFromGitPage_1.EDIT_IMPORT_STRATEGY_LINK);
|
|
54
|
+
await this.driverHelper.scrollToAndClick(OcpImportFromGitPage_1.BUILDER_IMAGE_STRATEGY_ITEM);
|
|
55
55
|
}
|
|
56
56
|
async addLabel(label) {
|
|
57
57
|
Logger_1.Logger.debug(`"${label}"`);
|
|
58
|
-
await this.driverHelper.scrollToAndClick(OcpImportFromGitPage_1.
|
|
59
|
-
await this.driverHelper.scrollToAndEnterValue(OcpImportFromGitPage_1.
|
|
58
|
+
await this.driverHelper.scrollToAndClick(OcpImportFromGitPage_1.ADD_LABEL_LINK);
|
|
59
|
+
await this.driverHelper.scrollToAndEnterValue(OcpImportFromGitPage_1.ADD_LABEL_INPUT, label);
|
|
60
60
|
}
|
|
61
61
|
async submitConfiguration() {
|
|
62
62
|
Logger_1.Logger.debug();
|
|
63
|
-
await this.driverHelper.waitAndClick(OcpImportFromGitPage_1.
|
|
63
|
+
await this.driverHelper.waitAndClick(OcpImportFromGitPage_1.SUBMIT_BUTTON);
|
|
64
64
|
return inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.OcpApplicationPage);
|
|
65
65
|
}
|
|
66
66
|
async fitAndSubmitConfiguration(gitRepoUrl, gitReference, label) {
|
|
@@ -73,18 +73,18 @@ let OcpImportFromGitPage = OcpImportFromGitPage_1 = class OcpImportFromGitPage {
|
|
|
73
73
|
return await this.submitConfiguration();
|
|
74
74
|
}
|
|
75
75
|
};
|
|
76
|
-
OcpImportFromGitPage.
|
|
77
|
-
OcpImportFromGitPage.
|
|
78
|
-
OcpImportFromGitPage.
|
|
79
|
-
OcpImportFromGitPage.
|
|
80
|
-
OcpImportFromGitPage.
|
|
81
|
-
OcpImportFromGitPage.
|
|
82
|
-
OcpImportFromGitPage.
|
|
83
|
-
OcpImportFromGitPage.
|
|
84
|
-
OcpImportFromGitPage.
|
|
76
|
+
OcpImportFromGitPage.GIT_URL_INPUT = selenium_webdriver_1.By.id('form-input-git-url-field');
|
|
77
|
+
OcpImportFromGitPage.SHOW_ADVANCED_GIT_OPTIONS_LINK = selenium_webdriver_1.By.xpath('//*[text()="Show advanced Git options"]//ancestor::button');
|
|
78
|
+
OcpImportFromGitPage.HIDE_ADVANCED_GIT_OPTIONS = selenium_webdriver_1.By.xpath('//*[text()="Hide advanced Git options"]');
|
|
79
|
+
OcpImportFromGitPage.GIT_REFERENCE_INPUT = selenium_webdriver_1.By.id('form-input-git-ref-field');
|
|
80
|
+
OcpImportFromGitPage.EDIT_IMPORT_STRATEGY_LINK = selenium_webdriver_1.By.xpath('//*[text()="Edit Import Strategy"]//ancestor::button');
|
|
81
|
+
OcpImportFromGitPage.BUILDER_IMAGE_STRATEGY_ITEM = selenium_webdriver_1.By.xpath('//*[text()="Builder Image"]//parent::div//parent::div');
|
|
82
|
+
OcpImportFromGitPage.ADD_LABEL_LINK = selenium_webdriver_1.By.xpath('//button[text()="Labels"]');
|
|
83
|
+
OcpImportFromGitPage.ADD_LABEL_INPUT = selenium_webdriver_1.By.id('form-selector-labels-field');
|
|
84
|
+
OcpImportFromGitPage.SUBMIT_BUTTON = selenium_webdriver_1.By.xpath('//*[@data-test-id="submit-button"]');
|
|
85
85
|
OcpImportFromGitPage = OcpImportFromGitPage_1 = __decorate([
|
|
86
|
-
inversify_1.injectable(),
|
|
87
|
-
__param(0, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
|
|
86
|
+
(0, inversify_1.injectable)(),
|
|
87
|
+
__param(0, (0, inversify_1.inject)(inversify_types_1.CLASSES.DriverHelper)),
|
|
88
88
|
__metadata("design:paramtypes", [DriverHelper_1.DriverHelper])
|
|
89
89
|
], OcpImportFromGitPage);
|
|
90
90
|
exports.OcpImportFromGitPage = OcpImportFromGitPage;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OcpImportFromGitPage.js","sourceRoot":"","sources":["../../../pageobjects/openshift/OcpImportFromGitPage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,4BAA0B;AAC1B,yCAA+C;AAC/C,2DAAwD;AACxD,mEAAwD;AACxD,2DAAwC;AACxC,+CAA4C;AAE5C,qEAA8D;
|
|
1
|
+
{"version":3,"file":"OcpImportFromGitPage.js","sourceRoot":"","sources":["../../../pageobjects/openshift/OcpImportFromGitPage.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,23 +35,17 @@ let OcpMainPage = OcpMainPage_1 = class OcpMainPage {
|
|
|
35
35
|
constructor(driverHelper) {
|
|
36
36
|
this.driverHelper = driverHelper;
|
|
37
37
|
}
|
|
38
|
-
static getRoleLocator(role) {
|
|
39
|
-
return selenium_webdriver_1.By.xpath(`//a//*[text()="${role}"]`);
|
|
40
|
-
}
|
|
41
|
-
static getProjectDropdownItemLocator(projectName) {
|
|
42
|
-
return selenium_webdriver_1.By.xpath(`//button//*[text()="${projectName}"]`);
|
|
43
|
-
}
|
|
44
38
|
async waitOpenMainPage() {
|
|
45
39
|
Logger_1.Logger.debug();
|
|
46
|
-
await this.driverHelper.waitVisibility(OcpMainPage_1.
|
|
40
|
+
await this.driverHelper.waitVisibility(OcpMainPage_1.MAIN_PAGE_HEADER, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
|
|
47
41
|
}
|
|
48
42
|
async clickOnSelectRoleButton() {
|
|
49
43
|
Logger_1.Logger.debug();
|
|
50
|
-
await this.driverHelper.waitAndClick(OcpMainPage_1.
|
|
44
|
+
await this.driverHelper.waitAndClick(OcpMainPage_1.SELECT_ROLE_BUTTON);
|
|
51
45
|
}
|
|
52
46
|
async clickAddToProjectButton() {
|
|
53
47
|
Logger_1.Logger.debug();
|
|
54
|
-
await this.driverHelper.waitAndClick(OcpMainPage_1.
|
|
48
|
+
await this.driverHelper.waitAndClick(OcpMainPage_1.ADD_BUTTON);
|
|
55
49
|
}
|
|
56
50
|
async selectDeveloperRole() {
|
|
57
51
|
Logger_1.Logger.debug();
|
|
@@ -63,7 +57,7 @@ let OcpMainPage = OcpMainPage_1 = class OcpMainPage {
|
|
|
63
57
|
}
|
|
64
58
|
async selectImportFromGitMethod() {
|
|
65
59
|
Logger_1.Logger.debug();
|
|
66
|
-
await this.driverHelper.waitAndClick(OcpMainPage_1.
|
|
60
|
+
await this.driverHelper.waitAndClick(OcpMainPage_1.IMPORT_FROM_GIT_ITEM);
|
|
67
61
|
return inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.OcpImportFromGitPage);
|
|
68
62
|
}
|
|
69
63
|
async openImportFromGitPage() {
|
|
@@ -73,18 +67,24 @@ let OcpMainPage = OcpMainPage_1 = class OcpMainPage {
|
|
|
73
67
|
}
|
|
74
68
|
async selectProject(projectName) {
|
|
75
69
|
Logger_1.Logger.debug();
|
|
76
|
-
await this.driverHelper.waitAndClick(OcpMainPage_1.
|
|
77
|
-
await this.driverHelper.enterValue(OcpMainPage_1.
|
|
78
|
-
await this.driverHelper.waitAndClick(
|
|
70
|
+
await this.driverHelper.waitAndClick(OcpMainPage_1.SELECT_PROJECT_DROPDOWN);
|
|
71
|
+
await this.driverHelper.enterValue(OcpMainPage_1.PROJECT_FILTER_INPUT, projectName);
|
|
72
|
+
await this.driverHelper.waitAndClick(this.getProjectDropdownItemLocator(projectName));
|
|
73
|
+
}
|
|
74
|
+
getRoleLocator(role) {
|
|
75
|
+
return selenium_webdriver_1.By.xpath(`//a//*[text()="${role}"]`);
|
|
76
|
+
}
|
|
77
|
+
getProjectDropdownItemLocator(projectName) {
|
|
78
|
+
return selenium_webdriver_1.By.xpath(`//button//*[text()="${projectName}"]`);
|
|
79
79
|
}
|
|
80
80
|
async selectRole(role) {
|
|
81
81
|
Logger_1.Logger.debug(`selecting role ${role}`);
|
|
82
|
-
await this.driverHelper.waitAndClick(
|
|
82
|
+
await this.driverHelper.waitAndClick(this.getRoleLocator(role));
|
|
83
83
|
}
|
|
84
84
|
async tryToSkipWebTour() {
|
|
85
85
|
Logger_1.Logger.debug();
|
|
86
|
-
if (await this.driverHelper.isVisible(OcpMainPage_1.
|
|
87
|
-
await this.driverHelper.waitAndClick(OcpMainPage_1.
|
|
86
|
+
if (await this.driverHelper.isVisible(OcpMainPage_1.SKIP_TOUR_BUTTON)) {
|
|
87
|
+
await this.driverHelper.waitAndClick(OcpMainPage_1.SKIP_TOUR_BUTTON);
|
|
88
88
|
Logger_1.Logger.debug('welcome tour modal dialog was located and skipped');
|
|
89
89
|
}
|
|
90
90
|
else {
|
|
@@ -92,16 +92,16 @@ let OcpMainPage = OcpMainPage_1 = class OcpMainPage {
|
|
|
92
92
|
}
|
|
93
93
|
}
|
|
94
94
|
};
|
|
95
|
-
OcpMainPage.
|
|
96
|
-
OcpMainPage.
|
|
97
|
-
OcpMainPage.
|
|
98
|
-
OcpMainPage.
|
|
99
|
-
OcpMainPage.
|
|
100
|
-
OcpMainPage.
|
|
101
|
-
OcpMainPage.
|
|
95
|
+
OcpMainPage.MAIN_PAGE_HEADER = selenium_webdriver_1.By.id('page-main-header');
|
|
96
|
+
OcpMainPage.SELECT_ROLE_BUTTON = selenium_webdriver_1.By.xpath('//*[@data-test-id="perspective-switcher-toggle"]');
|
|
97
|
+
OcpMainPage.ADD_BUTTON = selenium_webdriver_1.By.xpath('//*[@data-test-id="+Add-header"]');
|
|
98
|
+
OcpMainPage.IMPORT_FROM_GIT_ITEM = selenium_webdriver_1.By.xpath('//*[@data-test="item import-from-git"]');
|
|
99
|
+
OcpMainPage.SELECT_PROJECT_DROPDOWN = selenium_webdriver_1.By.xpath('//div[@class="co-namespace-dropdown"]//button');
|
|
100
|
+
OcpMainPage.PROJECT_FILTER_INPUT = selenium_webdriver_1.By.xpath('//*[@data-test="dropdown-text-filter"]');
|
|
101
|
+
OcpMainPage.SKIP_TOUR_BUTTON = selenium_webdriver_1.By.xpath('//*[text()="Skip tour"]');
|
|
102
102
|
OcpMainPage = OcpMainPage_1 = __decorate([
|
|
103
|
-
inversify_1.injectable(),
|
|
104
|
-
__param(0, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
|
|
103
|
+
(0, inversify_1.injectable)(),
|
|
104
|
+
__param(0, (0, inversify_1.inject)(inversify_types_1.CLASSES.DriverHelper)),
|
|
105
105
|
__metadata("design:paramtypes", [DriverHelper_1.DriverHelper])
|
|
106
106
|
], OcpMainPage);
|
|
107
107
|
exports.OcpMainPage = OcpMainPage;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OcpMainPage.js","sourceRoot":"","sources":["../../../pageobjects/openshift/OcpMainPage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,4BAA0B;AAC1B,yCAA+C;AAC/C,2DAAwD;AACxD,mEAAwD;AACxD,2DAAwC;AACxC,+CAA4C;AAC5C,yEAAsE;AAEtE,qEAA8D;
|
|
1
|
+
{"version":3,"file":"OcpMainPage.js","sourceRoot":"","sources":["../../../pageobjects/openshift/OcpMainPage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,4BAA0B;AAC1B,yCAA+C;AAC/C,2DAAwD;AACxD,mEAAwD;AACxD,2DAAwC;AACxC,+CAA4C;AAC5C,yEAAsE;AAEtE,qEAA8D;AAGvD,IAAM,WAAW,mBAAjB,MAAM,WAAW;IASvB,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,aAAW,CAAC,gBAAgB,EAAE,qCAAiB,CAAC,6BAA6B,CAAC,CAAC;IACvH,CAAC;IAED,KAAK,CAAC,uBAAuB;QAC5B,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,aAAW,CAAC,kBAAkB,CAAC,CAAC;IACtE,CAAC;IAED,KAAK,CAAC,uBAAuB;QAC5B,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,aAAW,CAAC,UAAU,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,mBAAmB;QACxB,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC9B,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC9B,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACrC,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QACnC,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,yBAAyB;QAC9B,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,aAAW,CAAC,oBAAoB,CAAC,CAAC;QACvE,OAAO,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,oBAAoB,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,qBAAqB;QAC1B,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACrC,OAAO,MAAM,IAAI,CAAC,yBAAyB,EAAE,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,WAAmB;QACtC,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,aAAW,CAAC,uBAAuB,CAAC,CAAC;QAC1E,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,aAAW,CAAC,oBAAoB,EAAE,WAAW,CAAC,CAAC;QAClF,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,6BAA6B,CAAC,WAAW,CAAC,CAAC,CAAC;IACvF,CAAC;IACO,cAAc,CAAC,IAAY;QAClC,OAAO,uBAAE,CAAC,KAAK,CAAC,kBAAkB,IAAI,IAAI,CAAC,CAAC;IAC7C,CAAC;IAEO,6BAA6B,CAAC,WAAmB;QACxD,OAAO,uBAAE,CAAC,KAAK,CAAC,uBAAuB,WAAW,IAAI,CAAC,CAAC;IACzD,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,IAAY;QACpC,eAAM,CAAC,KAAK,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAC;QAEvC,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;IACjE,CAAC;IAEO,KAAK,CAAC,gBAAgB;QAC7B,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,IAAI,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,aAAW,CAAC,gBAAgB,CAAC,EAAE;YACpE,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,aAAW,CAAC,gBAAgB,CAAC,CAAC;YAEnE,eAAM,CAAC,KAAK,CAAC,mDAAmD,CAAC,CAAC;SAClE;aAAM;YACN,eAAM,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;SAC1D;IACF,CAAC;;AAtFuB,4BAAgB,GAAO,uBAAE,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC;AACjD,8BAAkB,GAAO,uBAAE,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAC;AACtF,sBAAU,GAAO,uBAAE,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;AAC9D,gCAAoB,GAAO,uBAAE,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;AAC9E,mCAAuB,GAAO,uBAAE,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAC;AACxF,gCAAoB,GAAO,uBAAE,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;AAC9E,4BAAgB,GAAO,uBAAE,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;AAPvE,WAAW;IADvB,IAAA,sBAAU,GAAE;IAWV,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCACE,2BAAY;GAXhC,WAAW,CAwFvB;AAxFY,kCAAW"}
|
package/dist/specs/MochaHooks.js
CHANGED
|
@@ -10,7 +10,11 @@
|
|
|
10
10
|
**********************************************************************/
|
|
11
11
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
12
12
|
if (k2 === undefined) k2 = k;
|
|
13
|
-
Object.
|
|
13
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
14
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
15
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
16
|
+
}
|
|
17
|
+
Object.defineProperty(o, k2, desc);
|
|
14
18
|
}) : (function(o, m, k, k2) {
|
|
15
19
|
if (k2 === undefined) k2 = k;
|
|
16
20
|
o[k2] = m[k];
|
|
@@ -23,7 +27,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
23
27
|
var __importStar = (this && this.__importStar) || function (mod) {
|
|
24
28
|
if (mod && mod.__esModule) return mod;
|
|
25
29
|
var result = {};
|
|
26
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
30
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
27
31
|
__setModuleDefault(result, mod);
|
|
28
32
|
return result;
|
|
29
33
|
};
|
|
@@ -41,7 +45,6 @@ const BASE_TEST_CONSTANTS_1 = require("../constants/BASE_TEST_CONSTANTS");
|
|
|
41
45
|
const CHROME_DRIVER_CONSTANTS_1 = require("../constants/CHROME_DRIVER_CONSTANTS");
|
|
42
46
|
const MONACO_CONSTANTS_1 = require("../constants/MONACO_CONSTANTS");
|
|
43
47
|
const driverHelper = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.DriverHelper);
|
|
44
|
-
const testWorkspaceUtil = inversify_config_1.e2eContainer.get(inversify_types_1.TYPES.WorkspaceUtil);
|
|
45
48
|
let latestWorkspace = '';
|
|
46
49
|
function registerRunningWorkspace(workspaceName) {
|
|
47
50
|
Logger_1.Logger.debug(`with workspaceName:${workspaceName}`);
|
|
@@ -60,8 +63,8 @@ exports.mochaHooks = {
|
|
|
60
63
|
CheApiRequestHandler_1.CheApiRequestHandler.enableResponseInterceptor();
|
|
61
64
|
}
|
|
62
65
|
},
|
|
66
|
+
// init vscode-extension-tester monaco-page-objects
|
|
63
67
|
function initMonacoPageObjects() {
|
|
64
|
-
// init vscode-extension-tester monaco-page-objects
|
|
65
68
|
monacoPageObjects.initPageObjects(MONACO_CONSTANTS_1.MONACO_CONSTANTS.TS_SELENIUM_MONACO_PAGE_OBJECTS_USE_VERSION, MONACO_CONSTANTS_1.MONACO_CONSTANTS.TS_SELENIUM_MONACO_PAGE_OBJECTS_BASE_VERSION, vscodeExtensionTesterLocators.getLocatorsPath(), driverHelper.getDriver(), 'google-chrome');
|
|
66
69
|
},
|
|
67
70
|
function prolongTimeoutConstantsInDebugMode() {
|
|
@@ -76,12 +79,12 @@ exports.mochaHooks = {
|
|
|
76
79
|
],
|
|
77
80
|
afterEach: [
|
|
78
81
|
// stop and remove running workspace
|
|
79
|
-
function () {
|
|
82
|
+
function deleteWorkspaceOnFailedTest() {
|
|
80
83
|
var _a;
|
|
81
84
|
if (((_a = this.currentTest) === null || _a === void 0 ? void 0 : _a.state) === 'failed') {
|
|
82
85
|
if (BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.DELETE_WORKSPACE_ON_FAILED_TEST) {
|
|
83
86
|
Logger_1.Logger.info('Property DELETE_WORKSPACE_ON_FAILED_TEST is true - trying to stop and delete running workspace with API.');
|
|
84
|
-
|
|
87
|
+
const testWorkspaceUtil = inversify_config_1.e2eContainer.get(inversify_types_1.TYPES.WorkspaceUtil);
|
|
85
88
|
testWorkspaceUtil.stopAndDeleteWorkspaceByName(latestWorkspace);
|
|
86
89
|
}
|
|
87
90
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MochaHooks.js","sourceRoot":"","sources":["../../specs/MochaHooks.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE
|
|
1
|
+
{"version":3,"file":"MochaHooks.js","sourceRoot":"","sources":["../../specs/MochaHooks.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;;;;;;;;;;;;AAExE,4BAA0B;AAC1B,gEAA4D;AAC5D,yFAAsF;AACtF,sEAAmE;AACnE,uEAAyD;AACzD,gGAAkF;AAClF,kEAA2D;AAG3D,4CAAyC;AACzC,0EAAuE;AACvE,kFAA+E;AAC/E,oEAAiE;AAEjE,MAAM,YAAY,GAAiB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,YAAY,CAAC,CAAC;AAC1E,IAAI,eAAe,GAAW,EAAE,CAAC;AAEjC,SAAgB,wBAAwB,CAAC,aAAqB;IAC7D,eAAM,CAAC,KAAK,CAAC,sBAAsB,aAAa,EAAE,CAAC,CAAC;IACpD,eAAe,GAAG,aAAa,CAAC;AACjC,CAAC;AAHD,4DAGC;AAED,OAAO,CAAC,UAAU,GAAG;IACpB,SAAS,EAAE;QACV,SAAS,wBAAwB;YAChC,IAAI,yCAAmB,CAAC,+BAA+B,EAAE;gBACxD,2CAAoB,CAAC,wBAAwB,EAAE,CAAC;aAChD;QACF,CAAC;QACD,SAAS,yBAAyB;YACjC,IAAI,yCAAmB,CAAC,gCAAgC,EAAE;gBACzD,2CAAoB,CAAC,yBAAyB,EAAE,CAAC;aACjD;QACF,CAAC;QACD,mDAAmD;QACnD,SAAS,qBAAqB;YAC7B,iBAAiB,CAAC,eAAe,CAChC,mCAAgB,CAAC,2CAA2C,EAC5D,mCAAgB,CAAC,4CAA4C,EAC7D,6BAA6B,CAAC,eAAe,EAAE,EAC/C,YAAY,CAAC,SAAS,EAAE,EACxB,eAAe,CACf,CAAC;QACH,CAAC;QACD,SAAS,kCAAkC;YAC1C,IAAI,yCAAmB,CAAC,aAAa,EAAE;gBACtC,KAAK,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,qCAAiB,CAAC,EAAE;oBACnE,MAAM,CAAC,cAAc,CAAC,qCAAiB,EAAE,OAAO,EAAE;wBACjD,KAAK,EAAE,OAAO,GAAG,GAAG;qBACpB,CAAC,CAAC;iBACH;aACD;QACF,CAAC;KACD;IACD,SAAS,EAAE;QACV,oCAAoC;QACpC,SAAS,2BAA2B;;YACnC,IAAI,CAAA,MAAA,IAAI,CAAC,WAAW,0CAAE,KAAK,MAAK,QAAQ,EAAE;gBACzC,IAAI,yCAAmB,CAAC,+BAA+B,EAAE;oBACxD,eAAM,CAAC,IAAI,CAAC,0GAA0G,CAAC,CAAC;oBACxH,MAAM,iBAAiB,GAAuB,+BAAY,CAAC,GAAG,CAAC,uBAAK,CAAC,aAAa,CAAC,CAAC;oBACpF,iBAAiB,CAAC,4BAA4B,CAAC,eAAe,CAAC,CAAC;iBAChE;aACD;QACF,CAAC;KACD;IACD,QAAQ,EAAE;QACT,KAAK,UAAU,aAAa;YAC3B,IAAI,CAAC,yCAAmB,CAAC,aAAa,IAAI,iDAAuB,CAAC,0BAA0B,EAAE;gBAC7F,MAAM,YAAY,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,CAAC;gBACtC,eAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;aAC9C;QACF,CAAC;KACD;CACD,CAAC"}
|