fix: forward timeout waitForFileChooser

puppeteer · Aug 29, 2022 · 05e9550 · 05e9550
1 parent e2d9858
commit 05e9550
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/common/Page.ts b/src/common/Page.ts
@@ -770,7 +770,8 @@ export class Page extends EventEmitter {
 
     const {timeout = this.#timeoutSettings.timeout()} = options;
     const promise = createDeferredPromiseWithTimer<FileChooser>(
-      `Waiting for \`FileChooser\` failed: ${timeout}ms exceeded`
+      `Waiting for \`FileChooser\` failed: ${timeout}ms exceeded`,
+      timeout
     );
     this.#fileChooserPromises.add(promise);
     return promise.catch(error => {

diff --git a/src/util/DeferredPromise.ts b/src/util/DeferredPromise.ts
@@ -31,10 +31,13 @@ export function createDeferredPromiseWithTimer<T>(
     resolver = resolve;
     rejector = reject;
   });
-  const timeoutId = setTimeout(() => {
-    isRejected = true;
-    rejector(new TimeoutError(timeoutMessage));
-  }, timeout);
+  const timeoutId =
+    timeout > 0
+      ? setTimeout(() => {
+          isRejected = true;
+          rejector(new TimeoutError(timeoutMessage));
+        }, timeout)
+      : undefined;
   return Object.assign(taskPromise, {
     resolved: () => {
       return isResolved;