Skip to content

Commit e55b8a3

Browse files
committed
Clean up Mocha, Sinon and Chai
This removes the Mocha, Sinon and Chai-related packages and removes unused code from the test suite.
1 parent 5841fbc commit e55b8a3

11 files changed

Lines changed: 42 additions & 1374 deletions

File tree

.vscode/launch.json

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -63,60 +63,52 @@
6363
},
6464
{
6565
"name": "Launch Integration Tests - No Workspace (vscode-codeql)",
66-
"type": "extensionHost",
66+
"type": "node",
6767
"request": "launch",
68-
"runtimeExecutable": "${execPath}",
68+
"program": "${workspaceFolder}/extensions/ql-vscode/node_modules/jest/bin/jest.js",
69+
"showAsyncStacks": true,
70+
"cwd": "${workspaceFolder}/extensions/ql-vscode",
6971
"args": [
70-
"--extensionDevelopmentPath=${workspaceRoot}/extensions/ql-vscode",
71-
"--extensionTestsPath=${workspaceRoot}/extensions/ql-vscode/out/vscode-tests/no-workspace/index",
72-
"--disable-workspace-trust",
73-
"--disable-extensions",
74-
"--disable-gpu"
72+
"--projects",
73+
"out/vscode-tests/no-workspace"
7574
],
75+
"stopOnEntry": false,
7676
"sourceMaps": true,
7777
"outFiles": [
7878
"${workspaceRoot}/extensions/ql-vscode/out/**/*.js",
7979
],
80+
"console": "integratedTerminal",
81+
"internalConsoleOptions": "neverOpen",
8082
},
8183
{
8284
"name": "Launch Integration Tests - Minimal Workspace (vscode-codeql)",
83-
"type": "extensionHost",
85+
"type": "node",
8486
"request": "launch",
85-
"runtimeExecutable": "${execPath}",
87+
"program": "${workspaceFolder}/extensions/ql-vscode/node_modules/jest/bin/jest.js",
88+
"showAsyncStacks": true,
89+
"cwd": "${workspaceFolder}/extensions/ql-vscode",
8690
"args": [
87-
"--extensionDevelopmentPath=${workspaceRoot}/extensions/ql-vscode",
88-
"--extensionTestsPath=${workspaceRoot}/extensions/ql-vscode/out/vscode-tests/minimal-workspace/index",
89-
"--disable-workspace-trust",
90-
"--disable-extensions",
91-
"--disable-gpu",
92-
"${workspaceRoot}/extensions/ql-vscode/test/data"
91+
"--projects",
92+
"out/vscode-tests/minimal-workspace"
9393
],
94+
"stopOnEntry": false,
9495
"sourceMaps": true,
9596
"outFiles": [
9697
"${workspaceRoot}/extensions/ql-vscode/out/**/*.js",
9798
],
99+
"console": "integratedTerminal",
100+
"internalConsoleOptions": "neverOpen",
98101
},
99102
{
100103
"name": "Launch Integration Tests - With CLI",
101-
"type": "extensionHost",
104+
"type": "node",
102105
"request": "launch",
103-
"runtimeExecutable": "${execPath}",
106+
"program": "${workspaceFolder}/extensions/ql-vscode/node_modules/jest/bin/jest.js",
107+
"showAsyncStacks": true,
108+
"cwd": "${workspaceFolder}/extensions/ql-vscode",
104109
"args": [
105-
"--extensionDevelopmentPath=${workspaceRoot}/extensions/ql-vscode",
106-
"--extensionTestsPath=${workspaceRoot}/extensions/ql-vscode/out/vscode-tests/cli-integration/index",
107-
"--disable-workspace-trust",
108-
"--disable-gpu",
109-
"--disable-extension",
110-
"eamodio.gitlens",
111-
"--disable-extension",
112-
"github.codespaces",
113-
"--disable-extension",
114-
"github.copilot",
115-
"${workspaceRoot}/extensions/ql-vscode/src/vscode-tests/cli-integration/data",
116-
// Uncomment the last line and modify the path to a checked out
117-
// instance of the codeql repository so the libraries are
118-
// available in the workspace for the tests.
119-
// "${workspaceRoot}/../codeql"
110+
"--projects",
111+
"out/vscode-tests/cli-integration"
120112
],
121113
"env": {
122114
// Optionally, set the version to use for the integration tests.
@@ -130,11 +122,19 @@
130122
// If not specified, one will be downloaded automatically.
131123
// This option overrides the CLI_VERSION option.
132124
// "CLI_PATH": "${workspaceRoot}/../semmle-code/target/intree/codeql/codeql",
125+
126+
// Uncomment the last line and modify the path to a checked out
127+
// instance of the codeql repository so the libraries are
128+
// available in the workspace for the tests.
129+
// "TEST_CODEQL_PATH": "${workspaceRoot}/../codeql",
133130
},
131+
"stopOnEntry": false,
134132
"sourceMaps": true,
135133
"outFiles": [
136134
"${workspaceRoot}/extensions/ql-vscode/out/**/*.js",
137135
],
136+
"console": "integratedTerminal",
137+
"internalConsoleOptions": "neverOpen",
138138
},
139139
{
140140
"name": "Launch Storybook",

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"javascript.preferences.quoteStyle": "single",
3838
"editor.wordWrapColumn": 100,
3939
"jest.rootPath": "./extensions/ql-vscode",
40-
"jest.autoRun": "watch",
40+
"jest.autoRun": "off",
4141
"jest.nodeEnv": {
4242
"LANG": "en-US",
4343
"TZ": "UTC"

0 commit comments

Comments
 (0)