chore: make mock assertion compatible with jest (#778)

vitest-dev · Feb 18, 2022 · 7014c2b · 7014c2b
1 parent 65393f7
commit 7014c2b
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 76 deletions.
diff --git a/examples/mocks/package.json b/examples/mocks/package.json
@@ -14,11 +14,11 @@
   "dependencies": {
     "@vueuse/integrations": "^7.6.2",
     "axios": "^0.26.0",
-    "tinyspy": "^0.2.10"
+    "tinyspy": "^0.3.0"
   },
   "devDependencies": {
     "@vitest/ui": "latest",
     "vite": "latest",
     "vitest": "latest"
   }
-}
+}
diff --git a/packages/vitest/package.json b/packages/vitest/package.json
@@ -60,7 +60,7 @@
     "chai": "^4.3.6",
     "local-pkg": "^0.4.1",
     "tinypool": "^0.1.2",
-    "tinyspy": "^0.2.10",
+    "tinyspy": "^0.3.0",
     "vite": "^2.8.2"
   },
   "devDependencies": {
@@ -127,4 +127,4 @@
   "engines": {
     "node": ">=14.14.0"
   }
-}
+}
diff --git a/packages/vitest/src/integrations/jest-mock.ts b/packages/vitest/src/integrations/jest-mock.ts
@@ -103,8 +103,8 @@ export const spies = new Set<SpyInstance>()
 
 export function isMockFunction(fn: any): fn is EnhancedSpy {
   return typeof fn === 'function'
-  && '__isSpy' in fn
-  && fn.__isSpy
+  && '_isMockFunction' in fn
+  && fn._isMockFunction
 }
 
 export function spyOn<T, S extends Properties<Required<T>>>(

diff --git a/packages/vitest/src/node/mocker.ts b/packages/vitest/src/node/mocker.ts
@@ -186,7 +186,7 @@ export class VitestMocker {
       newObj[k] = this.mockObject(obj[k])
       const type = getObjectType(obj[k])
 
-      if (type.includes('Function') && !obj[k].__isSpy) {
+      if (type.includes('Function') && !obj[k]._isMockFunction) {
         this.spy.spyOn(newObj, k).mockImplementation(() => {})
         Object.defineProperty(newObj[k], 'length', { value: 0 }) // tinyspy retains length, but jest doesnt
       }

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml