refactor(async-utils): only advance timers on a single timeoutController

testing-library · Sep 19, 2021 · d623572 · d623572
1 parent 972981a
commit d623572
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/core/asyncUtils.ts b/src/core/asyncUtils.ts
@@ -23,11 +23,11 @@ function asyncUtils(act: Act, addResolver: (callback: () => void) => void): Asyn
       return callbackResult ?? callbackResult === undefined
     }
 
-    const timeoutController = createTimeoutController(timeout, { allowFakeTimers: !interval })
+    const timeoutController = createTimeoutController(timeout, { allowFakeTimers: true })
 
     const waitForResult = async () => {
       while (true) {
-        const intervalController = createTimeoutController(interval, { allowFakeTimers: true })
+        const intervalController = createTimeoutController(interval)
         timeoutController.onTimeout(() => intervalController.cancel())
 
         await intervalController.wrap(new Promise<void>(addResolver))

diff --git a/src/helpers/createTimeoutController.ts b/src/helpers/createTimeoutController.ts
@@ -1,12 +1,10 @@
 import { fakeTimersAreEnabled, advanceTimers } from './fakeTimers'
 
-function createTimeoutController(timeout: number | false, options: { allowFakeTimers: boolean }) {
+function createTimeoutController(timeout: number | false, { allowFakeTimers = false } = {}) {
   let timeoutId: NodeJS.Timeout
   const timeoutCallbacks: Array<() => void> = []
   let finished = false
 
-  const { allowFakeTimers } = options
-
   const timeoutController = {
     onTimeout(callback: () => void) {
       timeoutCallbacks.push(callback)
@@ -23,7 +21,7 @@ function createTimeoutController(timeout: number | false, options: { allowFakeTi
             resolve()
           }, timeout)
         }
-        
+
         if (fakeTimersAreEnabled() && allowFakeTimers) {
           advanceTimers(() => finished)
         }