Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 6 commits into from Sep 27, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ad0edd0
fix(Launcher): launcher.launch should pass 'timeout' option to browse…
bobpearson Nov 18, 2019
b9d9709
fix(Launcher): launcher.launch should pass 'timeout' option to browse…
bobpearson Nov 18, 2019
6130174
ishmal-launcher-pass-timeout: eslint
bobpearson Nov 18, 2019
a66bfd2
Merge remote-tracking branch 'origin/main' into pr5180
jschfflr Sep 15, 2021
0ad181a
Merge remote-tracking branch 'origin/main' into pr5180
jschfflr Sep 23, 2021
acbb55a
Merge branch 'main' into pr5180
jschfflr Sep 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/node/Launcher.ts
View file
Open in desktop
Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down
9 changes: 9 additions & 0 deletions test/launcher.spec.ts
View file
Open in desktop
Expand Up @@ -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, {
Expand Down