From c0fe8c8d56af66aea936dcba7295c96e22590dd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Jel=C3=ADnek?= Date: Thu, 21 Mar 2024 23:20:44 +0100 Subject: [PATCH] chore: Use ExTester 7.3.0 in sample-projects/helloworld-sample (#1209) --- .../helloworld-sample/package-lock.json | 194 +++++++----------- .../helloworld-sample/package.json | 4 +- .../src/ui-test/bottomBar-test.ts | 2 +- 3 files changed, 76 insertions(+), 124 deletions(-) diff --git a/sample-projects/helloworld-sample/package-lock.json b/sample-projects/helloworld-sample/package-lock.json index d6d1edf63..a463b2e1f 100644 --- a/sample-projects/helloworld-sample/package-lock.json +++ b/sample-projects/helloworld-sample/package-lock.json @@ -18,7 +18,7 @@ "eslint": "^8.57.0", "mocha": "^10.3.0", "typescript": "^5.4.2", - "vscode-extension-tester": "^7.2.0" + "vscode-extension-tester": "^7.3.0" }, "engines": { "vscode": "^1.82.0" @@ -264,12 +264,12 @@ } }, "node_modules/@sindresorhus/is": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.6.0.tgz", - "integrity": "sha512-TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-6.2.0.tgz", + "integrity": "sha512-yM/IGPkVnYGblhDosFBwq0ZGdnVSBkNV4onUtipGMOjZd4kB6GAu3ys91aftSbyMHh6A2GPdt+KDI5NoWP63MQ==", "dev": true, "engines": { - "node": ">=14.16" + "node": ">=16" }, "funding": { "url": "https://github.com/sindresorhus/is?sponsor=1" @@ -294,9 +294,9 @@ "dev": true }, "node_modules/@types/http-cache-semantics": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz", - "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz", + "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==", "dev": true }, "node_modules/@types/json-schema": { @@ -320,64 +320,18 @@ "undici-types": "~5.26.4" } }, - "node_modules/@types/selenium-webdriver": { - "version": "4.1.21", - "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-4.1.21.tgz", - "integrity": "sha512-QGURnImvxYlIQz5DVhvHdqpYNLBjhJ2Vm+cnQI2G9QZzkWlZm0LkLcvDcHp+qE6N2KBz4CeuvXgPO7W3XQ0Tyw==", - "dev": true, - "dependencies": { - "@types/ws": "*" - } - }, "node_modules/@types/semver": { "version": "7.5.8", "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==", "dev": true }, - "node_modules/@types/tar-fs": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@types/tar-fs/-/tar-fs-2.0.4.tgz", - "integrity": "sha512-ipPec0CjTmVDWE+QKr9cTmIIoTl7dFG/yARCM5MqK8i6CNLIG1P8x4kwDsOQY1ChZOZjH0wO9nvfgBvWl4R3kA==", - "dev": true, - "dependencies": { - "@types/node": "*", - "@types/tar-stream": "*" - } - }, - "node_modules/@types/tar-stream": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/@types/tar-stream/-/tar-stream-3.1.3.tgz", - "integrity": "sha512-Zbnx4wpkWBMBSu5CytMbrT5ZpMiF55qgM+EpHzR4yIDu7mv52cej8hTkOc6K+LzpkOAbxwn/m7j3iO+/l42YkQ==", - "dev": true, - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/targz": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@types/targz/-/targz-1.0.4.tgz", - "integrity": "sha512-4i2weIjweWsnrvutLH7dM/+FPVSFSqxb+XKWo61tAiHxyYYHveImqys5JijMboKJz+jhFu24SlFrdVAB0xAMIw==", - "dev": true, - "dependencies": { - "@types/tar-fs": "*" - } - }, "node_modules/@types/vscode": { "version": "1.82.0", "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.82.0.tgz", "integrity": "sha512-VSHV+VnpF8DEm8LNrn8OJ8VuUNcBzN3tMvKrNpbhhfuVjFm82+6v44AbDhLvVFgCzn6vs94EJNTp7w8S6+Q1Rw==", "dev": true }, - "node_modules/@types/ws": { - "version": "8.5.10", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.10.tgz", - "integrity": "sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==", - "dev": true, - "dependencies": { - "@types/node": "*" - } - }, "node_modules/@typescript-eslint/eslint-plugin": { "version": "7.3.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.3.1.tgz", @@ -1230,12 +1184,12 @@ } }, "node_modules/cacheable-request": { - "version": "10.2.13", - "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.13.tgz", - "integrity": "sha512-3SD4rrMu1msNGEtNSt8Od6enwdo//U9s4ykmXfA2TD58kcLkCobtCDiby7kNyj7a/Q7lz/mAesAFI54rTdnvBA==", + "version": "10.2.14", + "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.14.tgz", + "integrity": "sha512-zkDT5WAF4hSSoUgyfg5tFIxz8XQK+25W/TLVojJTMKBaxevLBBtLxgqguAuVQB8PVW79FVjHcU+GJ9tVbDZ9mQ==", "dev": true, "dependencies": { - "@types/http-cache-semantics": "^4.0.1", + "@types/http-cache-semantics": "^4.0.2", "get-stream": "^6.0.1", "http-cache-semantics": "^4.1.1", "keyv": "^4.5.3", @@ -1247,6 +1201,18 @@ "node": ">=14.16" } }, + "node_modules/cacheable-request/node_modules/get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/call-bind": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", @@ -1993,18 +1959,6 @@ "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, - "node_modules/execa/node_modules/get-stream": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz", - "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==", - "dev": true, - "engines": { - "node": ">=16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/expand-template": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", @@ -2164,12 +2118,12 @@ } }, "node_modules/form-data-encoder": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.1.4.tgz", - "integrity": "sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-4.0.2.tgz", + "integrity": "sha512-KQVhvhK8ZkWzxKxOr56CPulAhH3dobtuQ4+hNQ+HekH/Wp5gSOafqRAeTphQUJAIk0GBvHZgJ2ZGRWd5kphMuw==", "dev": true, "engines": { - "node": ">= 14.17" + "node": ">= 18" } }, "node_modules/fs-constants": { @@ -2259,12 +2213,12 @@ } }, "node_modules/get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz", + "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==", "dev": true, "engines": { - "node": ">=10" + "node": ">=16" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -2357,25 +2311,25 @@ } }, "node_modules/got": { - "version": "13.0.0", - "resolved": "https://registry.npmjs.org/got/-/got-13.0.0.tgz", - "integrity": "sha512-XfBk1CxOOScDcMr9O1yKkNaQyy865NbYs+F7dr4H0LZMVgCj2Le59k6PqbNHoL5ToeaEQUYh6c6yMfVcc6SJxA==", + "version": "14.2.1", + "resolved": "https://registry.npmjs.org/got/-/got-14.2.1.tgz", + "integrity": "sha512-KOaPMremmsvx6l9BLC04LYE6ZFW4x7e4HkTe3LwBmtuYYQwpeS4XKqzhubTIkaQ1Nr+eXxeori0zuwupXMovBQ==", "dev": true, "dependencies": { - "@sindresorhus/is": "^5.2.0", + "@sindresorhus/is": "^6.1.0", "@szmarczak/http-timer": "^5.0.1", "cacheable-lookup": "^7.0.0", - "cacheable-request": "^10.2.8", + "cacheable-request": "^10.2.14", "decompress-response": "^6.0.0", - "form-data-encoder": "^2.1.2", - "get-stream": "^6.0.1", - "http2-wrapper": "^2.1.10", + "form-data-encoder": "^4.0.2", + "get-stream": "^8.0.1", + "http2-wrapper": "^2.2.1", "lowercase-keys": "^3.0.0", - "p-cancelable": "^3.0.0", + "p-cancelable": "^4.0.1", "responselike": "^3.0.0" }, "engines": { - "node": ">=16" + "node": ">=20" }, "funding": { "url": "https://github.com/sindresorhus/got?sponsor=1" @@ -2506,9 +2460,9 @@ "dev": true }, "node_modules/http2-wrapper": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.0.tgz", - "integrity": "sha512-kZB0wxMo0sh1PehyjJUWRFEd99KC5TLjZ2cULC4f9iqJBAmKQQXEICjxl5iPJRwP40dpeHFqqhm7tYCvODpqpQ==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.1.tgz", + "integrity": "sha512-V5nVw1PAOgfI3Lmeaj2Exmeg7fenjhRUgz1lPSezy1CuhPYbgQtbQj4jZfEAEMlaL+vupsvhjqCyjzob0yxsmQ==", "dev": true, "dependencies": { "quick-lru": "^5.1.1", @@ -2891,9 +2845,9 @@ } }, "node_modules/keyv": { - "version": "4.5.3", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.3.tgz", - "integrity": "sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==", + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", "dev": true, "dependencies": { "json-buffer": "3.0.1" @@ -3259,9 +3213,9 @@ } }, "node_modules/monaco-page-objects": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/monaco-page-objects/-/monaco-page-objects-3.13.1.tgz", - "integrity": "sha512-YKjoeGs/XLJ7KRT4xSEeNTLYtXnZOJylWVSyGExMs5sketAK/6uW6IXEmwhzOxW37Ty/H/zc03yJrGwVis2idw==", + "version": "3.14.0", + "resolved": "https://registry.npmjs.org/monaco-page-objects/-/monaco-page-objects-3.14.0.tgz", + "integrity": "sha512-tOe4n8FkqUa6QRpB1i1oh7fzEAF/kcZ2FxBgJIa0ZLre+cXU/PoosRBnPhoS6OmkD7d/jVkvp/CHn3oOO/XDjQ==", "dev": true, "dependencies": { "clipboardy": "^4.0.0", @@ -3271,7 +3225,7 @@ "ts-essentials": "^9.4.1" }, "peerDependencies": { - "selenium-webdriver": "^4.6.1", + "selenium-webdriver": ">=4.6.1", "typescript": ">=4.6.2" } }, @@ -3330,9 +3284,9 @@ } }, "node_modules/normalize-url": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.0.tgz", - "integrity": "sha512-uVFpKhj5MheNBJRTiMZ9pE/7hD1QTeEvugSJW/OmLzAp78PB5O6adfMNTvmfKhXBkvCzC+rqifWcVYpGFwTjnw==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.1.tgz", + "integrity": "sha512-IO9QvjUMWxPQQhs60oOu10CRkWCiZzSUkzbXGGV9pviYl1fXYcvkzQ5jV9z8Y6un8ARoVRl4EtC6v6jNqbaJ/w==", "dev": true, "engines": { "node": ">=14.16" @@ -3342,9 +3296,9 @@ } }, "node_modules/npm-run-path": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.2.0.tgz", - "integrity": "sha512-W4/tgAXFqFA0iL7fk0+uQ3g7wkL8xJmx3XdK0VGb4cHW//eZTtKGvFBBoRKVTpY7n6ze4NL9ly7rgXcHufqXKg==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz", + "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==", "dev": true, "dependencies": { "path-key": "^4.0.0" @@ -3431,12 +3385,12 @@ } }, "node_modules/p-cancelable": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz", - "integrity": "sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-4.0.1.tgz", + "integrity": "sha512-wBowNApzd45EIKdO1LaU+LrMBwAcjfPaYtVzV3lmfM3gf8Z4CHZsiIqlM8TZZ8okYvh5A1cP6gTfCRQtwUpaUg==", "dev": true, "engines": { - "node": ">=12.20" + "node": ">=14.16" } }, "node_modules/p-limit": { @@ -4535,26 +4489,24 @@ "dev": true }, "node_modules/vscode-extension-tester": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/vscode-extension-tester/-/vscode-extension-tester-7.2.0.tgz", - "integrity": "sha512-Dqx/D/EyUMuu5aCqWKZrfNF7YB+jvqlENCYOEi41zi3d4znr/U1rarx++g5o3EARdUYPos5iBNo+MVr81/OlZQ==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/vscode-extension-tester/-/vscode-extension-tester-7.3.0.tgz", + "integrity": "sha512-P+sAcWeox9JqkbBqUbpYd2BJVaqNYiwJwcIv+KmQXsnLO6Ml4vuBsYz1fulCohR3UK6GWMHr6bYuxliMHbgOkw==", "dev": true, "dependencies": { - "@types/selenium-webdriver": "^4.1.21", - "@types/targz": "^1.0.4", "@vscode/vsce": "^2.24.0", "commander": "^12.0.0", "compare-versions": "^6.1.0", "fs-extra": "^11.2.0", "glob": "^10.3.10", - "got": "^13.0.0", + "got": "^14.2.1", "hpagent": "^1.2.0", "js-yaml": "^4.1.0", - "monaco-page-objects": "^3.13.1", + "monaco-page-objects": "^3.14.0", "sanitize-filename": "^1.6.3", "selenium-webdriver": "^4.18.1", "targz": "^1.0.1", - "vscode-extension-tester-locators": "^3.11.0" + "vscode-extension-tester-locators": "^3.12.0" }, "bin": { "extest": "out/cli.js" @@ -4565,13 +4517,13 @@ } }, "node_modules/vscode-extension-tester-locators": { - "version": "3.11.0", - "resolved": "https://registry.npmjs.org/vscode-extension-tester-locators/-/vscode-extension-tester-locators-3.11.0.tgz", - "integrity": "sha512-Fo38bb/CuVlVATOGv2nPs26jxlA7u6Ds0niuhT/41+ZVwfl9UUmQHy/bcWWBgcoJLn/8ReMVCFs15rrq0J9pzA==", + "version": "3.12.0", + "resolved": "https://registry.npmjs.org/vscode-extension-tester-locators/-/vscode-extension-tester-locators-3.12.0.tgz", + "integrity": "sha512-oAuWcAnCOW4pkVRzOhXb17WMsOS5IT+czDHAOTb90OOOHFaAn8Zq75hCwq9SxGdUquo2lDj1glo+MDfX0wgNdw==", "dev": true, "peerDependencies": { - "monaco-page-objects": "^3.13.0", - "selenium-webdriver": "^4.6.1" + "monaco-page-objects": ">=3.0.0", + "selenium-webdriver": ">=4.6.1" } }, "node_modules/vscode-extension-tester/node_modules/brace-expansion": { diff --git a/sample-projects/helloworld-sample/package.json b/sample-projects/helloworld-sample/package.json index f5b0cb223..914e80128 100644 --- a/sample-projects/helloworld-sample/package.json +++ b/sample-projects/helloworld-sample/package.json @@ -32,7 +32,7 @@ "compile": "tsc -p ./ && npm run lint", "lint": "eslint src --ext .ts", "watch": "tsc -watch -p ./", - "ui-test": "extest setup-and-run './out/ui-test/*-test.js' --code_settings settings.json --extensions_dir .test-extensions" + "ui-test": "extest setup-and-run './out/ui-test/*-test.js' --code_version max --code_settings settings.json --extensions_dir .test-extensions" }, "devDependencies": { "@types/chai": "^4.3.14", @@ -44,6 +44,6 @@ "eslint": "^8.57.0", "mocha": "^10.3.0", "typescript": "^5.4.2", - "vscode-extension-tester": "^7.2.0" + "vscode-extension-tester": "^7.3.0" } } diff --git a/sample-projects/helloworld-sample/src/ui-test/bottomBar-test.ts b/sample-projects/helloworld-sample/src/ui-test/bottomBar-test.ts index b4f552552..0b7a24a94 100644 --- a/sample-projects/helloworld-sample/src/ui-test/bottomBar-test.ts +++ b/sample-projects/helloworld-sample/src/ui-test/bottomBar-test.ts @@ -126,7 +126,7 @@ describe('Bottom Bar Example Tests', function () { view = await bottomBar.openOutputView(); // select a channel that actually has some text in it - await view.selectChannel('Log (Main)'); + await view.selectChannel('Main'); }); // check if there is text in the output