Skip to content

Commit 6b8467f

Browse files
committed
Update test script names
1 parent a9c36ea commit 6b8467f

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

.github/workflows/main.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,12 @@ jobs:
132132
- name: Run unit tests
133133
working-directory: extensions/ql-vscode
134134
run: |
135-
npm run test
135+
npm run test:unit
136+
137+
- name: Run view tests
138+
working-directory: extensions/ql-vscode
139+
run: |
140+
npm run test:view
136141
137142
test:
138143
name: Test
@@ -173,15 +178,15 @@ jobs:
173178
VSCODE_CODEQL_GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
174179
run: |
175180
unset DBUS_SESSION_BUS_ADDRESS
176-
/usr/bin/xvfb-run npm run integration
181+
/usr/bin/xvfb-run npm run test:vscode-integration
177182
178183
- name: Run integration tests (Windows)
179184
if: matrix.os == 'windows-latest'
180185
working-directory: extensions/ql-vscode
181186
env:
182187
VSCODE_CODEQL_GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
183188
run: |
184-
npm run integration
189+
npm run test:vscode-integration
185190
186191
set-matrix:
187192
name: Set Matrix for cli-test
@@ -254,10 +259,10 @@ jobs:
254259
if: matrix.os == 'ubuntu-latest'
255260
run: |
256261
unset DBUS_SESSION_BUS_ADDRESS
257-
/usr/bin/xvfb-run npm run cli-integration
262+
/usr/bin/xvfb-run npm run test:cli-integration
258263
259264
- name: Run CLI tests (Windows)
260265
working-directory: extensions/ql-vscode
261266
if: matrix.os == 'windows-latest'
262267
run: |
263-
npm run cli-integration
268+
npm run test:cli-integration

extensions/ql-vscode/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1329,11 +1329,11 @@
13291329
"test": "npm-run-all -p test:*",
13301330
"test:unit": "cross-env TZ=UTC LANG=en-US jest --projects test/unit-tests",
13311331
"test:view": "jest --projects src/view",
1332-
"integration": "npm-run-all integration:*",
1333-
"integration:activated-extension": "jest --projects test/vscode-tests/activated-extension",
1334-
"integration:no-workspace": "jest --projects test/vscode-tests/no-workspace",
1335-
"integration:minimal-workspace": "jest --projects test/vscode-tests/minimal-workspace",
1336-
"cli-integration": "jest --projects test/vscode-tests/cli-integration",
1332+
"test:vscode-integration": "npm-run-all test:vscode-integration:*",
1333+
"test:vscode-integration:activated-extension": "jest --projects test/vscode-tests/activated-extension",
1334+
"test:vscode-integration:no-workspace": "jest --projects test/vscode-tests/no-workspace",
1335+
"test:vscode-integration:minimal-workspace": "jest --projects test/vscode-tests/minimal-workspace",
1336+
"test:cli-integration": "jest --projects test/vscode-tests/cli-integration",
13371337
"update-vscode": "node ./node_modules/vscode/bin/install",
13381338
"format": "prettier --write **/*.{ts,tsx} && eslint . --ext .ts,.tsx --fix",
13391339
"lint": "eslint . --ext .js,.ts,.tsx --max-warnings=0",

0 commit comments

Comments
 (0)