feat: Add support for VS Code 1.99 (#1835)

Author: djelinek

.github/workflows/main.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [min, 1.97.2, max]
+        version: [min, 1.98.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.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> |
+| <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.97.x</td><td>1.98.x</td><td>1.99.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
 

package-lock.json

@@ -32,7 +32,7 @@
     "@types/node": "^22.14.0",
     "@types/selenium-webdriver": "^4.1.28",
     "@types/targz": "^1.0.5",
-    "@types/vscode": "^1.94.0",
+    "@types/vscode": "^1.97.0",
     "@typescript-eslint/eslint-plugin": "^8.29.1",
     "@typescript-eslint/parser": "^8.29.1",
     "eslint": "^9.24.0",

package.json

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

packages/extester/package.json

@@ -0,0 +1,26 @@
+/**
+ * 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: {
+		ExtensionsViewItem: {
+			author: By.className('publisher'),
+		},
+	},
+};

packages/locators/lib/1.99.0.ts

@@ -15,7 +15,7 @@
     "directory": "tests/test-project"
   },
   "engines": {
-    "vscode": "^1.85.0"
+    "vscode": "^1.97.0"
   },
   "categories": [
     "Other",
@@ -131,27 +131,32 @@
       "explorer": [
         {
           "id": "testView",
-          "name": "Test View"
+          "name": "Test View",
+          "icon": "icons/logo.png"
         },
         {
           "id": "testView2",
-          "name": "Test View 2"
+          "name": "Test View 2",
+          "icon": "icons/logo.png"
         },
         {
           "id": "emptyView",
-          "name": "Empty View"
+          "name": "Empty View",
+          "icon": "icons/logo.png"
         },
         {
           "id": "mySidePanelView",
           "name": "My Side Panel View",
-          "type": "webview"
+          "type": "webview",
+          "icon": "icons/logo.png"
         }
       ],
       "myPanel": [
         {
           "id": "myPanelView",
           "name": "My Panel View",
-          "type": "webview"
+          "type": "webview",
+          "icon": "icons/logo.png"
         }
       ]
     },
@@ -249,8 +254,6 @@
     "ui-test:coverage": "MOCHA_GREP='order|clipboard|ExtensionsView|TitleBar' MOCHA_INVERT=true extest setup-and-run './out/test/**/*.test.js' -i -r . -e ./test-extensions --coverage"
   },
   "devDependencies": {
-    "@types/chai": "^4.3.16",
-    "@types/vscode": "^1.85.0",
     "chai": "^4.5.0",
     "clipboard-cli": "^4.0.0",
     "clipboardy": "^4.0.0",

tests/test-project/package.json

@@ -26,10 +26,10 @@ describe('WebViews', function () {
 			this.timeout(8000);
 			await new Workbench().executeCommand('Webview Test Column 1');
 			await new Promise((res) => {
-				setTimeout(res, 500);
+				setTimeout(res, 1_000);
 			});
 			view = new WebView();
-			await view.switchToFrame();
+			await view.switchToFrame(5_000);
 		});
 
 		after(async function () {
@@ -65,7 +65,7 @@ describe('WebViews', function () {
 			for (let i = 0; i < 3; i++) {
 				await workbench.executeCommand(`Webview Test Column ${i + 1}`);
 				await new Promise((res) => {
-					setTimeout(res, 500);
+					setTimeout(res, 1_000);
 				});
 			}
 
@@ -91,7 +91,7 @@ describe('WebViews', function () {
 			describe(`WebView ${i}`, function () {
 				before(async function () {
 					view = new WebView(editorGroups[i]);
-					await view.switchToFrame();
+					await view.switchToFrame(5_000);
 				});
 
 				after(async function () {
@@ -126,7 +126,7 @@ describe('WebViews', function () {
 			for (let i = 0; i < 3; i++) {
 				await workbench.executeCommand('Webview Test Column 1');
 				await new Promise((res) => {
-					setTimeout(res, 500);
+					setTimeout(res, 1_000);
 				});
 			}
 
@@ -137,7 +137,7 @@ describe('WebViews', function () {
 				before(async function () {
 					await new EditorView().openEditor(tabs[i]);
 					view = new WebView();
-					await view.switchToFrame();
+					await view.switchToFrame(5_000);
 				});
 				it('findWebElement works', async function () {
 					const element = await view.findWebElement(By.css('h1'));