change logic

Author: KevinBonHubspot

src/wait-for.js

@@ -81,15 +81,15 @@ function waitFor(
           jest.advanceTimersByTime(interval)
         })
 
+        // Could have timed-out
+        if (finished) {
+          break
+        }
         // It's really important that checkCallback is run *before* we flush
         // in-flight promises. To be honest, I'm not sure why, and I can't quite
         // think of a way to reproduce the problem in a test, but I spent
         // an entire day banging my head against a wall on this.
         checkCallback()
-
-        if (finished) {
-          break
-        }
       }
     } else {
       try {
@@ -106,9 +106,6 @@ function waitFor(
     }
 
     function onDone(error, result) {
-      if (finished) {
-        return
-      }
       finished = true
       clearTimeout(overallTimeoutTimer)
 
@@ -137,7 +134,7 @@ function waitFor(
     }
 
     function checkCallback() {
-      if (finished || promiseStatus === 'pending') return
+      if (promiseStatus === 'pending') return
       try {
         const result = runWithExpensiveErrorDiagnosticsDisabled(callback)
         if (typeof result?.then === 'function') {
@@ -163,9 +160,6 @@ function waitFor(
     }
 
     function handleTimeout() {
-      if (finished) {
-        return
-      }
       let error
       if (lastError) {
         error = lastError