refactor: update predicate function name

vitest-dev · Jul 11, 2024 · e6368b3 · e6368b3
1 parent 4a60233
commit e6368b3
Showing 1 changed file with 14 additions and 22 deletions.
diff --git a/packages/expect/src/jest-expect.ts b/packages/expect/src/jest-expect.ts
@@ -703,16 +703,20 @@ export const JestChaiExpect: ChaiPlugin = (chai, utils) => {
   /**
    * Used for `toHaveBeenCalledBefore` and `toHaveBeenCalledAfter` to determine if the expected spy was called before the result spy.
    */
-  function predicate(expectInvocationCallOrder: number[], resultInvocationCallOrder: number[], failIfNoFirstInvocation: number): boolean {
-    if (expectInvocationCallOrder.length === 0) {
+  function isSpyCalledBeforeAnotherSpy(beforeSpy: MockInstance, afterSpy: MockInstance, failIfNoFirstInvocation: number): boolean {
+    const beforeInvocationCallOrder = beforeSpy.mock.invocationCallOrder
+
+    const afterInvocationCallOrder = afterSpy.mock.invocationCallOrder
+
+    if (beforeInvocationCallOrder.length === 0) {
       return !failIfNoFirstInvocation
     }
 
-    if (resultInvocationCallOrder.length === 0) {
+    if (afterInvocationCallOrder.length === 0) {
       return false
     }
 
-    return expectInvocationCallOrder[0] < resultInvocationCallOrder[0]
+    return beforeInvocationCallOrder[0] < afterInvocationCallOrder[0]
   }
 
   def(
@@ -726,16 +730,10 @@ export const JestChaiExpect: ChaiPlugin = (chai, utils) => {
         )
       }
 
-      if (!isMockFunction(expectSpy)) {
-        throw new TypeError(
-          `${utils.inspect(expectSpy)} is not a spy or a call to a spy`,
-        )
-      }
-
       this.assert(
-        predicate(
-          expectSpy.mock.invocationCallOrder,
-          resultSpy.mock.invocationCallOrder,
+        isSpyCalledBeforeAnotherSpy(
+          expectSpy,
+          resultSpy,
           failIfNoFirstInvocation,
         ),
         `expected "${expectSpy.getMockName()}" to have been called before "${resultSpy.getMockName()}"`,
@@ -756,16 +754,10 @@ export const JestChaiExpect: ChaiPlugin = (chai, utils) => {
         )
       }
 
-      if (!isMockFunction(expectSpy)) {
-        throw new TypeError(
-          `${utils.inspect(expectSpy)} is not a spy or a call to a spy`,
-        )
-      }
-
       this.assert(
-        predicate(
-          resultSpy.mock.invocationCallOrder,
-          expectSpy.mock.invocationCallOrder,
+        isSpyCalledBeforeAnotherSpy(
+          resultSpy,
+          expectSpy,
           failIfNoFirstInvocation,
         ),
         `expected "${expectSpy.getMockName()}" to have been called after "${resultSpy.getMockName()}"`,