@eclipse-che/che-e2e 7.101.0 → 7.102.0-next-d171d8d

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.
Files changed (9) hide show
  1. package/CODE_STYLE.md +2 -2
  2. package/README.md +37 -37
  3. package/dist/pageobjects/ide/ViewsMoreActionsButton.js +4 -4
  4. package/dist/pageobjects/ide/ViewsMoreActionsButton.js.map +1 -1
  5. package/dist/pageobjects/openshift/OcpMainPage.js +10 -3
  6. package/dist/pageobjects/openshift/OcpMainPage.js.map +1 -1
  7. package/package.json +2 -3
  8. package/pageobjects/ide/ViewsMoreActionsButton.ts +4 -4
  9. package/pageobjects/openshift/OcpMainPage.ts +14 -3
package/CODE_STYLE.md CHANGED
@@ -33,8 +33,8 @@ Automated lint checking and code format performs with ESLint and Prettier tools
33
33
  pre-commit hook.
34
34
  Full set of rules can be found:
35
35
 
36
- - [.eslintrc](.eslintrc.js)
37
- - [.prettierrc](.prettierrc.json)
36
+ - [.eslintrc](.eslintrc.js)
37
+ - [.prettierrc](.prettierrc.json)
38
38
 
39
39
  ### Preferable code style
40
40
 
package/README.md CHANGED
@@ -2,33 +2,33 @@
2
2
 
3
3
  ## Requirements
4
4
 
5
- - node 16.x
6
- - "Chrome" browser 114.x or later
7
- - deployed Che 7 with accessible URL
5
+ - node 16.x
6
+ - "Chrome" browser 114.x or later
7
+ - deployed Che 7 with accessible URL
8
8
 
9
9
  ## Before launch
10
10
 
11
11
  **Perform commands:**
12
12
 
13
- - `export TS_SELENIUM_BASE_URL=<Che7 URL>`
14
- - `npm ci`
13
+ - `export TS_SELENIUM_BASE_URL=<Che7 URL>`
14
+ - `npm ci`
15
15
 
16
16
  Note: If there is any modifications in package.json, manually execute the `npm install` to update the package-lock.json. So that errors can be avoided while executing npm ci
17
17
 
18
18
  ## Default launch
19
19
 
20
- - Provide connection credentials:
21
- - `export TS_SELENIUM_OCP_USERNAME=<username>`
22
- - `export TS_SELENIUM_OCP_PASSWORD=<password>`
23
- - `npm run test`
20
+ - Provide connection credentials:
21
+ - `export TS_SELENIUM_OCP_USERNAME=<username>`
22
+ - `export TS_SELENIUM_OCP_PASSWORD=<password>`
23
+ - `npm run test`
24
24
 
25
25
  ## Custom launch
26
26
 
27
- - Use environment variables which described in the "constants" folder
28
- - Use environment variables for setting timeouts if needed. You can see the list in **`'TimeoutConstants.ts'`**. You can see the list of those variables and their value if you set the `'TS_SELENIUM_PRINT_TIMEOUT_VARIABLES = true'`
29
- - To test one specification export file name as `export USERSTORY=<spec-file-name-without-extension> && npm run test` (example: `-e USERSTORY=Quarkus`)
30
- - To run test without Selenium WebDriver (API tests etc.) use `export USERSTORY=<spec-file-name-without-extension> && npm run driver-less-test` (example: `-e USERSTORY=CloneGitRepoAPI`)
31
- - This project support application testing deployed on Kubernetes or Openshift platform. Openshift is default value. To switch into Kubernetes, please, use `TS_PLATFORM=kubernetes` environmental variable and `TS_SELENIUM_K8S_PASSWORD`, `TS_SELENIUM_K8S_USERNAME` to provide credentials. The sample of test command in this case:
27
+ - Use environment variables which described in the "constants" folder
28
+ - Use environment variables for setting timeouts if needed. You can see the list in **`'TimeoutConstants.ts'`**. You can see the list of those variables and their value if you set the `'TS_SELENIUM_PRINT_TIMEOUT_VARIABLES = true'`
29
+ - To test one specification export file name as `export USERSTORY=<spec-file-name-without-extension> && npm run test` (example: `-e USERSTORY=Quarkus`)
30
+ - To run test without Selenium WebDriver (API tests etc.) use `export USERSTORY=<spec-file-name-without-extension> && npm run driver-less-test` (example: `-e USERSTORY=CloneGitRepoAPI`)
31
+ - This project support application testing deployed on Kubernetes or Openshift platform. Openshift is default value. To switch into Kubernetes, please, use `TS_PLATFORM=kubernetes` environmental variable and `TS_SELENIUM_K8S_PASSWORD`, `TS_SELENIUM_K8S_USERNAME` to provide credentials. The sample of test command in this case:
32
32
  ```
33
33
  export TS_PLATFORM=kubernetes && \
34
34
  export TS_SELENIUM_K8S_USERNAME=<username> && \
@@ -37,21 +37,21 @@ Note: If there is any modifications in package.json, manually execute the `npm i
37
37
  npm run test
38
38
  ```
39
39
  Also, environmental variables can be set in files in "constants" folder.
40
- - Local test results can be represented with Allure reporter `npm run open-allure-dasboard`
40
+ - Local test results can be represented with Allure reporter `npm run open-allure-dasboard`
41
41
 
42
42
  ## Docker launch
43
43
 
44
- - open terminal and go to the "e2e" directory
45
- - export the `"TS_SELENIUM_BASE_URL"` variable with "Che" url
46
- - run command `"npm run test-docker"`
44
+ - open terminal and go to the "e2e" directory
45
+ - export the `"TS_SELENIUM_BASE_URL"` variable with "Che" url
46
+ - run command `"npm run test-docker"`
47
47
 
48
48
  ## Docker launch with changed tests
49
49
 
50
50
  **For launching tests with local changes perform next steps:**
51
51
 
52
- - open terminal and go to the "e2e" directory
53
- - export the `"TS_SELENIUM_BASE_URL"` variable with "Che" url
54
- - run command `"npm run test-docker-mount-e2e"`
52
+ - open terminal and go to the "e2e" directory
53
+ - export the `"TS_SELENIUM_BASE_URL"` variable with "Che" url
54
+ - run command `"npm run test-docker-mount-e2e"`
55
55
 
56
56
  ## Debug docker launch
57
57
 
@@ -62,27 +62,27 @@ The `'eclipse/che-e2e'` docker image has VNC server installed inside. For connec
62
62
  **The easiest way to do that is to perform steps which are described in the "Docker launch" paragraph.
63
63
  For running tests without docker, please perform next steps:**
64
64
 
65
- - Deploy Che on Kubernetes infrastructure by using 'Minikube' and 'Chectl' <https://github.com/eclipse-che/che-server/blob/HEAD/deploy/kubernetes/README.md>
66
- - Create workspace by using 'Chectl' and devfile
67
- - link to 'Chectl' manual <https://github.com/che-incubator/chectl#chectl-workspacestart>
68
- - link to devfile ( **`For successfull test passing, exactly provided devfile should be used`** )
69
- <https://gist.githubusercontent.com/Ohrimenko1988/93f5426f4ebc1705c55feb8ff0396a49/raw/cbea89ad145ba33ed34a151a12c50f045f9f3b78/yaml-ls-bug.yaml>
70
- - Provide the **`'TS_SELENIUM_BASE_URL'`** environment variable as described above
71
- - export TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME=EmptyWorkspace (default value, see BASE_TEST_CONSTANTS.ts)
72
- - perform command **`export USERSTORY=$TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME && npm run test-all-devfiles`**
65
+ - Deploy Che on Kubernetes infrastructure by using 'Minikube' and 'Chectl' <https://github.com/eclipse-che/che-server/blob/HEAD/deploy/kubernetes/README.md>
66
+ - Create workspace by using 'Chectl' and devfile
67
+ - link to 'Chectl' manual <https://github.com/che-incubator/chectl#chectl-workspacestart>
68
+ - link to devfile ( **`For successfull test passing, exactly provided devfile should be used`** )
69
+ <https://gist.githubusercontent.com/Ohrimenko1988/93f5426f4ebc1705c55feb8ff0396a49/raw/cbea89ad145ba33ed34a151a12c50f045f9f3b78/yaml-ls-bug.yaml>
70
+ - Provide the **`'TS_SELENIUM_BASE_URL'`** environment variable as described above
71
+ - export TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME=EmptyWorkspace (default value, see BASE_TEST_CONSTANTS.ts)
72
+ - perform command **`export USERSTORY=$TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME && npm run test-all-devfiles`**
73
73
 
74
74
  ## Launching the DevWorkspaceHappyPath spec file using Che with oauth authentication
75
75
 
76
76
  **Setup next environment variables:**
77
77
 
78
- - export TS_SELENIUM_BASE_URL=\<Che-URL\>
79
- - export TS_SELENIUM_OCP_USERNAME=\<cluster-username\>
80
- - export TS_SELENIUM_OCP_PASSWORD=\<cluster-password\>
81
- - export TS_SELENIUM_VALUE_OPENSHIFT_OAUTH="true"
82
- - export TS_OCP_LOGIN_PAGE_PROVIDER_TITLE=\<login-provide-title\>
83
- - export TS_SELENIUM_DEVWORKSPACE_URL=\<devworkspace-url\>
84
- - export TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME=EmptyWorkspace (default value, see BASE_TEST_CONSTANTS.ts)
78
+ - export TS_SELENIUM_BASE_URL=\<Che-URL\>
79
+ - export TS_SELENIUM_OCP_USERNAME=\<cluster-username\>
80
+ - export TS_SELENIUM_OCP_PASSWORD=\<cluster-password\>
81
+ - export TS_SELENIUM_VALUE_OPENSHIFT_OAUTH="true"
82
+ - export TS_OCP_LOGIN_PAGE_PROVIDER_TITLE=\<login-provide-title\>
83
+ - export TS_SELENIUM_DEVWORKSPACE_URL=\<devworkspace-url\>
84
+ - export TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME=EmptyWorkspace (default value, see BASE_TEST_CONSTANTS.ts)
85
85
 
86
86
  **Execute the npm command:**
87
87
 
88
- - perform command `export USERSTORY=$TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME && npm run test-all-devfiles`
88
+ - perform command `export USERSTORY=$TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME && npm run test-all-devfiles`
package/dist/pageobjects/ide/ViewsMoreActionsButton.js CHANGED
@@ -15,7 +15,7 @@ var ViewsMoreActionsButton_1;
15
15
  Object.defineProperty(exports, "__esModule", { value: true });
16
16
  exports.ViewsMoreActionsButton = void 0;
17
17
  /** *******************************************************************
18
- * copyright (c) 2024 Red Hat, Inc.
18
+ * copyright (c) 2024-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
@@ -45,8 +45,8 @@ let ViewsMoreActionsButton = ViewsMoreActionsButton_1 = class ViewsMoreActionsBu
45
45
  Logger_1.Logger.debug('scmProvider.openMoreActions');
46
46
  const scmContextMenu = await scmProvider.openMoreActions();
47
47
  await this.driverHelper.waitVisibility(webCheCodeLocators.ContextMenu.contextView);
48
- Logger_1.Logger.debug('scmContextMenu.select: "Source Control Graph"');
49
- await scmContextMenu.select('Source Control Graph');
48
+ Logger_1.Logger.debug('scmContextMenu.select: "Graph"');
49
+ await scmContextMenu.select('Graph');
50
50
  }
51
51
  async viewsAndMoreActionsButtonIsVisible(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM) {
52
52
  Logger_1.Logger.debug();
@@ -54,7 +54,7 @@ let ViewsMoreActionsButton = ViewsMoreActionsButton_1 = class ViewsMoreActionsBu
54
54
  return viewsActionsButton;
55
55
  }
56
56
  };
57
- ViewsMoreActionsButton.VIEWS_AND_MORE_ACTIONS_BUTTON = selenium_webdriver_1.By.xpath('//a[@role="button" and @aria-label="Views and More Actions..."]');
57
+ ViewsMoreActionsButton.VIEWS_AND_MORE_ACTIONS_BUTTON = selenium_webdriver_1.By.xpath('//a[@aria-label="Views and More Actions..."]');
58
58
  ViewsMoreActionsButton = ViewsMoreActionsButton_1 = __decorate([
59
59
  (0, inversify_1.injectable)(),
60
60
  __param(0, (0, inversify_1.inject)(inversify_types_1.CLASSES.DriverHelper)),
package/dist/pageobjects/ide/ViewsMoreActionsButton.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ViewsMoreActionsButton.js","sourceRoot":"","sources":["../../../pageobjects/ide/ViewsMoreActionsButton.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,yCAA+C;AAC/C,4BAA0B;AAC1B,qEAA8D;AAC9D,mEAAwD;AACxD,2DAAwC;AACxC,2DAAwD;AACxD,+CAA4C;AAC5C,yEAAsE;AAEtE,6DAA2F;AAGpF,IAAM,sBAAsB,8BAA5B,MAAM,sBAAsB;IAGlC,YAEU,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IACjC,CAAC;IAEJ,KAAK,CAAC,uBAAuB;QAC5B,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,oBAAoB,GAAyB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,oBAAoB,CAAC,CAAC;QAClG,MAAM,kBAAkB,GAAa,oBAAoB,CAAC,kBAAkB,CAAC;QAE7E,MAAM,OAAO,GAAe,IAAI,gCAAU,EAAE,CAAC;QAC7C,MAAM,CAAC,WAAW,CAAC,GAAwB,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC;QAExE,eAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;QAC5C,MAAM,cAAc,GAAgB,MAAM,WAAW,CAAC,eAAe,EAAE,CAAC;QACxE,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,kBAAkB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QACnF,eAAM,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAC;QAC9D,MAAM,cAAc,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,kCAAkC,CAAC,UAAkB,qCAAiB,CAAC,iCAAiC;QAC7G,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,kBAAkB,GAAY,MAAM,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAChF,wBAAsB,CAAC,6BAA6B,EACpD,OAAO,CACP,CAAC;QAEF,OAAO,kBAAkB,CAAC;IAC3B,CAAC;;AAhCuB,oDAA6B,GAAO,uBAAE,CAAC,KAAK,CAAC,iEAAiE,CAAC,CAAC;AAD5H,sBAAsB;IADlC,IAAA,sBAAU,GAAE;IAKV,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCACN,2BAAY;GALxB,sBAAsB,CAkClC;AAlCY,wDAAsB"}
1
+ {"version":3,"file":"ViewsMoreActionsButton.js","sourceRoot":"","sources":["../../../pageobjects/ide/ViewsMoreActionsButton.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,yCAA+C;AAC/C,4BAA0B;AAC1B,qEAA8D;AAC9D,mEAAwD;AACxD,2DAAwC;AACxC,2DAAwD;AACxD,+CAA4C;AAC5C,yEAAsE;AAEtE,6DAA2F;AAGpF,IAAM,sBAAsB,8BAA5B,MAAM,sBAAsB;IAGlC,YAEU,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IACjC,CAAC;IAEJ,KAAK,CAAC,uBAAuB;QAC5B,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,oBAAoB,GAAyB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,oBAAoB,CAAC,CAAC;QAClG,MAAM,kBAAkB,GAAa,oBAAoB,CAAC,kBAAkB,CAAC;QAE7E,MAAM,OAAO,GAAe,IAAI,gCAAU,EAAE,CAAC;QAC7C,MAAM,CAAC,WAAW,CAAC,GAAwB,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC;QAExE,eAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;QAC5C,MAAM,cAAc,GAAgB,MAAM,WAAW,CAAC,eAAe,EAAE,CAAC;QACxE,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,kBAAkB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QACnF,eAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;QAC/C,MAAM,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,kCAAkC,CAAC,UAAkB,qCAAiB,CAAC,iCAAiC;QAC7G,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,kBAAkB,GAAY,MAAM,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAChF,wBAAsB,CAAC,6BAA6B,EACpD,OAAO,CACP,CAAC;QAEF,OAAO,kBAAkB,CAAC;IAC3B,CAAC;;AAhCuB,oDAA6B,GAAO,uBAAE,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAC;AADzG,sBAAsB;IADlC,IAAA,sBAAU,GAAE;IAKV,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCACN,2BAAY;GALxB,sBAAsB,CAkClC;AAlCY,wDAAsB"}
package/dist/pageobjects/openshift/OcpMainPage.js CHANGED
@@ -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-2023 Red Hat, Inc.
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(selenium_webdriver_1.By.css('nav[data-test-id="application-launcher"]'));
80
- await this.driverHelper.waitAndClick(selenium_webdriver_1.By.xpath('//span[contains(.,"Red Hat OpenShift Dev Spaces")]'));
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)),
package/dist/pageobjects/openshift/OcpMainPage.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"OcpMainPage.js","sourceRoot":"","sources":["../../../pageobjects/openshift/OcpMainPage.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"OcpMainPage.js","sourceRoot":"","sources":["../../../pageobjects/openshift/OcpMainPage.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.101.0",
3
+ "version": "7.102.0-next-d171d8d",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {
@@ -66,8 +66,7 @@
66
66
  "dependencies": {
67
67
  "@eclipse-che/api": "latest",
68
68
  "inversify": "6.0.1",
69
- "reflect-metadata": "0.1.13",
70
- "@eclipse-che/che-devworkspace-generator": "7.101.0"
69
+ "reflect-metadata": "0.1.13"
71
70
  },
72
71
  "resolutions": {
73
72
  "minimist": "^1.2.5"
package/pageobjects/ide/ViewsMoreActionsButton.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  /** *******************************************************************
2
- * copyright (c) 2024 Red Hat, Inc.
2
+ * copyright (c) 2024-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
@@ -20,7 +20,7 @@ import { ContextMenu, NewScmView, SingleScmProvider, Locators } from 'monaco-pag
20
20
 
21
21
  @injectable()
22
22
  export class ViewsMoreActionsButton {
23
- private static readonly VIEWS_AND_MORE_ACTIONS_BUTTON: By = By.xpath('//a[@role="button" and @aria-label="Views and More Actions..."]');
23
+ private static readonly VIEWS_AND_MORE_ACTIONS_BUTTON: By = By.xpath('//a[@aria-label="Views and More Actions..."]');
24
24
 
25
25
  constructor(
26
26
  @inject(CLASSES.DriverHelper)
@@ -39,8 +39,8 @@ export class ViewsMoreActionsButton {
39
39
  Logger.debug('scmProvider.openMoreActions');
40
40
  const scmContextMenu: ContextMenu = await scmProvider.openMoreActions();
41
41
  await this.driverHelper.waitVisibility(webCheCodeLocators.ContextMenu.contextView);
42
- Logger.debug('scmContextMenu.select: "Source Control Graph"');
43
- await scmContextMenu.select('Source Control Graph');
42
+ Logger.debug('scmContextMenu.select: "Graph"');
43
+ await scmContextMenu.select('Graph');
44
44
  }
45
45
 
46
46
  async viewsAndMoreActionsButtonIsVisible(timeout: number = TIMEOUT_CONSTANTS.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM): Promise<boolean> {
package/pageobjects/openshift/OcpMainPage.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  /** *******************************************************************
2
- * copyright (c) 2019-2023 Red Hat, Inc.
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(By.css('nav[data-test-id="application-launcher"]'));
92
- await this.driverHelper.waitAndClick(By.xpath('//span[contains(.,"Red Hat OpenShift Dev Spaces")]'));
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