Skip to content

Commit ab36153

Browse files
authored
Minor renames in variant analysis monitor tests (#3411)
* Rename mockGetVariantAnalysis -> mockGetVariantAnalysisFromApi * Rename mockEecuteCommand -> mockExecuteCommand
1 parent e861276 commit ab36153

File tree

1 file changed

+32
-32
lines changed

1 file changed

+32
-32
lines changed

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

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import { createMockLogger } from "../../../__mocks__/loggerMock";
2727
jest.setTimeout(60_000);
2828

2929
describe("Variant Analysis Monitor", () => {
30-
let mockGetVariantAnalysis: jest.SpiedFunction<
30+
let mockGetVariantAnalysisFromApi: jest.SpiedFunction<
3131
typeof ghApiClient.getVariantAnalysis
3232
>;
3333
let variantAnalysisMonitor: VariantAnalysisMonitor;
@@ -36,7 +36,7 @@ describe("Variant Analysis Monitor", () => {
3636
let variantAnalysis: VariantAnalysis;
3737

3838
const onVariantAnalysisChangeSpy = jest.fn();
39-
const mockEecuteCommand = jest.fn();
39+
const mockExecuteCommand = jest.fn();
4040

4141
let logger: NotificationLogger;
4242

@@ -51,7 +51,7 @@ describe("Variant Analysis Monitor", () => {
5151
variantAnalysisMonitor = new VariantAnalysisMonitor(
5252
createMockApp({
5353
commands: createMockCommandManager({
54-
executeCommand: mockEecuteCommand,
54+
executeCommand: mockExecuteCommand,
5555
}),
5656
logger,
5757
}),
@@ -60,7 +60,7 @@ describe("Variant Analysis Monitor", () => {
6060
);
6161
variantAnalysisMonitor.onVariantAnalysisChange(onVariantAnalysisChangeSpy);
6262

63-
mockGetVariantAnalysis = jest
63+
mockGetVariantAnalysisFromApi = jest
6464
.spyOn(ghApiClient, "getVariantAnalysis")
6565
.mockRejectedValue(new Error("Not mocked"));
6666

@@ -80,13 +80,13 @@ describe("Variant Analysis Monitor", () => {
8080

8181
beforeEach(async () => {
8282
mockFailedApiResponse = createFailedMockApiResponse();
83-
mockGetVariantAnalysis.mockResolvedValue(mockFailedApiResponse);
83+
mockGetVariantAnalysisFromApi.mockResolvedValue(mockFailedApiResponse);
8484
});
8585

8686
it("should mark as failed and stop monitoring", async () => {
8787
await variantAnalysisMonitor.monitorVariantAnalysis(variantAnalysis);
8888

89-
expect(mockGetVariantAnalysis).toHaveBeenCalledTimes(1);
89+
expect(mockGetVariantAnalysisFromApi).toHaveBeenCalledTimes(1);
9090

9191
expect(onVariantAnalysisChangeSpy).toHaveBeenCalledWith(
9292
expect.objectContaining({
@@ -115,7 +115,7 @@ describe("Variant Analysis Monitor", () => {
115115
"succeeded",
116116
]);
117117
mockApiResponse = createMockApiResponse("succeeded", scannedRepos);
118-
mockGetVariantAnalysis.mockResolvedValue(mockApiResponse);
118+
mockGetVariantAnalysisFromApi.mockResolvedValue(mockApiResponse);
119119
});
120120

121121
it("should trigger a download extension command for each repo", async () => {
@@ -124,10 +124,10 @@ describe("Variant Analysis Monitor", () => {
124124
);
125125
await variantAnalysisMonitor.monitorVariantAnalysis(variantAnalysis);
126126

127-
expect(mockEecuteCommand).toHaveBeenCalledTimes(succeededRepos.length);
127+
expect(mockExecuteCommand).toHaveBeenCalledTimes(succeededRepos.length);
128128

129129
succeededRepos.forEach((succeededRepo, index) => {
130-
expect(mockEecuteCommand).toHaveBeenNthCalledWith(
130+
expect(mockExecuteCommand).toHaveBeenNthCalledWith(
131131
index + 1,
132132
"codeQL.autoDownloadVariantAnalysisResult",
133133
mapScannedRepository(succeededRepo),
@@ -147,13 +147,13 @@ describe("Variant Analysis Monitor", () => {
147147
beforeEach(async () => {
148148
scannedRepos = createMockScannedRepos(["pending", "in_progress"]);
149149
mockApiResponse = createMockApiResponse("in_progress", scannedRepos);
150-
mockGetVariantAnalysis.mockResolvedValue(mockApiResponse);
150+
mockGetVariantAnalysisFromApi.mockResolvedValue(mockApiResponse);
151151
});
152152

153153
it("should succeed and not download any repos via a command", async () => {
154154
await variantAnalysisMonitor.monitorVariantAnalysis(variantAnalysis);
155155

156-
expect(mockEecuteCommand).not.toHaveBeenCalled();
156+
expect(mockExecuteCommand).not.toHaveBeenCalled();
157157
});
158158
});
159159

@@ -170,15 +170,15 @@ describe("Variant Analysis Monitor", () => {
170170
"pending",
171171
]);
172172
mockApiResponse = createMockApiResponse("in_progress", scannedRepos);
173-
mockGetVariantAnalysis.mockResolvedValueOnce(mockApiResponse);
173+
mockGetVariantAnalysisFromApi.mockResolvedValueOnce(mockApiResponse);
174174

175175
let nextApiResponse = {
176176
...mockApiResponse,
177177
scanned_repositories: [...scannedRepos.map((r) => ({ ...r }))],
178178
};
179179
nextApiResponse.scanned_repositories[0].analysis_status = "succeeded";
180180
nextApiResponse.scanned_repositories[1].analysis_status = "succeeded";
181-
mockGetVariantAnalysis.mockResolvedValueOnce(nextApiResponse);
181+
mockGetVariantAnalysisFromApi.mockResolvedValueOnce(nextApiResponse);
182182

183183
nextApiResponse = {
184184
...mockApiResponse,
@@ -188,7 +188,7 @@ describe("Variant Analysis Monitor", () => {
188188
};
189189
nextApiResponse.scanned_repositories[2].analysis_status = "succeeded";
190190
nextApiResponse.scanned_repositories[5].analysis_status = "succeeded";
191-
mockGetVariantAnalysis.mockResolvedValueOnce(nextApiResponse);
191+
mockGetVariantAnalysisFromApi.mockResolvedValueOnce(nextApiResponse);
192192

193193
nextApiResponse = {
194194
...mockApiResponse,
@@ -198,14 +198,14 @@ describe("Variant Analysis Monitor", () => {
198198
};
199199
nextApiResponse.scanned_repositories[3].analysis_status = "succeeded";
200200
nextApiResponse.scanned_repositories[4].analysis_status = "failed";
201-
mockGetVariantAnalysis.mockResolvedValueOnce(nextApiResponse);
201+
mockGetVariantAnalysisFromApi.mockResolvedValueOnce(nextApiResponse);
202202
});
203203

204204
it("should trigger a download extension command for each repo", async () => {
205205
await variantAnalysisMonitor.monitorVariantAnalysis(variantAnalysis);
206206

207-
expect(mockGetVariantAnalysis).toHaveBeenCalledTimes(4);
208-
expect(mockEecuteCommand).toHaveBeenCalledTimes(5);
207+
expect(mockGetVariantAnalysisFromApi).toHaveBeenCalledTimes(4);
208+
expect(mockExecuteCommand).toHaveBeenCalledTimes(5);
209209
});
210210
});
211211

@@ -222,15 +222,15 @@ describe("Variant Analysis Monitor", () => {
222222
"pending",
223223
]);
224224
mockApiResponse = createMockApiResponse("in_progress", scannedRepos);
225-
mockGetVariantAnalysis.mockResolvedValueOnce(mockApiResponse);
225+
mockGetVariantAnalysisFromApi.mockResolvedValueOnce(mockApiResponse);
226226

227-
mockGetVariantAnalysis.mockRejectedValueOnce(
227+
mockGetVariantAnalysisFromApi.mockRejectedValueOnce(
228228
new Error("No internet connection"),
229229
);
230-
mockGetVariantAnalysis.mockRejectedValueOnce(
230+
mockGetVariantAnalysisFromApi.mockRejectedValueOnce(
231231
new Error("No internet connection"),
232232
);
233-
mockGetVariantAnalysis.mockRejectedValueOnce(
233+
mockGetVariantAnalysisFromApi.mockRejectedValueOnce(
234234
new Error("My different error"),
235235
);
236236

@@ -241,15 +241,15 @@ describe("Variant Analysis Monitor", () => {
241241
nextApiResponse.scanned_repositories[0].analysis_status = "succeeded";
242242
nextApiResponse.scanned_repositories[1].analysis_status = "succeeded";
243243

244-
mockGetVariantAnalysis.mockResolvedValueOnce(nextApiResponse);
244+
mockGetVariantAnalysisFromApi.mockResolvedValueOnce(nextApiResponse);
245245

246-
mockGetVariantAnalysis.mockRejectedValueOnce(
246+
mockGetVariantAnalysisFromApi.mockRejectedValueOnce(
247247
new Error("My different error"),
248248
);
249-
mockGetVariantAnalysis.mockRejectedValueOnce(
249+
mockGetVariantAnalysisFromApi.mockRejectedValueOnce(
250250
new Error("My different error"),
251251
);
252-
mockGetVariantAnalysis.mockRejectedValueOnce(
252+
mockGetVariantAnalysisFromApi.mockRejectedValueOnce(
253253
new Error("Another different error"),
254254
);
255255

@@ -262,7 +262,7 @@ describe("Variant Analysis Monitor", () => {
262262
nextApiResponse.scanned_repositories[4].analysis_status = "failed";
263263
nextApiResponse.scanned_repositories[5].analysis_status = "succeeded";
264264
nextApiResponse.status = "succeeded";
265-
mockGetVariantAnalysis.mockResolvedValueOnce(nextApiResponse);
265+
mockGetVariantAnalysisFromApi.mockResolvedValueOnce(nextApiResponse);
266266
});
267267

268268
it("should only trigger the warning once per error", async () => {
@@ -292,13 +292,13 @@ describe("Variant Analysis Monitor", () => {
292292
beforeEach(async () => {
293293
scannedRepos = [];
294294
mockApiResponse = createMockApiResponse("succeeded", scannedRepos);
295-
mockGetVariantAnalysis.mockResolvedValue(mockApiResponse);
295+
mockGetVariantAnalysisFromApi.mockResolvedValue(mockApiResponse);
296296
});
297297

298298
it("should not try to download any repos", async () => {
299299
await variantAnalysisMonitor.monitorVariantAnalysis(variantAnalysis);
300300

301-
expect(mockEecuteCommand).not.toHaveBeenCalled();
301+
expect(mockExecuteCommand).not.toHaveBeenCalled();
302302
});
303303
});
304304

@@ -313,9 +313,9 @@ describe("Variant Analysis Monitor", () => {
313313
"pending",
314314
]);
315315
mockApiResponse = createMockApiResponse("in_progress", scannedRepos);
316-
mockGetVariantAnalysis.mockResolvedValueOnce(mockApiResponse);
316+
mockGetVariantAnalysisFromApi.mockResolvedValueOnce(mockApiResponse);
317317

318-
mockGetVariantAnalysis.mockRejectedValueOnce(
318+
mockGetVariantAnalysisFromApi.mockRejectedValueOnce(
319319
new RequestError("Not Found", 404, {
320320
request: {
321321
method: "GET",
@@ -336,7 +336,7 @@ describe("Variant Analysis Monitor", () => {
336336
it("should stop requesting the variant analysis", async () => {
337337
await variantAnalysisMonitor.monitorVariantAnalysis(variantAnalysis);
338338

339-
expect(mockGetVariantAnalysis).toHaveBeenCalledTimes(2);
339+
expect(mockGetVariantAnalysisFromApi).toHaveBeenCalledTimes(2);
340340
expect(logger.showWarningMessage).toHaveBeenCalledTimes(1);
341341
expect(logger.showWarningMessage).toHaveBeenCalledWith(
342342
expect.stringMatching(/not found/i),
@@ -350,7 +350,7 @@ describe("Variant Analysis Monitor", () => {
350350
VariantAnalysisStatus.Canceling,
351351
);
352352
mockApiResponse = createMockApiResponse("in_progress");
353-
mockGetVariantAnalysis.mockResolvedValue(mockApiResponse);
353+
mockGetVariantAnalysisFromApi.mockResolvedValue(mockApiResponse);
354354

355355
await variantAnalysisMonitor.monitorVariantAnalysis(variantAnalysis);
356356

0 commit comments

Comments
 (0)