@eclipse-che/che-e2e 7.101.0-next-662d3a4 → 7.101.0-next-052af3b
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.
|
@@ -15,7 +15,7 @@ var OcpMainPage_1;
|
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
16
|
exports.OcpMainPage = void 0;
|
|
17
17
|
/** *******************************************************************
|
|
18
|
-
* copyright (c) 2019-
|
|
18
|
+
* copyright (c) 2019-2025 Red Hat, Inc.
|
|
19
19
|
*
|
|
20
20
|
* This program and the accompanying materials are made
|
|
21
21
|
* available under the terms of the Eclipse Public License 2.0
|
|
@@ -32,6 +32,8 @@ const Logger_1 = require("../../utils/Logger");
|
|
|
32
32
|
const TIMEOUT_CONSTANTS_1 = require("../../constants/TIMEOUT_CONSTANTS");
|
|
33
33
|
const inversify_config_1 = require("../../configs/inversify.config");
|
|
34
34
|
const BrowserTabsUtil_1 = require("../../utils/BrowserTabsUtil");
|
|
35
|
+
const BASE_TEST_CONSTANTS_1 = require("../../constants/BASE_TEST_CONSTANTS");
|
|
36
|
+
const compare_versions_1 = require("compare-versions");
|
|
35
37
|
let OcpMainPage = OcpMainPage_1 = class OcpMainPage {
|
|
36
38
|
constructor(driverHelper, browserTabsUtil) {
|
|
37
39
|
this.driverHelper = driverHelper;
|
|
@@ -76,11 +78,14 @@ let OcpMainPage = OcpMainPage_1 = class OcpMainPage {
|
|
|
76
78
|
async clickOnAppLauncherAndDevSpaceItem() {
|
|
77
79
|
Logger_1.Logger.debug('click on app launcher menu');
|
|
78
80
|
const parentGUID = await this.browserTabsUtil.getCurrentWindowHandle();
|
|
79
|
-
await this.driverHelper.waitAndClick(
|
|
80
|
-
await this.driverHelper.waitAndClick(
|
|
81
|
+
await this.driverHelper.waitAndClick(OcpMainPage_1.APP_LAUNCHER_BUTTON);
|
|
82
|
+
await this.driverHelper.waitAndClick(OcpMainPage_1.DEVSPACES_MENU_ITEM);
|
|
81
83
|
await this.browserTabsUtil.waitAndSwitchToAnotherWindow(parentGUID, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
|
|
82
84
|
}
|
|
83
85
|
getRoleLocator(role) {
|
|
86
|
+
if (BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.OCP_VERSION && (0, compare_versions_1.satisfies)(BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.OCP_VERSION, '>=4.18')) {
|
|
87
|
+
return selenium_webdriver_1.By.xpath(`//button[@role='option'][.//h2[@data-test-id='perspective-switcher-menu-option' and contains(text(), '${role}')]]`);
|
|
88
|
+
}
|
|
84
89
|
return selenium_webdriver_1.By.xpath(`//a//*[text()="${role}"]`);
|
|
85
90
|
}
|
|
86
91
|
getProjectDropdownItemLocator(projectName) {
|
|
@@ -108,6 +113,8 @@ OcpMainPage.IMPORT_FROM_GIT_ITEM = selenium_webdriver_1.By.xpath('//*[@data-test
|
|
|
108
113
|
OcpMainPage.SELECT_PROJECT_DROPDOWN = selenium_webdriver_1.By.xpath('//div[@class="co-namespace-dropdown"]//button');
|
|
109
114
|
OcpMainPage.PROJECT_FILTER_INPUT = selenium_webdriver_1.By.xpath('//*[@data-test="dropdown-text-filter"]');
|
|
110
115
|
OcpMainPage.SKIP_TOUR_BUTTON = selenium_webdriver_1.By.xpath('//*[text()="Skip tour"]');
|
|
116
|
+
OcpMainPage.APP_LAUNCHER_BUTTON = selenium_webdriver_1.By.css('nav[data-test-id="application-launcher"], button[data-test-id="application-launcher"], button[aria-label="Application launcher"]');
|
|
117
|
+
OcpMainPage.DEVSPACES_MENU_ITEM = selenium_webdriver_1.By.xpath('//span[contains(.,"Red Hat OpenShift Dev Spaces")]');
|
|
111
118
|
OcpMainPage = OcpMainPage_1 = __decorate([
|
|
112
119
|
(0, inversify_1.injectable)(),
|
|
113
120
|
__param(0, (0, inversify_1.inject)(inversify_types_1.CLASSES.DriverHelper)),
|
|
@@ -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;AAC9D,iEAA8D;
|
|
1
|
+
{"version":3,"file":"OcpMainPage.js","sourceRoot":"","sources":["../../../pageobjects/openshift/OcpMainPage.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/** *******************************************************************
|
|
2
|
-
* copyright (c) 2019-
|
|
2
|
+
* copyright (c) 2019-2025 Red Hat, Inc.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made
|
|
5
5
|
* available under the terms of the Eclipse Public License 2.0
|
|
@@ -17,6 +17,8 @@ import { TIMEOUT_CONSTANTS } from '../../constants/TIMEOUT_CONSTANTS';
|
|
|
17
17
|
import { OcpImportFromGitPage } from './OcpImportFromGitPage';
|
|
18
18
|
import { e2eContainer } from '../../configs/inversify.config';
|
|
19
19
|
import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
|
|
20
|
+
import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
|
|
21
|
+
import { satisfies } from 'compare-versions';
|
|
20
22
|
|
|
21
23
|
@injectable()
|
|
22
24
|
export class OcpMainPage {
|
|
@@ -27,6 +29,10 @@ export class OcpMainPage {
|
|
|
27
29
|
private static readonly SELECT_PROJECT_DROPDOWN: By = By.xpath('//div[@class="co-namespace-dropdown"]//button');
|
|
28
30
|
private static readonly PROJECT_FILTER_INPUT: By = By.xpath('//*[@data-test="dropdown-text-filter"]');
|
|
29
31
|
private static readonly SKIP_TOUR_BUTTON: By = By.xpath('//*[text()="Skip tour"]');
|
|
32
|
+
private static readonly APP_LAUNCHER_BUTTON: By = By.css(
|
|
33
|
+
'nav[data-test-id="application-launcher"], button[data-test-id="application-launcher"], button[aria-label="Application launcher"]'
|
|
34
|
+
);
|
|
35
|
+
private static readonly DEVSPACES_MENU_ITEM: By = By.xpath('//span[contains(.,"Red Hat OpenShift Dev Spaces")]');
|
|
30
36
|
|
|
31
37
|
constructor(
|
|
32
38
|
@inject(CLASSES.DriverHelper)
|
|
@@ -88,12 +94,17 @@ export class OcpMainPage {
|
|
|
88
94
|
async clickOnAppLauncherAndDevSpaceItem(): Promise<void> {
|
|
89
95
|
Logger.debug('click on app launcher menu');
|
|
90
96
|
const parentGUID: string = await this.browserTabsUtil.getCurrentWindowHandle();
|
|
91
|
-
await this.driverHelper.waitAndClick(
|
|
92
|
-
await this.driverHelper.waitAndClick(
|
|
97
|
+
await this.driverHelper.waitAndClick(OcpMainPage.APP_LAUNCHER_BUTTON);
|
|
98
|
+
await this.driverHelper.waitAndClick(OcpMainPage.DEVSPACES_MENU_ITEM);
|
|
93
99
|
await this.browserTabsUtil.waitAndSwitchToAnotherWindow(parentGUID, TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
|
|
94
100
|
}
|
|
95
101
|
|
|
96
102
|
private getRoleLocator(role: string): By {
|
|
103
|
+
if (BASE_TEST_CONSTANTS.OCP_VERSION && satisfies(BASE_TEST_CONSTANTS.OCP_VERSION, '>=4.18')) {
|
|
104
|
+
return By.xpath(
|
|
105
|
+
`//button[@role='option'][.//h2[@data-test-id='perspective-switcher-menu-option' and contains(text(), '${role}')]]`
|
|
106
|
+
);
|
|
107
|
+
}
|
|
97
108
|
return By.xpath(`//a//*[text()="${role}"]`);
|
|
98
109
|
}
|
|
99
110
|
|