From 2d39bee416b0e138b4be17c8789483ff7f8b762f Mon Sep 17 00:00:00 2001 From: Andrew Eisenberg Date: Fri, 17 Dec 2021 11:43:53 -0800 Subject: [PATCH] Ensure all tests are run --- .../vscode-tests/minimal-workspace/databases.test.ts | 4 ++-- .../no-workspace/run-remote-query.test.ts | 12 ++++++------ .../vscode-tests/no-workspace/sarifParser.test.ts | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/extensions/ql-vscode/src/vscode-tests/minimal-workspace/databases.test.ts b/extensions/ql-vscode/src/vscode-tests/minimal-workspace/databases.test.ts index 2361bce57..f2c3b1f9d 100644 --- a/extensions/ql-vscode/src/vscode-tests/minimal-workspace/databases.test.ts +++ b/extensions/ql-vscode/src/vscode-tests/minimal-workspace/databases.test.ts @@ -482,8 +482,8 @@ describe('databases', () => { }); - describe.only('findSourceArchive', function() { - // not sure why, but some of these tests take more than two second to run. + describe('findSourceArchive', function() { + // not sure why, but some of these tests take more than two seconds to run. this.timeout(5000); ['src', 'output/src_archive'].forEach(name => { diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/run-remote-query.test.ts b/extensions/ql-vscode/src/vscode-tests/no-workspace/run-remote-query.test.ts index 6d170f3f0..00f9767a4 100644 --- a/extensions/ql-vscode/src/vscode-tests/no-workspace/run-remote-query.test.ts +++ b/extensions/ql-vscode/src/vscode-tests/no-workspace/run-remote-query.test.ts @@ -25,11 +25,11 @@ describe('run-remote-query', function() { showInputBoxSpy = sandbox.stub(window, 'showInputBox'); getRemoteRepositoryListsSpy = sandbox.stub(); showAndLogErrorMessageSpy = sandbox.stub(); - mod = proxyquire('../../run-remote-query', { - './config': { + mod = proxyquire('../../remote-queries/run-remote-query', { + '../config': { getRemoteRepositoryLists: getRemoteRepositoryListsSpy }, - './helpers': { + '../helpers': { showAndLogErrorMessage: showAndLogErrorMessageSpy }, }); @@ -134,12 +134,12 @@ describe('run-remote-query', function() { logSpy = sandbox.stub(); showAndLogErrorMessageSpy = sandbox.stub(); showInformationMessageWithActionSpy = sandbox.stub(); - mod = proxyquire('../../run-remote-query', { - './helpers': { + mod = proxyquire('../../remote-queries/run-remote-query', { + '../helpers': { showAndLogErrorMessage: showAndLogErrorMessageSpy, showInformationMessageWithAction: showInformationMessageWithActionSpy }, - './logging': { + '../logging': { 'logger': { log: logSpy } diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/sarifParser.test.ts b/extensions/ql-vscode/src/vscode-tests/no-workspace/sarifParser.test.ts index f9b2fedf3..65c937629 100644 --- a/extensions/ql-vscode/src/vscode-tests/no-workspace/sarifParser.test.ts +++ b/extensions/ql-vscode/src/vscode-tests/no-workspace/sarifParser.test.ts @@ -7,7 +7,7 @@ import { sarifParser } from '../../sarif-parser'; chai.use(chaiAsPromised); const expect = chai.expect; -describe.only('sarif parser', function() { +describe('sarif parser', function() { const sarifDir = path.join(__dirname, 'data/sarif'); it('should parse a valid SARIF file', async () => { const result = await sarifParser(path.join(sarifDir, 'validSarif.sarif')); @@ -22,4 +22,4 @@ describe.only('sarif parser', function() { const result = await sarifParser(path.join(sarifDir, 'emptyResultsSarif.sarif')); expect(result.runs[0].results).to.be.empty; }); -}); \ No newline at end of file +});