Skip to content

Commit 98005a6

Browse files
authored
Merge pull request #4499 from github/cklin/vscode-integration-tests
Fix VS Code integration tests on macOS
2 parents 3df2323 + f15c770 commit 98005a6

3 files changed

Lines changed: 12 additions & 9 deletions

File tree

extensions/ql-vscode/package-lock.json

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

extensions/ql-vscode/package.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2149,7 +2149,7 @@
21492149
"@types/yauzl": "^3.4.0",
21502150
"@typescript-eslint/eslint-plugin": "^8.65.0",
21512151
"@typescript-eslint/parser": "^8.65.0",
2152-
"@vscode/test-electron": "^2.5.2",
2152+
"@vscode/test-electron": "^3.1.0",
21532153
"@vscode/vsce": "^3.9.2",
21542154
"ansi-colors": "^4.1.1",
21552155
"applicationinsights": "^2.9.8",
@@ -2198,7 +2198,10 @@
21982198
"d3-graphviz": {
21992199
"@hpcc-js/wasm": "2.30.0"
22002200
},
2201-
"@azure/identity": "^4.13.1"
2201+
"@azure/identity": "^4.13.1",
2202+
"jest-runner-vscode": {
2203+
"@vscode/test-electron": "^3.1.0"
2204+
}
22022205
},
22032206
"lint-staged": {
22042207
"./**/*.{json,css,scss}": [

extensions/ql-vscode/test/vscode-tests/minimal-workspace/activation.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ describe("launching with a minimal workspace", () => {
2424
const document = await workspace.openTextDocument(documentPath);
2525
expect(document.languageId).toEqual("ql");
2626
// Wait for the extension to activate, polling with a timeout.
27-
await waitForActivation(ext!, 30_000);
27+
await waitForActivation(ext!, 90_000);
2828
expect(ext!.isActive).toBeTruthy();
29-
}, 60_000);
29+
}, 120_000);
3030

3131
async function waitForActivation(
3232
extension: Extension<any>,

0 commit comments

Comments
 (0)