Use resetMocks option to reset mocks before every test

Author: koesie10

extensions/ql-vscode/src/vscode-tests/jest.config.base.ts

@@ -102,7 +102,7 @@ const config: Config = {
   // reporters: undefined,
 
   // Automatically reset mock state before every test
-  // resetMocks: false,
+  resetMocks: true,
 
   // Reset the module registry before running each individual test
   // resetModules: false,

extensions/ql-vscode/src/vscode-tests/jest.setup.ts

@@ -3,7 +3,3 @@ import { env } from "vscode";
 (env as any).openExternal = () => {
   /**/
 };
-
-afterAll(() => {
-  jest.restoreAllMocks();
-});

extensions/ql-vscode/src/vscode-tests/no-workspace/contextual/queryResolver.test.ts

@@ -28,18 +28,18 @@ describe("queryResolver", () => {
   };
 
   beforeEach(() => {
-    writeFileSpy.mockReset().mockImplementation(() => Promise.resolve());
+    writeFileSpy.mockImplementation(() => Promise.resolve());
 
-    getQlPackForDbschemeSpy.mockReset().mockResolvedValue({
+    getQlPackForDbschemeSpy.mockResolvedValue({
       dbschemePack: "dbschemePack",
       dbschemePackIsLibraryPack: false,
     });
-    getPrimaryDbschemeSpy.mockReset().mockResolvedValue("primaryDbscheme");
+    getPrimaryDbschemeSpy.mockResolvedValue("primaryDbscheme");
 
-    mockCli.resolveQueriesInSuite.mockReset();
-    mockCli.cliConstraints.supportsAllowLibraryPacksInResolveQueries
-      .mockReset()
-      .mockReturnValue(true);
+    mockCli.resolveQueriesInSuite;
+    mockCli.cliConstraints.supportsAllowLibraryPacksInResolveQueries.mockReturnValue(
+      true,
+    );
   });
 
   describe("resolveQueries", () => {

extensions/ql-vscode/src/vscode-tests/no-workspace/databaseFetcher.test.ts

@@ -25,9 +25,7 @@ describe("databaseFetcher", () => {
     } as unknown as Octokit.Octokit;
 
     beforeEach(() => {
-      quickPickSpy.mockReset().mockResolvedValue(undefined);
-      progressSpy.mockReset();
-      mockRequest.mockReset();
+      quickPickSpy.mockResolvedValue(undefined);
     });
 
     it("should convert a GitHub nwo to a database url", async () => {
@@ -135,8 +133,7 @@ describe("databaseFetcher", () => {
     const progressSpy = jest.fn();
 
     beforeEach(() => {
-      quickPickSpy.mockReset().mockResolvedValue(undefined);
-      progressSpy.mockReset();
+      quickPickSpy.mockResolvedValue(undefined);
     });
 
     it("should convert a project url to a database url", async () => {

extensions/ql-vscode/src/vscode-tests/no-workspace/distribution.test.ts

@@ -206,13 +206,13 @@ describe("Launcher path", () => {
   let launcherThatExists = "";
 
   beforeEach(() => {
-    warnSpy.mockClear().mockResolvedValue(undefined);
-    errorSpy.mockClear().mockResolvedValue(undefined);
-    logSpy.mockClear().mockResolvedValue(undefined);
-    pathExistsSpy.mockClear().mockImplementation(async (path: string) => {
+    warnSpy.mockResolvedValue(undefined);
+    errorSpy.mockResolvedValue(undefined);
+    logSpy.mockResolvedValue(undefined);
+    pathExistsSpy.mockImplementation(async (path: string) => {
       return path.endsWith(launcherThatExists);
     });
-    platformSpy.mockClear().mockReturnValue("win32");
+    platformSpy.mockReturnValue("win32");
   });
 
   it("should not warn with proper launcher name", async () => {

extensions/ql-vscode/src/vscode-tests/no-workspace/helpers.test.ts

@@ -401,7 +401,7 @@ describe("helpers", () => {
     );
 
     beforeEach(() => {
-      showInformationMessageSpy.mockClear().mockResolvedValue(undefined);
+      showInformationMessageSpy.mockResolvedValue(undefined);
     });
 
     const resolveArg =

extensions/ql-vscode/src/vscode-tests/no-workspace/query-history.test.ts

@@ -74,16 +74,12 @@ describe("query-history", () => {
   let variantAnalysisHistory: VariantAnalysisHistoryItem[];
 
   beforeEach(() => {
-    showTextDocumentSpy
-      .mockClear()
-      .mockResolvedValue(undefined as unknown as TextEditor);
+    showTextDocumentSpy.mockResolvedValue(undefined as unknown as TextEditor);
 
-    showInformationMessageSpy.mockClear().mockResolvedValue(undefined);
-    showQuickPickSpy.mockClear().mockResolvedValue(undefined);
-    executeCommandSpy.mockClear().mockResolvedValue(undefined);
-    logSpy.mockClear().mockResolvedValue(undefined);
-
-    doCompareCallback.mockReset();
+    showInformationMessageSpy.mockResolvedValue(undefined);
+    showQuickPickSpy.mockResolvedValue(undefined);
+    executeCommandSpy.mockResolvedValue(undefined);
+    logSpy.mockResolvedValue(undefined);
 
     tryOpenExternalFile = (QueryHistoryManager.prototype as any)
       .tryOpenExternalFile;
@@ -478,10 +474,10 @@ describe("query-history", () => {
               request: getOctokitStub,
             }),
         } as unknown as Credentials;
-        credentialsSpy.mockReset().mockResolvedValue(mockCredentials);
+        credentialsSpy.mockResolvedValue(mockCredentials);
 
-        mockCancelRemoteQuery.mockClear().mockResolvedValue();
-        getOctokitStub.mockClear();
+        mockCancelRemoteQuery.mockResolvedValue();
+        getOctokitStub;
       });
 
       describe("if the item is in progress", () => {

extensions/ql-vscode/src/vscode-tests/no-workspace/query-results.test.ts

@@ -190,7 +190,7 @@ describe("query-results", () => {
     const sourceInfo = {};
 
     beforeEach(() => {
-      spy.mockReset().mockReturnValue({ a: "1234" });
+      spy.mockReturnValue({ a: "1234" });
 
       mockServer = {
         interpretBqrsSarif: spy,

extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/export-results.test.ts

@@ -10,8 +10,10 @@ describe("export results", () => {
   describe("exportRemoteQueryAnalysisResults", () => {
     const mockCredentials = {} as unknown as Credentials;
 
-    jest.spyOn(markdownGenerator, "generateMarkdown").mockReturnValue([]);
-    jest.spyOn(Credentials, "initialize").mockResolvedValue(mockCredentials);
+    beforeEach(() => {
+      jest.spyOn(markdownGenerator, "generateMarkdown").mockReturnValue([]);
+      jest.spyOn(Credentials, "initialize").mockResolvedValue(mockCredentials);
+    });
 
     it("should call the GitHub Actions API with the correct gist title", async function () {
       const mockCreateGist = jest

extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/gh-api/gh-actions-api-client.test.ts

@@ -20,10 +20,6 @@ describe("gh-actions-api-client mock responses", () => {
       }),
   } as unknown as Credentials;
 
-  beforeEach(() => {
-    mockRequest.mockReset();
-  });
-
   describe("cancelRemoteQuery", () => {
     it("should cancel a remote query", async () => {
       mockRequest.mockReturnValue({ status: 202 });