fix(launcher): launcher.launch() should pass 'timeout' option #5180 (#…

…7596) Co-authored-by: Bob Jamison <bob.jamison@pearson.com>
puppeteer · Sep 27, 2021 · 113489d · 113489d
1 parent f2e1927
commit 113489d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/node/Launcher.ts b/src/node/Launcher.ts
@@ -164,7 +164,7 @@ class ChromeLauncher implements ProductLauncher {
         runner.close.bind(runner)
       );
       if (waitForInitialPage)
-        await browser.waitForTarget((t) => t.type() === 'page');
+        await browser.waitForTarget((t) => t.type() === 'page', { timeout });
       return browser;
     } catch (error) {
       runner.kill();
@@ -336,7 +336,7 @@ class FirefoxLauncher implements ProductLauncher {
         runner.close.bind(runner)
       );
       if (waitForInitialPage)
-        await browser.waitForTarget((t) => t.type() === 'page');
+        await browser.waitForTarget((t) => t.type() === 'page', { timeout });
       return browser;
     } catch (error) {
       runner.kill();

diff --git a/test/launcher.spec.ts b/test/launcher.spec.ts
@@ -392,6 +392,15 @@ describe('Launcher specs', function () {
           await browser.close();
         }
       );
+      it('should pass the timeout parameter to browser.waitForTarget', async () => {
+        const { puppeteer, defaultBrowserOptions } = getTestState();
+        const options = Object.assign({}, defaultBrowserOptions, {
+          timeout: 1,
+        });
+        let error = null;
+        await puppeteer.launch(options).catch((error_) => (error = error_));
+        expect(error).toBeInstanceOf(puppeteer.errors.TimeoutError);
+      });
       it('should set the default viewport', async () => {
         const { puppeteer, defaultBrowserOptions } = getTestState();
         const options = Object.assign({}, defaultBrowserOptions, {