@eclipse-che/che-e2e 7.46.1-dev-957e450 → 7.46.1-dev-a471b4b
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/dist/pageobjects/login/RegularUserOcpCheLoginPage.js +13 -2
- package/dist/pageobjects/login/RegularUserOcpCheLoginPage.js.map +1 -1
- package/dist/tests/login/Login.spec.js +8 -6
- package/dist/tests/login/Login.spec.js.map +1 -1
- package/package.json +2 -2
- package/pageobjects/login/RegularUserOcpCheLoginPage.ts +12 -1
- package/tests/login/Login.spec.ts +5 -1
|
@@ -29,13 +29,22 @@ const inversify_1 = require("inversify");
|
|
|
29
29
|
const inversify_types_1 = require("../../inversify.types");
|
|
30
30
|
const TestConstants_1 = require("../../TestConstants");
|
|
31
31
|
const Logger_1 = require("../../utils/Logger");
|
|
32
|
+
const TimeoutConstants_1 = require("../../TimeoutConstants");
|
|
33
|
+
const selenium_webdriver_1 = require("selenium-webdriver");
|
|
34
|
+
const DriverHelper_1 = require("../../utils/DriverHelper");
|
|
32
35
|
let RegularUserOcpCheLoginPage = class RegularUserOcpCheLoginPage {
|
|
33
|
-
constructor(ocpLogin, cheLogin) {
|
|
36
|
+
constructor(ocpLogin, cheLogin, driverHelper) {
|
|
34
37
|
this.ocpLogin = ocpLogin;
|
|
35
38
|
this.cheLogin = cheLogin;
|
|
39
|
+
this.driverHelper = driverHelper;
|
|
40
|
+
this.OPEN_SHIFT_LOGIN_LANDING_PAGE_LOCATOR = `//div[@class='panel-login']`;
|
|
41
|
+
this.OPEN_SHIFT_LOGIN_LANDING_PAGE_BUTTON_LOCATOR = `${this.OPEN_SHIFT_LOGIN_LANDING_PAGE_LOCATOR}/div[contains(@class, 'panel-content')]/form/button`;
|
|
36
42
|
}
|
|
37
43
|
async login() {
|
|
38
44
|
Logger_1.Logger.debug('RegularUserOcpCheLoginPage.login');
|
|
45
|
+
Logger_1.Logger.debug('OcpRedHatLoginPage.login wait for LogInWithOpenShift page and click button');
|
|
46
|
+
await this.driverHelper.waitPresence(selenium_webdriver_1.By.xpath(this.OPEN_SHIFT_LOGIN_LANDING_PAGE_LOCATOR), TimeoutConstants_1.TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
|
|
47
|
+
await this.driverHelper.waitAndClick(selenium_webdriver_1.By.xpath(this.OPEN_SHIFT_LOGIN_LANDING_PAGE_BUTTON_LOCATOR));
|
|
39
48
|
if (await this.ocpLogin.isIdentityProviderLinkVisible()) {
|
|
40
49
|
await this.ocpLogin.clickOnLoginProviderTitle();
|
|
41
50
|
}
|
|
@@ -68,8 +77,10 @@ RegularUserOcpCheLoginPage = __decorate([
|
|
|
68
77
|
inversify_1.injectable(),
|
|
69
78
|
__param(0, inversify_1.inject(inversify_types_1.CLASSES.OcpLoginPage)),
|
|
70
79
|
__param(1, inversify_1.inject(inversify_types_1.CLASSES.CheLoginPage)),
|
|
80
|
+
__param(2, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
|
|
71
81
|
__metadata("design:paramtypes", [OcpLoginPage_1.OcpLoginPage,
|
|
72
|
-
CheLoginPage_1.CheLoginPage
|
|
82
|
+
CheLoginPage_1.CheLoginPage,
|
|
83
|
+
DriverHelper_1.DriverHelper])
|
|
73
84
|
], RegularUserOcpCheLoginPage);
|
|
74
85
|
exports.RegularUserOcpCheLoginPage = RegularUserOcpCheLoginPage;
|
|
75
86
|
//# sourceMappingURL=RegularUserOcpCheLoginPage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RegularUserOcpCheLoginPage.js","sourceRoot":"","sources":["../../../pageobjects/login/RegularUserOcpCheLoginPage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,4BAA0B;AAE1B,4DAAyD;AACzD,4DAAyD;AACzD,yCAA+C;AAC/C,2DAAgD;AAChD,uDAAoD;AACpD,+CAA4C;
|
|
1
|
+
{"version":3,"file":"RegularUserOcpCheLoginPage.js","sourceRoot":"","sources":["../../../pageobjects/login/RegularUserOcpCheLoginPage.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,16 +9,18 @@
|
|
|
9
9
|
* SPDX-License-Identifier: EPL-2.0
|
|
10
10
|
**********************************************************************/
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
const __1 = require("../..");
|
|
13
12
|
const inversify_config_1 = require("../../inversify.config");
|
|
14
|
-
const
|
|
15
|
-
const
|
|
13
|
+
const inversify_types_1 = require("../../inversify.types");
|
|
14
|
+
const TestConstants_1 = require("../../TestConstants");
|
|
15
|
+
const Logger_1 = require("../../utils/Logger");
|
|
16
|
+
const browserTabsUtil = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.BrowserTabsUtil);
|
|
17
|
+
const loginPage = inversify_config_1.e2eContainer.get(inversify_types_1.TYPES.CheLogin);
|
|
16
18
|
suite('Login test', async () => {
|
|
17
19
|
test('Login', async () => {
|
|
18
|
-
await browserTabsUtil.navigateTo(
|
|
20
|
+
await browserTabsUtil.navigateTo(TestConstants_1.TestConstants.TS_SELENIUM_BASE_URL);
|
|
19
21
|
await loginPage.login();
|
|
20
|
-
if (
|
|
21
|
-
|
|
22
|
+
if (TestConstants_1.TestConstants.TS_SELENIUM_LAUNCH_FULLSCREEN) {
|
|
23
|
+
Logger_1.Logger.debug(`TS_SELENIUM_LAUNCH_FULLSCREEN is set to true, maximizing window.`);
|
|
22
24
|
await browserTabsUtil.maximize();
|
|
23
25
|
}
|
|
24
26
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Login.spec.js","sourceRoot":"","sources":["../../../tests/login/Login.spec.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;AAExE,
|
|
1
|
+
{"version":3,"file":"Login.spec.js","sourceRoot":"","sources":["../../../tests/login/Login.spec.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;AAExE,6DAAsD;AACtD,2DAAuD;AAEvD,uDAAoD;AAEpD,+CAA4C;AAE5C,MAAM,eAAe,GAAoB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,eAAe,CAAC,CAAC;AACnF,MAAM,SAAS,GAAkB,+BAAY,CAAC,GAAG,CAAgB,uBAAK,CAAC,QAAQ,CAAC,CAAC;AAEjF,KAAK,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;IAC3B,IAAI,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE;QACrB,MAAM,eAAe,CAAC,UAAU,CAAC,6BAAa,CAAC,oBAAoB,CAAC,CAAC;QAErE,MAAM,SAAS,CAAC,KAAK,EAAE,CAAC;QACxB,IAAI,6BAAa,CAAC,6BAA6B,EAAE;YAC7C,eAAM,CAAC,KAAK,CAAC,kEAAkE,CAAC,CAAC;YACjF,MAAM,eAAe,CAAC,QAAQ,EAAE,CAAC;SACpC;IACL,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eclipse-che/che-e2e",
|
|
3
|
-
"version": "7.46.1-dev-
|
|
3
|
+
"version": "7.46.1-dev-a471b4b",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
"@types/selenium-webdriver": "3.0.16",
|
|
40
40
|
"axios": "^0.25.0",
|
|
41
41
|
"chai": "4.2.0",
|
|
42
|
-
"chromedriver": "^
|
|
42
|
+
"chromedriver": "^101.0.0",
|
|
43
43
|
"mocha": "^9.1.3",
|
|
44
44
|
"rimraf": "2.6.2",
|
|
45
45
|
"selenium-webdriver": "3.6.0",
|
|
@@ -15,17 +15,28 @@ import { injectable, inject } from 'inversify';
|
|
|
15
15
|
import { CLASSES } from '../../inversify.types';
|
|
16
16
|
import { TestConstants } from '../../TestConstants';
|
|
17
17
|
import { Logger } from '../../utils/Logger';
|
|
18
|
+
import { TimeoutConstants } from '../../TimeoutConstants';
|
|
19
|
+
import { By } from 'selenium-webdriver';
|
|
20
|
+
import { DriverHelper } from '../../utils/DriverHelper';
|
|
18
21
|
|
|
19
22
|
@injectable()
|
|
20
23
|
export class RegularUserOcpCheLoginPage implements ICheLoginPage {
|
|
21
24
|
|
|
25
|
+
private readonly OPEN_SHIFT_LOGIN_LANDING_PAGE_LOCATOR: string = `//div[@class='panel-login']`;
|
|
26
|
+
private readonly OPEN_SHIFT_LOGIN_LANDING_PAGE_BUTTON_LOCATOR: string = `${this.OPEN_SHIFT_LOGIN_LANDING_PAGE_LOCATOR}/div[contains(@class, 'panel-content')]/form/button`;
|
|
27
|
+
|
|
22
28
|
constructor(
|
|
23
29
|
@inject(CLASSES.OcpLoginPage) private readonly ocpLogin: OcpLoginPage,
|
|
24
|
-
@inject(CLASSES.CheLoginPage) private readonly cheLogin: CheLoginPage
|
|
30
|
+
@inject(CLASSES.CheLoginPage) private readonly cheLogin: CheLoginPage,
|
|
31
|
+
@inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) { }
|
|
25
32
|
|
|
26
33
|
async login() {
|
|
27
34
|
Logger.debug('RegularUserOcpCheLoginPage.login');
|
|
28
35
|
|
|
36
|
+
Logger.debug('OcpRedHatLoginPage.login wait for LogInWithOpenShift page and click button');
|
|
37
|
+
await this.driverHelper.waitPresence(By.xpath(this.OPEN_SHIFT_LOGIN_LANDING_PAGE_LOCATOR), TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
|
|
38
|
+
await this.driverHelper.waitAndClick(By.xpath(this.OPEN_SHIFT_LOGIN_LANDING_PAGE_BUTTON_LOCATOR));
|
|
39
|
+
|
|
29
40
|
if (await this.ocpLogin.isIdentityProviderLinkVisible()) {
|
|
30
41
|
await this.ocpLogin.clickOnLoginProviderTitle();
|
|
31
42
|
}
|
|
@@ -8,9 +8,12 @@
|
|
|
8
8
|
* SPDX-License-Identifier: EPL-2.0
|
|
9
9
|
**********************************************************************/
|
|
10
10
|
|
|
11
|
-
import { TestConstants, CLASSES, ICheLoginPage, TYPES, Logger } from '../..';
|
|
12
11
|
import { e2eContainer } from '../../inversify.config';
|
|
12
|
+
import { CLASSES, TYPES } from '../../inversify.types';
|
|
13
|
+
import { ICheLoginPage } from '../../pageobjects/login/ICheLoginPage';
|
|
14
|
+
import { TestConstants } from '../../TestConstants';
|
|
13
15
|
import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
|
|
16
|
+
import { Logger } from '../../utils/Logger';
|
|
14
17
|
|
|
15
18
|
const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
|
|
16
19
|
const loginPage: ICheLoginPage = e2eContainer.get<ICheLoginPage>(TYPES.CheLogin);
|
|
@@ -18,6 +21,7 @@ const loginPage: ICheLoginPage = e2eContainer.get<ICheLoginPage>(TYPES.CheLogin)
|
|
|
18
21
|
suite('Login test', async () => {
|
|
19
22
|
test('Login', async () => {
|
|
20
23
|
await browserTabsUtil.navigateTo(TestConstants.TS_SELENIUM_BASE_URL);
|
|
24
|
+
|
|
21
25
|
await loginPage.login();
|
|
22
26
|
if (TestConstants.TS_SELENIUM_LAUNCH_FULLSCREEN) {
|
|
23
27
|
Logger.debug(`TS_SELENIUM_LAUNCH_FULLSCREEN is set to true, maximizing window.`);
|