feat: Add support for VS Code 1.98

test: fix get workbench title

test: fix scm view changes locator

fix: allow to get auto hidden view action buttons

Author: djelinek

.github/workflows/main.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [min, 1.96.4, max]
+        version: [min, 1.97.2, max]
     uses: ./.github/workflows/template-main.yaml
     with:
       version: ${{ matrix.version }}

README.md

@@ -40,7 +40,7 @@
 
 | NodeJS                                                                                                                                                                                    | Visual Studio Code                                                                                                                            | Operating System                                                                                                                                                                                                  |
 | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| <table style="text-align:center;"> <tr><th>20.x.x</th><th>LTS</th><th>Latest</th></tr><tr><td>✅</td><td>✅❓</td><td>✅❓</td></tr><tr><td colspan="3">❓ Best-effort</td></tr> </table> | <table style="text-align:center;"> <tr><th>min</th><th>-</th><th>max</th></tr><tr><td>1.95.x</td><td>1.96.x</td><td>1.97.x</td></tr> </table> | <table style="text-align:center;"> <tr><th>Linux</th><th>Windows</th><th>macOS</th></tr><tr><td>✅ ⚠️</td><td>✅</td><td>✅ ⚠️</td></tr><tr><td colspan="3">⚠️ [Known Issues](KNOWN_ISSUES.md)</td></tr> </table> |
+| <table style="text-align:center;"> <tr><th>20.x.x</th><th>LTS</th><th>Latest</th></tr><tr><td>✅</td><td>✅❓</td><td>✅❓</td></tr><tr><td colspan="3">❓ Best-effort</td></tr> </table> | <table style="text-align:center;"> <tr><th>min</th><th>-</th><th>max</th></tr><tr><td>1.96.x</td><td>1.97.x</td><td>1.98.x</td></tr> </table> | <table style="text-align:center;"> <tr><th>Linux</th><th>Windows</th><th>macOS</th></tr><tr><td>✅ ⚠️</td><td>✅</td><td>✅ ⚠️</td></tr><tr><td colspan="3">⚠️ [Known Issues](KNOWN_ISSUES.md)</td></tr> </table> |
 
 #### NodeJS Support Policy
 

packages/extester/package.json

@@ -52,8 +52,8 @@
     "ui-test"
   ],
   "supportedVersions": {
-    "vscode-min": "1.95.3",
-    "vscode-max": "1.97.2",
+    "vscode-min": "1.96.4",
+    "vscode-max": "1.98.2",
     "nodejs": "20"
   },
   "dependencies": {

packages/locators/lib/1.98.0.ts

@@ -0,0 +1,29 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License", destination); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { By, LocatorDiff } from '@redhat-developer/page-objects';
+
+export const diff: LocatorDiff = {
+	locators: {
+		ScmView: {
+			sourceControlSection: By.xpath(`.//div[@aria-label='Changes Section']`),
+		},
+		ViewSection: {
+			button: By.xpath(`.//a[contains(@class, 'action-label')]`),
+		},
+	},
+};

packages/page-objects/src/components/sidebar/ViewSection.ts

@@ -143,10 +143,11 @@ export abstract class ViewSection extends AbstractElement {
 	 * @returns Promise resolving to array of ViewPanelAction objects
 	 */
 	async getActions(): Promise<ViewPanelAction[]> {
+		await this.getDriver().actions().move({ origin: this }).perform(); // move mouse to bring auto-hided buttons visible
 		const actions = await this.findElement(ViewSection.locators.ViewSection.actions).findElements(ViewSection.locators.ViewSection.button);
 		return Promise.all(
 			actions.map(async (action) => {
-				const dropdown = await action.getAttribute('aria-haspopup');
+				const dropdown = (await action.getAttribute('aria-haspopup')) || (await action.getAttribute('aria-expanded'));
 				if (dropdown) {
 					return new ViewPanelActionDropdown(action, this);
 				} else {

tests/test-project/src/test/01_general/resource.test.ts

@@ -47,16 +47,14 @@ describe('Open resource test', function () {
 
 				const index = title?.indexOf(prefix) ?? 0;
 
-				if (index > 0) {
-					let openFolderPath = title?.slice(index + prefix.length);
-					if (openFolderPath) {
-						if (openFolderPath.startsWith('~/')) {
-							openFolderPath = path.join(os.homedir(), openFolderPath.slice(2));
-						}
-
-						expect(openFolderPath.split(' ')[0]).equals(process.cwd());
-						return true;
+				let openFolderPath = title?.slice(index + prefix.length);
+				if (openFolderPath) {
+					if (openFolderPath.startsWith('~/')) {
+						openFolderPath = path.join(os.homedir(), openFolderPath.slice(2));
 					}
+
+					expect(openFolderPath.split(' ')[0]).equals(process.cwd());
+					return true;
 				}
 
 				return false;