Remove unnecessary calls to mockReset

Author: koesie10

extensions/ql-vscode/src/vscode-tests/cli-integration/databases.test.ts

@@ -29,8 +29,7 @@ describe("Databases", () => {
   jest.spyOn(window, "showInformationMessage").mockResolvedValue(undefined);
 
   beforeEach(async () => {
-    inputBoxStub.mockReset().mockResolvedValue(undefined);
-    progressCallback.mockReset();
+    inputBoxStub.mockResolvedValue(undefined);
 
     const extension = await extensions
       .getExtension<CodeQLExtensionInterface | Record<string, never>>(

extensions/ql-vscode/src/vscode-tests/cli-integration/packaging.test.ts

@@ -29,11 +29,10 @@ describe("Packaging commands", () => {
   );
 
   beforeEach(async () => {
-    progress.mockReset();
-    quickPickSpy.mockReset().mockResolvedValue(undefined);
-    inputBoxSpy.mockReset().mockResolvedValue(undefined);
-    showAndLogErrorMessageSpy.mockReset().mockResolvedValue(undefined);
-    showAndLogInformationMessageSpy.mockReset().mockResolvedValue(undefined);
+    quickPickSpy.mockResolvedValue(undefined);
+    inputBoxSpy.mockResolvedValue(undefined);
+    showAndLogErrorMessageSpy.mockResolvedValue(undefined);
+    showAndLogInformationMessageSpy.mockResolvedValue(undefined);
 
     const extension = await extensions
       .getExtension<CodeQLExtensionInterface | Record<string, never>>(

extensions/ql-vscode/src/vscode-tests/cli-integration/queries.test.ts

@@ -64,7 +64,6 @@ describeWithCodeQL()("Queries", () => {
     safeDel(qlFile);
     safeDel(qlpackFile);
 
-    progress.mockReset();
     token = {} as CancellationToken;
 
     // Add a database, but make sure the database manager is empty first

extensions/ql-vscode/src/vscode-tests/cli-integration/remote-queries/remote-queries-manager.test.ts

@@ -86,11 +86,8 @@ describe("Remote queries", () => {
 
     cancellationTokenSource = new CancellationTokenSource();
 
-    progress.mockReset();
-
     // Should not have asked for a language
     showQuickPickSpy
-      .mockReset()
       .mockResolvedValueOnce({
         repositories: ["github/vscode-codeql"],
       } as unknown as QuickPickItem)
@@ -102,7 +99,7 @@ describe("Remote queries", () => {
       full_name: "github/vscode-codeql",
       private: false,
     };
-    getRepositoryFromNwoStub.mockReset().mockResolvedValue(dummyRepository);
+    getRepositoryFromNwoStub.mockResolvedValue(dummyRepository);
 
     // always run in the vscode-codeql repo
     await setRemoteControllerRepo("github/vscode-codeql");
@@ -137,7 +134,7 @@ describe("Remote queries", () => {
     const executeCommandSpy = jest.spyOn(commands, "executeCommand");
 
     beforeEach(() => {
-      mockSubmitRemoteQueries.mockReset().mockResolvedValue({
+      mockSubmitRemoteQueries.mockResolvedValue({
         workflow_run_id: 20,
         repositories_queried: ["octodemo/hello-world-1"],
       });

extensions/ql-vscode/src/vscode-tests/cli-integration/remote-queries/variant-analysis-manager.test.ts

@@ -136,10 +136,9 @@ describe("Variant Analysis Manager", () => {
     beforeEach(async () => {
       writeFileStub.mockRestore();
 
-      progress.mockReset();
       // Should not have asked for a language
       showQuickPickSpy
-        .mockReset()
+
         .mockResolvedValueOnce({
           repositories: ["github/vscode-codeql"],
         } as unknown as QuickPickItem)
@@ -155,10 +154,10 @@ describe("Variant Analysis Manager", () => {
         full_name: "github/vscode-codeql",
         private: false,
       };
-      mockGetRepositoryFromNwo.mockReset().mockResolvedValue(dummyRepository);
+      mockGetRepositoryFromNwo.mockResolvedValue(dummyRepository);
 
       mockApiResponse = createMockApiResponse("in_progress");
-      mockSubmitVariantAnalysis.mockReset().mockResolvedValue(mockApiResponse);
+      mockSubmitVariantAnalysis.mockResolvedValue(mockApiResponse);
 
       // always run in the vscode-codeql repo
       await setRemoteControllerRepo("github/vscode-codeql");
@@ -266,7 +265,7 @@ describe("Variant Analysis Manager", () => {
     describe("when the directory does not exist", () => {
       beforeEach(() => {
         const originalFs = jest.requireActual<typeof fs>("fs-extras");
-        pathExistsStub.mockReset().mockImplementation((...args) => {
+        pathExistsStub.mockImplementation((...args) => {
           if (
             args[0] === path.join(storagePath, variantAnalysis.id.toString())
           ) {
@@ -292,7 +291,7 @@ describe("Variant Analysis Manager", () => {
     describe("when the directory exists", () => {
       beforeEach(() => {
         const originalFs = jest.requireActual<typeof fs>("fs-extras");
-        pathExistsStub.mockReset().mockImplementation((...args) => {
+        pathExistsStub.mockImplementation((...args) => {
           if (
             args[0] === path.join(storagePath, variantAnalysis.id.toString())
           ) {
@@ -443,8 +442,8 @@ describe("Variant Analysis Manager", () => {
       );
       arrayBuffer = fs.readFileSync(sourceFilePath).buffer;
 
-      getVariantAnalysisRepoStub.mockReset();
-      getVariantAnalysisRepoResultStub.mockReset();
+      getVariantAnalysisRepoStub;
+      getVariantAnalysisRepoResultStub;
     });
 
     describe("when the artifact_url is missing", () => {
@@ -658,7 +657,7 @@ describe("Variant Analysis Manager", () => {
           // the methods are called.
 
           const originalFs = jest.requireActual<typeof fs>("fs-extras");
-          pathExistsStub.mockReset().mockImplementation((...args) => {
+          pathExistsStub.mockImplementation((...args) => {
             if (
               args[0] === path.join(storagePath, variantAnalysis.id.toString())
             ) {
@@ -774,8 +773,8 @@ describe("Variant Analysis Manager", () => {
 
         beforeEach(async () => {
           dummyVariantAnalysis = createMockVariantAnalysis({});
-          removeAnalysisResultsStub.mockReset().mockReturnValue(undefined);
-          removeStorageStub.mockReset().mockReturnValue(undefined);
+          removeAnalysisResultsStub.mockReturnValue(undefined);
+          removeStorageStub.mockReturnValue(undefined);
         });
 
         it("should remove variant analysis", async () => {
@@ -804,12 +803,12 @@ describe("Variant Analysis Manager", () => {
     beforeEach(() => {
       variantAnalysis = createMockVariantAnalysis({});
 
-      variantAnalysisRemovedSpy.mockReset();
+      variantAnalysisRemovedSpy;
       variantAnalysisManager.onVariantAnalysisRemoved(
         variantAnalysisRemovedSpy,
       );
 
-      executeCommandSpy.mockReset().mockResolvedValue(undefined);
+      executeCommandSpy.mockResolvedValue(undefined);
     });
 
     describe("when variant analysis record doesn't exist", () => {
@@ -900,7 +899,7 @@ describe("Variant Analysis Manager", () => {
     beforeEach(async () => {
       variantAnalysis = createMockVariantAnalysis({});
 
-      mockCancelVariantAnalysis.mockReset().mockResolvedValue(undefined);
+      mockCancelVariantAnalysis.mockResolvedValue(undefined);
 
       variantAnalysisStorageLocation =
         variantAnalysisManager.getVariantAnalysisStorageLocation(
@@ -1003,7 +1002,7 @@ describe("Variant Analysis Manager", () => {
       await createTimestampFile(variantAnalysisStorageLocation);
       await variantAnalysisManager.rehydrateVariantAnalysis(variantAnalysis);
 
-      writeTextStub.mockReset();
+      writeTextStub;
       jest.spyOn(env, "clipboard", "get").mockReturnValue({
         readText: jest.fn(),
         writeText: writeTextStub,

extensions/ql-vscode/src/vscode-tests/cli-integration/remote-queries/variant-analysis-monitor.test.ts

@@ -72,9 +72,7 @@ describe("Variant Analysis Monitor", () => {
       .spyOn(variantAnalysisManager, "autoDownloadVariantAnalysisResult")
       .mockResolvedValue(undefined);
 
-    mockGetVariantAnalysis
-      .mockReset()
-      .mockRejectedValue(new Error("Not mocked"));
+    mockGetVariantAnalysis.mockRejectedValue(new Error("Not mocked"));
 
     limitNumberOfAttemptsToMonitor();
   });

extensions/ql-vscode/src/vscode-tests/cli-integration/remote-queries/variant-analysis-results-manager.test.ts

@@ -112,16 +112,14 @@ describe(VariantAnalysisResultsManager.name, () => {
         );
         arrayBuffer = fs.readFileSync(sourceFilePath).buffer;
 
-        getVariantAnalysisRepoResultStub
-          .mockReset()
-          .mockImplementation(
-            (_credentials: Credentials, downloadUrl: string) => {
-              if (downloadUrl === dummyRepoTask.artifactUrl) {
-                return Promise.resolve(arrayBuffer);
-              }
-              return Promise.reject(new Error("Unexpected artifact URL"));
-            },
-          );
+        getVariantAnalysisRepoResultStub.mockImplementation(
+          (_credentials: Credentials, downloadUrl: string) => {
+            if (downloadUrl === dummyRepoTask.artifactUrl) {
+              return Promise.resolve(arrayBuffer);
+            }
+            return Promise.reject(new Error("Unexpected artifact URL"));
+          },
+        );
       });
 
       it("should call the API to download the results", async () => {

extensions/ql-vscode/src/vscode-tests/cli-integration/remote-queries/variant-analysis-submission-integration.test.ts

@@ -50,11 +50,11 @@ describe("Variant Analysis Submission Integration", () => {
 
     await config.setRemoteControllerRepo("github/vscode-codeql");
 
-    quickPickSpy.mockReset().mockResolvedValue(undefined);
-    inputBoxSpy.mockReset().mockResolvedValue(undefined);
+    quickPickSpy.mockResolvedValue(undefined);
+    inputBoxSpy.mockResolvedValue(undefined);
 
     executeCommandSpy.mockRestore();
-    showErrorMessageSpy.mockReset().mockResolvedValue(undefined);
+    showErrorMessageSpy.mockResolvedValue(undefined);
 
     await extensions
       .getExtension<CodeQLExtensionInterface | Record<string, never>>(