refactor(async-utils): simplify fake timer advancement logic

Author: mpeyper

src/helpers/createTimeoutController.ts

@@ -17,14 +17,15 @@ function createTimeoutController(timeout: number | false, options: { allowFakeTi
         timeoutController.onTimeout(resolve)
         if (timeout) {
           timeoutId = setTimeout(() => {
+            finished = true
             timeoutController.timedOut = true
             timeoutCallbacks.forEach((callback) => callback())
             resolve()
           }, timeout)
         }
 
         if (fakeTimersAreEnabled() && allowFakeTimers) {
-          advanceTimers(timeout, () => finished)
+          advanceTimers(() => finished)
         }
 
         promise

src/helpers/fakeTimers.ts

@@ -12,18 +12,13 @@ export const fakeTimersAreEnabled = () => {
   return false
 }
 
-export function advanceTimers(timeout: number | false, checkComplete: () => boolean) {
-  const advanceTime = async (currentMs: number) => {
-    if (!timeout || currentMs < timeout) {
+export function advanceTimers(checkComplete: () => boolean) {
+  const advanceTime = async () => {
+    if (!checkComplete()) {
       jest.advanceTimersByTime(1)
-
       await Promise.resolve()
-
-      if (checkComplete()) {
-        return
-      }
-      await advanceTime(currentMs + 1)
+      await advanceTime()
     }
   }
-  return advanceTime(0)
+  return advanceTime()
 }