Skip to content

Ensure configured user agent and/or window size is applied to all pages. #1862

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

Merged
DavertMik merged 1 commit into from
Sep 6, 2019
Merged

Ensure configured user agent and/or window size is applied to all pages. #1862

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions lib/helper/Puppeteer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,16 +439,7 @@ class Puppeteer extends Helper {
await this._setPage(mainPage);
await this.closeOtherTabs();

if (this.options.windowSize && this.options.windowSize.indexOf('x') > 0) {
const dimensions = this.options.windowSize.split('x');
await this.resizeWindow(parseInt(dimensions[0], 10), parseInt(dimensions[1], 10));
}

this.isRunning = true;

if (this.options.userAgent) {
await this.page.setUserAgent(this.options.userAgent);
}
}

async _stopBrowser() {
Expand Down Expand Up @@ -2299,7 +2290,7 @@ function $XPath(element, selector) {
return res;
}

function targetCreatedHandler(page) {
async function targetCreatedHandler(page) {
if (!page) return;
this.withinLocator = null;
page.on('load', (frame) => {
Expand All @@ -2311,4 +2302,14 @@ function targetCreatedHandler(page) {
this.debugSection(`Browser:${ucfirst(msg.type())}`, (msg._text || '') + msg.args().join(' '));
consoleLogStore.add(msg);
});

if (this.options.userAgent) {
await page.setUserAgent(this.options.userAgent);
}
if (this.options.windowSize && this.options.windowSize.indexOf('x') > 0) {
const dimensions = this.options.windowSize.split('x');
const width = parseInt(dimensions[0], 10);
const height = parseInt(dimensions[1], 10);
await page.setViewport({ width, height });
}
}