mrva/vscode-codeql
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix mocha test running (#600)

Browse Source 
PR #591 broke the build.
This commit is contained in:
Andrew Eisenberg
2020-09-29 13:34:51 -07:00
committed by GitHub
parent 7e4491ac45
commit 0c571b1942
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/ql-vscode/package-lock.json generated
View File

@@ -304,9 +304,9 @@
"integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==" "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="
}, },
"@types/mocha": { "@types/mocha": {
"version": "5.2.7", "version": "8.0.3",
"resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.7.tgz", "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-8.0.3.tgz",
"integrity": "sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==", "integrity": "sha512-vyxR57nv8NfcU0GZu8EUXZLTbCMupIUwy95LJ6lllN+JRPG25CwMHoB1q5xKh8YKhQnHYRAn4yW2yuHbf/5xgg==",
"dev": true "dev": true
}, },
"@types/node": { "@types/node": {

2
extensions/ql-vscode/package.json
View File

@@ -685,7 +685,7 @@
"@types/gulp-sourcemaps": "0.0.32", "@types/gulp-sourcemaps": "0.0.32",
"@types/js-yaml": "~3.12.2", "@types/js-yaml": "~3.12.2",
"@types/jszip": "~3.1.6", "@types/jszip": "~3.1.6",
"@types/mocha": "~5.2.7", "@types/mocha": "~8.0.3",
"@types/node": "^12.0.8", "@types/node": "^12.0.8",
"@types/node-fetch": "~2.5.2", "@types/node-fetch": "~2.5.2",
"@types/proxyquire": "~1.3.28", "@types/proxyquire": "~1.3.28",

10
extensions/ql-vscode/src/vscode-tests/index-template.ts
View File

@@ -5,13 +5,13 @@ import * as glob from 'glob';
/** /**
* Helper function that runs all Mocha tests found in the * Helper function that runs all Mocha tests found in the
* given test root directory. * given test root directory.
* *
* For each integration test suite, `vscode-test` expects * For each integration test suite, `vscode-test` expects
* a test runner script exporting a function with the signature: * a test runner script exporting a function with the signature:
* ```ts * ```ts
* export function run(): Promise<void> * export function run(): Promise<void>
* ``` * ```
* *
* To create an integration test suite: * To create an integration test suite:
* - create a directory beside this file * - create a directory beside this file
* - create integration tests in the directory, named `<name>.test.ts` * - create integration tests in the directory, named `<name>.test.ts`
@@ -22,16 +22,16 @@ import * as glob from 'glob';
* return runTestsInDirectory(__dirname); * return runTestsInDirectory(__dirname);
* } * }
* ``` * ```
* *
* After https://github.com/microsoft/TypeScript/issues/420 is implemented, * After https://github.com/microsoft/TypeScript/issues/420 is implemented,
* this pattern can be expressed more neatly using a module interface. * this pattern can be expressed more neatly using a module interface.
*/ */
export function runTestsInDirectory(testsRoot: string): Promise<void> { export function runTestsInDirectory(testsRoot: string): Promise<void> {
// Create the mocha test // Create the mocha test
const mocha = new Mocha({ const mocha = new Mocha({
ui: 'bdd' ui: 'bdd',
color: true
}); });
mocha.useColors(true);
return new Promise((c, e) => { return new Promise((c, e) => {
console.log(`Adding test cases from ${testsRoot}`); console.log(`Adding test cases from ${testsRoot}`);