Add vi.spyOn and clean up some mock function binding calls (#3376)

* Add vi.spyOn and clean up some binding calls

* add vi.restoreAllMocks

* remove junk file

---------

Co-authored-by: Jarred Sumner <jarred@jarredsumner.com>

4 files changed, 31 insertions, 3 deletions

diff --git a/test/bun.lockb b/test/bun.lockb
index fc86845e1..a26f2fdfe 100755
--- a/test/bun.lockb
+++ b/test/bun.lockb
diff --git a/test/js/bun/test/mock-fn.test.js b/test/js/bun/test/mock-fn.test.js
index eac981fd1..8504e3d70 100644
--- a/test/js/bun/test/mock-fn.test.js
+++ b/test/js/bun/test/mock-fn.test.js
@@ -2,7 +2,16 @@
  * This file is meant to be runnable in both Jest and Bun.
  * `bunx jest mock-fn.test.js`
  */
-var { isBun, test, describe, expect, jest, vi, mock, bunTest, spyOn } = require("./test-interop.js")();
+var { isBun, expect, jest, vi, mock, spyOn } = require("./test-interop.js")();
+
+// if you want to test vitest, comment the above and uncomment the below
+
+// import { expect, describe, test, vi } from "vitest";
+// const isBun = false;
+// const jest = { fn: vi.fn, restoreAllMocks: vi.restoreAllMocks };
+// const spyOn = vi.spyOn;
+// import * as extended from "jest-extended";
+// expect.extend(extended);
 
 async function expectResolves(promise) {
   expect(promise).toBeInstanceOf(Promise);
@@ -434,7 +443,6 @@ describe("mock()", () => {
         return "3";
       },
     );
-    expect(result).toBe(undefined);
     expect(fn()).toBe("1");
   });
   test("withImplementation (async)", async () => {
diff --git a/test/js/bun/test/test-interop.js b/test/js/bun/test/test-interop.js
index 5c41082d6..4b2199ae9 100644
--- a/test/js/bun/test/test-interop.js
+++ b/test/js/bun/test/test-interop.js
@@ -20,6 +20,25 @@ module.exports = () => {
       vi: bunTest.vi,
       spyOn: bunTest.spyOn,
     };
+  } else if (process.env.VITEST) {
+    const vi = require("vitest");
+
+    return {
+      isBun: false,
+      bunTest: null,
+      test: vi.test,
+      describe: vi.describe,
+      it: vi.it,
+      expect: vi.expect,
+      beforeEach: vi.beforeEach,
+      afterEach: vi.afterEach,
+      beforeAll: vi.beforeAll,
+      afterAll: vi.afterAll,
+      jest: { fn: vi.fn },
+      mock: null,
+      vi,
+      spyOn: vi.spyOn,
+    };
   } else {
     const globals = require("@jest/globals");
     const extended = require("jest-extended");
diff --git a/test/package.json b/test/package.json
index a9b8db913..480305013 100644
--- a/test/package.json
+++ b/test/package.json
@@ -22,7 +22,8 @@
     "supertest": "^6.1.6",
     "svelte": "^3.55.1",
     "typescript": "^5.0.2",
-    "undici": "^5.20.0"
+    "undici": "^5.20.0",
+    "vitest": "^0.32.2"
   },
   "private": true,
   "scripts": {