Skip to content

Commit a5b2d1c

Browse files
committed
Move back mockCli into beforeEach
This was an attempt to make the tests run in a shorter timeframe, but we've gone with increasing the timeout to 40s.
1 parent 3eb8755 commit a5b2d1c

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

extensions/ql-vscode/test/vscode-tests/cli-integration/skeleton-query-wizard.test.ts

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import { createMockDB } from "../../factories/databases/databases";
2424
jest.setTimeout(40_000);
2525

2626
describe("SkeletonQueryWizard", () => {
27+
let mockCli: CodeQLCliServer;
2728
let wizard: SkeletonQueryWizard;
2829
let mockDatabaseManager: DatabaseManager;
2930
let dir: tmp.DirResult;
@@ -48,24 +49,25 @@ describe("SkeletonQueryWizard", () => {
4849
const token = new CancellationTokenSource().token;
4950
const credentials = testCredentialsWithStub();
5051
const chosenLanguage = "ruby";
51-
const mockCli = mockedObject<CodeQLCliServer>({
52-
resolveLanguages: jest
53-
.fn()
54-
.mockResolvedValue([
55-
"ruby",
56-
"javascript",
57-
"go",
58-
"java",
59-
"python",
60-
"csharp",
61-
"cpp",
62-
]),
63-
getSupportedLanguages: jest.fn(),
64-
});
6552

6653
jest.spyOn(extLogger, "log").mockResolvedValue(undefined);
6754

6855
beforeEach(async () => {
56+
mockCli = mockedObject<CodeQLCliServer>({
57+
resolveLanguages: jest
58+
.fn()
59+
.mockResolvedValue([
60+
"ruby",
61+
"javascript",
62+
"go",
63+
"java",
64+
"python",
65+
"csharp",
66+
"cpp",
67+
]),
68+
getSupportedLanguages: jest.fn(),
69+
});
70+
6971
mockDatabaseManager = mockedObject<DatabaseManager>({
7072
setCurrentDatabaseItem: jest.fn(),
7173
databaseItems: [] as DatabaseItem[],

0 commit comments

Comments
 (0)