Skip to content

Commit a6a7a5c

Browse files
norascheuchnorascheuch
authored
Merge pull request #3246 from github/nora/remove-deprecated-jest-syntax
Remove deprecated jest syntac
2 parents 5948008 + 70ce93c commit a6a7a5c

File tree

21 files changed

+169
-167
lines changed

21 files changed

+169
-167
lines changed

‎extensions/ql-vscode/test/common/logging/output-channel-logger.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ describe("OutputChannelLogger tests", function () {
5454

5555
it("should log to the output channel", async () => {
5656
await logger.log("xxx");
57-
expect(mockOutputChannel.appendLine).toBeCalledWith("xxx");
58-
expect(mockOutputChannel.append).not.toBeCalledWith("xxx");
57+
expect(mockOutputChannel.appendLine).toHaveBeenCalledWith("xxx");
58+
expect(mockOutputChannel.append).not.toHaveBeenCalledWith("xxx");
5959

6060
await logger.log("yyy", { trailingNewline: false });
61-
expect(mockOutputChannel.appendLine).not.toBeCalledWith("yyy");
62-
expect(mockOutputChannel.append).toBeCalledWith("yyy");
61+
expect(mockOutputChannel.appendLine).not.toHaveBeenCalledWith("yyy");
62+
expect(mockOutputChannel.append).toHaveBeenCalledWith("yyy");
6363

6464
const hucairz = createSideLogger(logger, "hucairz");
6565
await hucairz.log("zzz");

‎extensions/ql-vscode/test/unit-tests/common/disposable-object.test.ts‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ describe("DisposableObject and DisposeHandler", () => {
3434

3535
disposableObject.dispose();
3636

37-
expect(disposable1.dispose).toBeCalled();
38-
expect(disposable2.dispose).toBeCalled();
39-
expect(disposable3.dispose).toBeCalled();
37+
expect(disposable1.dispose).toHaveBeenCalled();
38+
expect(disposable2.dispose).toHaveBeenCalled();
39+
expect(disposable3.dispose).toHaveBeenCalled();
4040

4141
// pushed items must be called in reverse order
4242
expect(disposable2.dispose.mock.invocationCallOrder[0]).toBeLessThan(
@@ -51,30 +51,30 @@ describe("DisposableObject and DisposeHandler", () => {
5151

5252
disposableObject.dispose();
5353

54-
expect(disposable1.dispose).not.toBeCalled();
55-
expect(disposable2.dispose).not.toBeCalled();
56-
expect(disposable3.dispose).not.toBeCalled();
54+
expect(disposable1.dispose).not.toHaveBeenCalled();
55+
expect(disposable2.dispose).not.toHaveBeenCalled();
56+
expect(disposable3.dispose).not.toHaveBeenCalled();
5757
});
5858

5959
it("should dispose and stop tracking objects", () => {
6060
disposableObject.track(disposable1);
6161
disposableObject.disposeAndStopTracking(disposable1);
6262

63-
expect(disposable1.dispose).toBeCalled();
63+
expect(disposable1.dispose).toHaveBeenCalled();
6464
disposable1.dispose.mockClear();
6565

6666
disposableObject.dispose();
67-
expect(disposable1.dispose).not.toBeCalled();
67+
expect(disposable1.dispose).not.toHaveBeenCalled();
6868
});
6969

7070
it("should avoid disposing an object that is not tracked", () => {
7171
disposableObject.push(disposable1);
7272
disposableObject.disposeAndStopTracking(disposable1);
7373

74-
expect(disposable1.dispose).not.toBeCalled();
74+
expect(disposable1.dispose).not.toHaveBeenCalled();
7575

7676
disposableObject.dispose();
77-
expect(disposable1.dispose).toBeCalled();
77+
expect(disposable1.dispose).toHaveBeenCalled();
7878
});
7979

8080
it("ahould use a dispose handler", () => {
@@ -91,10 +91,10 @@ describe("DisposableObject and DisposeHandler", () => {
9191

9292
disposableObject.dispose(handler);
9393

94-
expect(disposable1.dispose).toBeCalled();
95-
expect(disposable2.dispose).not.toBeCalled();
96-
expect(disposable3.dispose).toBeCalled();
97-
expect(disposable4.dispose).not.toBeCalled();
94+
expect(disposable1.dispose).toHaveBeenCalled();
95+
expect(disposable2.dispose).not.toHaveBeenCalled();
96+
expect(disposable3.dispose).toHaveBeenCalled();
97+
expect(disposable4.dispose).not.toHaveBeenCalled();
9898

9999
// now that disposableObject has been disposed, subsequent disposals are
100100
// no-ops
@@ -105,10 +105,10 @@ describe("DisposableObject and DisposeHandler", () => {
105105

106106
disposableObject.dispose();
107107

108-
expect(disposable1.dispose).not.toBeCalled();
109-
expect(disposable2.dispose).not.toBeCalled();
110-
expect(disposable3.dispose).not.toBeCalled();
111-
expect(disposable4.dispose).not.toBeCalled();
108+
expect(disposable1.dispose).not.toHaveBeenCalled();
109+
expect(disposable2.dispose).not.toHaveBeenCalled();
110+
expect(disposable3.dispose).not.toHaveBeenCalled();
111+
expect(disposable4.dispose).not.toHaveBeenCalled();
112112
});
113113

114114
class MyDisposableObject extends DisposableObject {

‎extensions/ql-vscode/test/unit-tests/databases/config/db-config-store.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ describe("db config store", () => {
139139
const configStore = new DbConfigStore(app, false);
140140
await configStore.initialize();
141141

142-
expect(executeCommand).toBeCalledWith(
142+
expect(executeCommand).toHaveBeenCalledWith(
143143
"setContext",
144144
"codeQLVariantAnalysisRepositories.configError",
145145
true,
@@ -157,7 +157,7 @@ describe("db config store", () => {
157157
const configStore = new DbConfigStore(app, false);
158158
await configStore.initialize();
159159

160-
expect(executeCommand).toBeCalledWith(
160+
expect(executeCommand).toHaveBeenCalledWith(
161161
"setContext",
162162
"codeQLVariantAnalysisRepositories.configError",
163163
false,

‎extensions/ql-vscode/test/vscode-tests/activated-extension/variant-analysis/variant-analysis-manager.test.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ describe("Variant Analysis Manager", () => {
9696

9797
await variantAnalysisManager.rehydrateVariantAnalysis(variantAnalysis);
9898

99-
expect(stub).toBeCalledTimes(1);
99+
expect(stub).toHaveBeenCalledTimes(1);
100100
});
101101
});
102102

@@ -423,7 +423,7 @@ describe("Variant Analysis Manager", () => {
423423
);
424424

425425
expect(variantAnalysisManager.downloadsQueueSize()).toBe(0);
426-
expect(getResultsSpy).toBeCalledTimes(3);
426+
expect(getResultsSpy).toHaveBeenCalledTimes(3);
427427
});
428428
});
429429

@@ -451,7 +451,7 @@ describe("Variant Analysis Manager", () => {
451451

452452
await variantAnalysisManager.removeVariantAnalysis(dummyVariantAnalysis);
453453

454-
expect(removeAnalysisResultsStub).toBeCalledTimes(1);
454+
expect(removeAnalysisResultsStub).toHaveBeenCalledTimes(1);
455455
expect(variantAnalysisManager.variantAnalysesSize).toBe(0);
456456

457457
await expect(
@@ -610,7 +610,7 @@ describe("Variant Analysis Manager", () => {
610610
it("should return cancel if valid", async () => {
611611
await variantAnalysisManager.cancelVariantAnalysis(variantAnalysis.id);
612612

613-
expect(mockCancelVariantAnalysis).toBeCalledWith(
613+
expect(mockCancelVariantAnalysis).toHaveBeenCalledWith(
614614
app.credentials,
615615
variantAnalysis,
616616
);
@@ -656,7 +656,7 @@ describe("Variant Analysis Manager", () => {
656656
variantAnalysis.id,
657657
);
658658

659-
expect(writeTextStub).not.toBeCalled();
659+
expect(writeTextStub).not.toHaveBeenCalled();
660660
});
661661
});
662662

@@ -682,7 +682,7 @@ describe("Variant Analysis Manager", () => {
682682
variantAnalysis.id,
683683
);
684684

685-
expect(writeTextStub).not.toBeCalled();
685+
expect(writeTextStub).not.toHaveBeenCalled();
686686
});
687687
});
688688

@@ -722,7 +722,7 @@ describe("Variant Analysis Manager", () => {
722722
variantAnalysis.id,
723723
);
724724

725-
expect(writeTextStub).toBeCalledTimes(1);
725+
expect(writeTextStub).toHaveBeenCalledTimes(1);
726726
});
727727

728728
it("should be valid JSON when put in object", async () => {

‎extensions/ql-vscode/test/vscode-tests/activated-extension/variant-analysis/variant-analysis-monitor.test.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ describe("Variant Analysis Monitor", () => {
121121
);
122122
await variantAnalysisMonitor.monitorVariantAnalysis(variantAnalysis);
123123

124-
expect(mockEecuteCommand).toBeCalledTimes(succeededRepos.length);
124+
expect(mockEecuteCommand).toHaveBeenCalledTimes(succeededRepos.length);
125125

126126
succeededRepos.forEach((succeededRepo, index) => {
127127
expect(mockEecuteCommand).toHaveBeenNthCalledWith(
@@ -197,8 +197,8 @@ describe("Variant Analysis Monitor", () => {
197197
it("should trigger a download extension command for each repo", async () => {
198198
await variantAnalysisMonitor.monitorVariantAnalysis(variantAnalysis);
199199

200-
expect(mockGetVariantAnalysis).toBeCalledTimes(4);
201-
expect(mockEecuteCommand).toBeCalledTimes(5);
200+
expect(mockGetVariantAnalysis).toHaveBeenCalledTimes(4);
201+
expect(mockEecuteCommand).toHaveBeenCalledTimes(5);
202202
});
203203
});
204204

@@ -261,7 +261,7 @@ describe("Variant Analysis Monitor", () => {
261261
it("should only trigger the warning once per error", async () => {
262262
await variantAnalysisMonitor.monitorVariantAnalysis(variantAnalysis);
263263

264-
expect(logger.showWarningMessage).toBeCalledTimes(4);
264+
expect(logger.showWarningMessage).toHaveBeenCalledTimes(4);
265265
expect(logger.showWarningMessage).toHaveBeenNthCalledWith(
266266
1,
267267
expect.stringMatching(/No internet connection/),
@@ -291,7 +291,7 @@ describe("Variant Analysis Monitor", () => {
291291
it("should not try to download any repos", async () => {
292292
await variantAnalysisMonitor.monitorVariantAnalysis(variantAnalysis);
293293

294-
expect(mockEecuteCommand).not.toBeCalled();
294+
expect(mockEecuteCommand).not.toHaveBeenCalled();
295295
});
296296
});
297297

‎extensions/ql-vscode/test/vscode-tests/cli-integration/variant-analysis/variant-analysis-manager.test.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -105,16 +105,16 @@ describe("Variant Analysis Manager", () => {
105105
cancellationTokenSource.token,
106106
);
107107

108-
expect(executeCommandSpy).toBeCalledWith(
108+
expect(executeCommandSpy).toHaveBeenCalledWith(
109109
"codeQL.monitorNewVariantAnalysis",
110110
expect.objectContaining({
111111
id: mockApiResponse.id,
112112
status: VariantAnalysisStatus.InProgress,
113113
}),
114114
);
115115

116-
expect(mockGetRepositoryFromNwo).toBeCalledTimes(1);
117-
expect(mockSubmitVariantAnalysis).toBeCalledTimes(1);
116+
expect(mockGetRepositoryFromNwo).toHaveBeenCalledTimes(1);
117+
expect(mockSubmitVariantAnalysis).toHaveBeenCalledTimes(1);
118118
});
119119

120120
it("should run a remote query that is not part of a qlpack", async () => {
@@ -126,16 +126,16 @@ describe("Variant Analysis Manager", () => {
126126
cancellationTokenSource.token,
127127
);
128128

129-
expect(executeCommandSpy).toBeCalledWith(
129+
expect(executeCommandSpy).toHaveBeenCalledWith(
130130
"codeQL.monitorNewVariantAnalysis",
131131
expect.objectContaining({
132132
id: mockApiResponse.id,
133133
status: VariantAnalysisStatus.InProgress,
134134
}),
135135
);
136136

137-
expect(mockGetRepositoryFromNwo).toBeCalledTimes(1);
138-
expect(mockSubmitVariantAnalysis).toBeCalledTimes(1);
137+
expect(mockGetRepositoryFromNwo).toHaveBeenCalledTimes(1);
138+
expect(mockSubmitVariantAnalysis).toHaveBeenCalledTimes(1);
139139
});
140140

141141
it("should run a remote query that is nested inside a qlpack", async () => {
@@ -147,16 +147,16 @@ describe("Variant Analysis Manager", () => {
147147
cancellationTokenSource.token,
148148
);
149149

150-
expect(executeCommandSpy).toBeCalledWith(
150+
expect(executeCommandSpy).toHaveBeenCalledWith(
151151
"codeQL.monitorNewVariantAnalysis",
152152
expect.objectContaining({
153153
id: mockApiResponse.id,
154154
status: VariantAnalysisStatus.InProgress,
155155
}),
156156
);
157157

158-
expect(mockGetRepositoryFromNwo).toBeCalledTimes(1);
159-
expect(mockSubmitVariantAnalysis).toBeCalledTimes(1);
158+
expect(mockGetRepositoryFromNwo).toHaveBeenCalledTimes(1);
159+
expect(mockSubmitVariantAnalysis).toHaveBeenCalledTimes(1);
160160
});
161161

162162
it("should cancel a run before uploading", async () => {
@@ -318,8 +318,8 @@ describe("Variant Analysis Manager", () => {
318318
cancellationTokenSource.token,
319319
);
320320

321-
expect(mockSubmitVariantAnalysis).toBeCalledTimes(1);
322-
expect(executeCommandSpy).toBeCalledWith(
321+
expect(mockSubmitVariantAnalysis).toHaveBeenCalledTimes(1);
322+
expect(executeCommandSpy).toHaveBeenCalledWith(
323323
"codeQL.monitorNewVariantAnalysis",
324324
expect.objectContaining({
325325
query: expect.objectContaining({ filePath: fileUri.fsPath }),

0 commit comments

Comments
 (0)