diff --git a/package-lock.json b/package-lock.json index 7b65b807c..cb8cd4d64 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "commander": "^11.0.0", "compare-versions": "^6.1.0", "fs-extra": "^11.1.0", - "glob": "^8.1.0", + "glob": "^10.3.4", "got": "^13.0.0", "hpagent": "^1.2.0", "js-yaml": "^4.1.0", @@ -34,7 +34,6 @@ }, "devDependencies": { "@types/fs-extra": "^11.0.1", - "@types/glob": "^8.1.0", "@types/js-yaml": "^4.0.5", "@types/mocha": "^10.0.1", "@types/node": "^18.17.15", @@ -66,7 +65,6 @@ }, "node_modules/@isaacs/cliui": { "version": "8.0.2", - "dev": true, "license": "ISC", "dependencies": { "string-width": "^5.1.2", @@ -82,7 +80,6 @@ }, "node_modules/@isaacs/cliui/node_modules/ansi-regex": { "version": "6.0.1", - "dev": true, "license": "MIT", "engines": { "node": ">=12" @@ -93,7 +90,6 @@ }, "node_modules/@isaacs/cliui/node_modules/ansi-styles": { "version": "6.2.1", - "dev": true, "license": "MIT", "engines": { "node": ">=12" @@ -104,12 +100,10 @@ }, "node_modules/@isaacs/cliui/node_modules/emoji-regex": { "version": "9.2.2", - "dev": true, "license": "MIT" }, "node_modules/@isaacs/cliui/node_modules/string-width": { "version": "5.1.2", - "dev": true, "license": "MIT", "dependencies": { "eastasianwidth": "^0.2.0", @@ -125,7 +119,6 @@ }, "node_modules/@isaacs/cliui/node_modules/strip-ansi": { "version": "7.1.0", - "dev": true, "license": "MIT", "dependencies": { "ansi-regex": "^6.0.1" @@ -139,7 +132,6 @@ }, "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { "version": "8.1.0", - "dev": true, "license": "MIT", "dependencies": { "ansi-styles": "^6.1.0", @@ -155,7 +147,6 @@ }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", - "dev": true, "license": "MIT", "optional": true, "engines": { @@ -197,15 +188,6 @@ "@types/node": "*" } }, - "node_modules/@types/glob": { - "version": "8.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/minimatch": "^5.1.2", - "@types/node": "*" - } - }, "node_modules/@types/http-cache-semantics": { "version": "4.0.1", "license": "MIT" @@ -223,11 +205,6 @@ "@types/node": "*" } }, - "node_modules/@types/minimatch": { - "version": "5.1.2", - "dev": true, - "license": "MIT" - }, "node_modules/@types/mocha": { "version": "10.0.1", "dev": true, @@ -419,7 +396,6 @@ }, "node_modules/ansi-regex": { "version": "5.0.1", - "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -427,7 +403,6 @@ }, "node_modules/ansi-styles": { "version": "4.3.0", - "dev": true, "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -806,7 +781,6 @@ }, "node_modules/color-convert": { "version": "2.0.1", - "dev": true, "license": "MIT", "dependencies": { "color-name": "~1.1.4" @@ -817,7 +791,6 @@ }, "node_modules/color-name": { "version": "1.1.4", - "dev": true, "license": "MIT" }, "node_modules/commander": { @@ -1017,12 +990,10 @@ }, "node_modules/eastasianwidth": { "version": "0.2.0", - "dev": true, "license": "MIT" }, "node_modules/emoji-regex": { "version": "8.0.0", - "dev": true, "license": "MIT" }, "node_modules/end-of-stream": { @@ -1133,7 +1104,6 @@ }, "node_modules/foreground-child": { "version": "3.1.1", - "dev": true, "license": "ISC", "dependencies": { "cross-spawn": "^7.0.0", @@ -1148,7 +1118,6 @@ }, "node_modules/foreground-child/node_modules/signal-exit": { "version": "4.0.2", - "dev": true, "license": "ISC", "engines": { "node": ">=14" @@ -1295,17 +1264,20 @@ "optional": true }, "node_modules/glob": { - "version": "8.1.0", + "version": "10.3.4", "license": "ISC", "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" + "foreground-child": "^3.1.0", + "jackspeak": "^2.0.3", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" + }, + "bin": { + "glob": "dist/cjs/src/bin.js" }, "engines": { - "node": ">=12" + "node": ">=16 || 14 >=14.17" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -1515,7 +1487,6 @@ }, "node_modules/is-fullwidth-code-point": { "version": "3.0.0", - "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -1606,7 +1577,6 @@ }, "node_modules/jackspeak": { "version": "2.2.1", - "dev": true, "license": "BlueOak-1.0.0", "dependencies": { "@isaacs/cliui": "^8.0.2" @@ -1814,13 +1784,16 @@ } }, "node_modules/minimatch": { - "version": "5.1.6", + "version": "9.0.3", "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, "engines": { - "node": ">=10" + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/minimist": { @@ -1832,7 +1805,6 @@ }, "node_modules/minipass": { "version": "6.0.2", - "dev": true, "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" @@ -2156,12 +2128,11 @@ } }, "node_modules/path-scurry": { - "version": "1.9.2", - "dev": true, + "version": "1.10.1", "license": "BlueOak-1.0.0", "dependencies": { - "lru-cache": "^9.1.1", - "minipass": "^5.0.0 || ^6.0.2" + "lru-cache": "^9.1.1 || ^10.0.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" }, "engines": { "node": ">=16 || 14 >=14.17" @@ -2171,8 +2142,7 @@ } }, "node_modules/path-scurry/node_modules/lru-cache": { - "version": "9.1.2", - "dev": true, + "version": "10.0.1", "license": "ISC", "engines": { "node": "14 || >=16.14" @@ -2409,41 +2379,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/rimraf/node_modules/glob": { - "version": "10.2.6", - "dev": true, - "license": "ISC", - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^2.0.3", - "minimatch": "^9.0.1", - "minipass": "^5.0.0 || ^6.0.2", - "path-scurry": "^1.7.0" - }, - "bin": { - "glob": "dist/cjs/src/bin.js" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/rimraf/node_modules/minimatch": { - "version": "9.0.1", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/safe-buffer": { "version": "5.1.2", "license": "MIT" @@ -2585,7 +2520,6 @@ }, "node_modules/string-width": { "version": "4.2.3", - "dev": true, "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", @@ -2599,7 +2533,6 @@ "node_modules/string-width-cjs": { "name": "string-width", "version": "4.2.3", - "dev": true, "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", @@ -2612,7 +2545,6 @@ }, "node_modules/strip-ansi": { "version": "6.0.1", - "dev": true, "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" @@ -2624,7 +2556,6 @@ "node_modules/strip-ansi-cjs": { "name": "strip-ansi", "version": "6.0.1", - "dev": true, "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" @@ -2926,7 +2857,6 @@ "node_modules/wrap-ansi-cjs": { "name": "wrap-ansi", "version": "7.0.0", - "dev": true, "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", diff --git a/package.json b/package.json index b395d4b2f..6241a4230 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,6 @@ "homepage": "https://github.com/redhat-developer/vscode-extension-tester#readme", "devDependencies": { "@types/fs-extra": "^11.0.1", - "@types/glob": "^8.1.0", "@types/js-yaml": "^4.0.5", "@types/mocha": "^10.0.1", "@types/node": "^18.17.15", @@ -59,7 +58,7 @@ "commander": "^11.0.0", "compare-versions": "^6.1.0", "fs-extra": "^11.1.0", - "glob": "^8.1.0", + "glob": "^10.3.4", "got": "^13.0.0", "hpagent": "^1.2.0", "js-yaml": "^4.1.0", diff --git a/page-objects/src/components/bottomBar/BottomBarPanel.ts b/page-objects/src/components/bottomBar/BottomBarPanel.ts index 17f05cf36..4b617a472 100644 --- a/page-objects/src/components/bottomBar/BottomBarPanel.ts +++ b/page-objects/src/components/bottomBar/BottomBarPanel.ts @@ -25,6 +25,7 @@ export class BottomBarPanel extends AbstractElement { const height = (await this.getRect()).height; if ((open && height === 0) || !open && height > 0) { if (open) { + await this.getDriver().actions().clear(); await this.getDriver().actions().keyDown(BottomBarPanel.ctlKey).sendKeys('j').perform(); await this.wait(); } else { diff --git a/src/cli.ts b/src/cli.ts index d060aca80..a1f2e1dfc 100644 --- a/src/cli.ts +++ b/src/cli.ts @@ -79,7 +79,7 @@ program.command('run-tests ') .option('-m, --mocha_config ', 'Path to Mocha configuration file') .option('-l, --log_level ', 'Log messages from webdriver with a given level', 'Info') .option('-f, --offline', 'Attempt to run without internet connection, make sure to have all requirements downloaded', false) - .option('-r --open_resource ', 'Open resources in VS Code. Multiple files and folders can be specified.') + .option('-r, --open_resource ', 'Open resources in VS Code. Multiple files and folders can be specified.') .action(withErrors(async (testFiles, cmd) => { const extest = new ExTester(cmd.storage, codeStream(cmd.type), cmd.extensions_dir); await extest.runTests(testFiles, {vscodeVersion: cmd.code_version, settings: cmd.code_settings, cleanup: cmd.uninstall_extension, config: cmd.mocha_config, logLevel: cmd.log_level, offline: cmd.offline, resources: cmd.open_resource ?? []}); @@ -98,7 +98,7 @@ program.command('setup-and-run ') .option('-i, --install_dependencies', 'Automatically install extensions your extension depends on', false) .option('-l, --log_level ', 'Log messages from webdriver with a given level', 'Info') .option('-f, --offline', 'Attempt to run without internet connection, make sure to have all requirements downloaded', false) - .option('-r --open_resource ', 'Open resources in VS Code. Multiple files and folders can be specified.') + .option('-r, --open_resource ', 'Open resources in VS Code. Multiple files and folders can be specified.') .action(withErrors(async (testFiles, cmd) => { const extest = new ExTester(cmd.storage, codeStream(cmd.type), cmd.extensions_dir); await extest.setupAndRunTests(testFiles, cmd.code_version, {useYarn: cmd.yarn, installDependencies: cmd.install_dependencies}, {settings: cmd.code_settings, cleanup: cmd.uninstall_extension, config: cmd.mocha_config, logLevel: cmd.log_level, resources: cmd.open_resource ?? []}); diff --git a/src/suite/runner.ts b/src/suite/runner.ts index 47de40ea7..92b0db9cc 100644 --- a/src/suite/runner.ts +++ b/src/suite/runner.ts @@ -3,7 +3,7 @@ import { VSBrowser } from '../browser'; import * as fs from 'fs-extra'; import Mocha = require('mocha'); -import * as glob from 'glob'; +import { globSync } from 'glob'; import { CodeUtil, ReleaseQuality } from '../util/codeUtil'; import * as path from 'path'; import * as yaml from 'js-yaml'; @@ -47,7 +47,7 @@ export class VSRunner { const testFiles = new Set(); for (const pattern of testFilesPattern) { const universalPattern = pattern.replace(/'/g, ''); - glob.sync(universalPattern) + globSync(universalPattern).reverse() .forEach((val) => testFiles.add(val)); } diff --git a/test/test-project/src/test/bottomBar/views-test.ts b/test/test-project/src/test/bottomBar/views-test.ts index 43fed9512..928d98ac1 100644 --- a/test/test-project/src/test/bottomBar/views-test.ts +++ b/test/test-project/src/test/bottomBar/views-test.ts @@ -26,6 +26,8 @@ describe('Output View/Text Views', function () { }); after(async function () { + await panel.restore(); + await new Promise(resolve => setTimeout(resolve, 500)); await panel.toggle(false); }); diff --git a/test/test-project/src/test/xsideBar/scmView-test.ts b/test/test-project/src/test/xsideBar/scmView-test.ts index b0ec9ae78..c06e789c7 100644 --- a/test/test-project/src/test/xsideBar/scmView-test.ts +++ b/test/test-project/src/test/xsideBar/scmView-test.ts @@ -6,7 +6,7 @@ import * as fs from 'fs-extra'; (VSBrowser.instance.version >= '1.38.0' ? describe : describe.skip)('SCM View', () => { let view: ScmView; - before(async function context() { + before(async function () { this.timeout(15000); fs.writeFileSync(path.resolve('.', 'testfile'), 'content'); await VSBrowser.instance.openResources(path.resolve('..', '..'));