@eclipse-che/che-e2e 7.48.0-dev-8e6670a → 7.48.0-dev-9209044
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/dist/testsLibrary/CodeExecutionTests.js +2 -10
- package/dist/testsLibrary/CodeExecutionTests.js.map +1 -1
- package/package.json +2 -2
- package/pageobjects/login/RegularUserOcpCheLoginPage.ts +12 -1
- package/tests/login/Login.spec.ts +5 -1
- package/testsLibrary/CodeExecutionTests.ts +1 -5
|
@@ -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"}
|
|
@@ -38,18 +38,14 @@ const DialogWindow_1 = require("../pageobjects/ide/DialogWindow");
|
|
|
38
38
|
const DriverHelper_1 = require("../utils/DriverHelper");
|
|
39
39
|
const Logger_1 = require("../utils/Logger");
|
|
40
40
|
const QuickOpenContainer_1 = require("../pageobjects/ide/QuickOpenContainer");
|
|
41
|
-
const BrowserTabsUtil_1 = require("../utils/BrowserTabsUtil");
|
|
42
|
-
const WorkspaceHandlingTests_1 = require("./WorkspaceHandlingTests");
|
|
43
41
|
let CodeExecutionTests = CodeExecutionTests_1 = class CodeExecutionTests {
|
|
44
|
-
constructor(terminal, topMenu, ide, dialogWindow, driverHelper, quickOpenContainer
|
|
42
|
+
constructor(terminal, topMenu, ide, dialogWindow, driverHelper, quickOpenContainer) {
|
|
45
43
|
this.terminal = terminal;
|
|
46
44
|
this.topMenu = topMenu;
|
|
47
45
|
this.ide = ide;
|
|
48
46
|
this.dialogWindow = dialogWindow;
|
|
49
47
|
this.driverHelper = driverHelper;
|
|
50
48
|
this.quickOpenContainer = quickOpenContainer;
|
|
51
|
-
this.browserTabsUtil = browserTabsUtil;
|
|
52
|
-
this.workspaceHandlingTests = workspaceHandlingTests;
|
|
53
49
|
}
|
|
54
50
|
runTask(taskName, timeout) {
|
|
55
51
|
test(`Run command '${taskName}'`, async () => {
|
|
@@ -225,16 +221,12 @@ CodeExecutionTests = CodeExecutionTests_1 = __decorate([
|
|
|
225
221
|
__param(3, inversify_1.inject(inversify_types_1.CLASSES.DialogWindow)),
|
|
226
222
|
__param(4, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
|
|
227
223
|
__param(5, inversify_1.inject(inversify_types_1.CLASSES.QuickOpenContainer)),
|
|
228
|
-
__param(6, inversify_1.inject(inversify_types_1.CLASSES.BrowserTabsUtil)),
|
|
229
|
-
__param(7, inversify_1.inject(inversify_types_1.CLASSES.WorkspaceHandlingTests)),
|
|
230
224
|
__metadata("design:paramtypes", [Terminal_1.Terminal,
|
|
231
225
|
TopMenu_1.TopMenu,
|
|
232
226
|
Ide_1.Ide,
|
|
233
227
|
DialogWindow_1.DialogWindow,
|
|
234
228
|
DriverHelper_1.DriverHelper,
|
|
235
|
-
QuickOpenContainer_1.QuickOpenContainer
|
|
236
|
-
BrowserTabsUtil_1.BrowserTabsUtil,
|
|
237
|
-
WorkspaceHandlingTests_1.WorkspaceHandlingTests])
|
|
229
|
+
QuickOpenContainer_1.QuickOpenContainer])
|
|
238
230
|
], CodeExecutionTests);
|
|
239
231
|
exports.CodeExecutionTests = CodeExecutionTests;
|
|
240
232
|
//# sourceMappingURL=CodeExecutionTests.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CodeExecutionTests.js","sourceRoot":"","sources":["../../testsLibrary/CodeExecutionTests.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;;;;;AAExE,4BAA0B;AAC1B,kDAA0B;AAC1B,wDAA6C;AAC7C,yCAA+C;AAC/C,2DAAoD;AACpD,gDAA6C;AAC7C,0DAAuD;AACvD,wDAAqD;AACrD,kEAA+D;AAC/D,wDAAqD;AACrD,4CAAyC;AACzC,8EAA2E;
|
|
1
|
+
{"version":3,"file":"CodeExecutionTests.js","sourceRoot":"","sources":["../../testsLibrary/CodeExecutionTests.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eclipse-che/che-e2e",
|
|
3
|
-
"version": "7.48.0-dev-
|
|
3
|
+
"version": "7.48.0-dev-9209044",
|
|
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.`);
|
|
@@ -20,8 +20,6 @@ import { DialogWindow } from '../pageobjects/ide/DialogWindow';
|
|
|
20
20
|
import { DriverHelper } from '../utils/DriverHelper';
|
|
21
21
|
import { Logger } from '../utils/Logger';
|
|
22
22
|
import { QuickOpenContainer } from '../pageobjects/ide/QuickOpenContainer';
|
|
23
|
-
import { BrowserTabsUtil } from '../utils/BrowserTabsUtil';
|
|
24
|
-
import { WorkspaceHandlingTests } from './WorkspaceHandlingTests';
|
|
25
23
|
|
|
26
24
|
@injectable()
|
|
27
25
|
export class CodeExecutionTests {
|
|
@@ -34,9 +32,7 @@ export class CodeExecutionTests {
|
|
|
34
32
|
@inject(CLASSES.Ide) private readonly ide: Ide,
|
|
35
33
|
@inject(CLASSES.DialogWindow) private readonly dialogWindow: DialogWindow,
|
|
36
34
|
@inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper,
|
|
37
|
-
@inject(CLASSES.QuickOpenContainer) private readonly quickOpenContainer: QuickOpenContainer
|
|
38
|
-
@inject(CLASSES.BrowserTabsUtil) private readonly browserTabsUtil: BrowserTabsUtil,
|
|
39
|
-
@inject(CLASSES.WorkspaceHandlingTests) private readonly workspaceHandlingTests: WorkspaceHandlingTests) {}
|
|
35
|
+
@inject(CLASSES.QuickOpenContainer) private readonly quickOpenContainer: QuickOpenContainer) {}
|
|
40
36
|
|
|
41
37
|
public runTask(taskName: string, timeout: number) {
|
|
42
38
|
test(`Run command '${taskName}'`, async () => {
|