chore: use launch helper (#10344)

This commit is contained in:
Nikolay Vitkov 2023-06-12 10:44:18 +02:00 committed by GitHub
parent d89072a368
commit e3e68a99d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 824 additions and 682 deletions

View File

@ -15,7 +15,7 @@ module.exports = {
files: ['*.spec.ts'], files: ['*.spec.ts'],
rules: { rules: {
'no-restricted-syntax': [ 'no-restricted-syntax': [
'warn', 'error',
{ {
message: message:
'Use helper command `launch` to make sure the browsers get cleaned', 'Use helper command `launch` to make sure the browsers get cleaned',

View File

@ -401,6 +401,12 @@
"parameters": ["webDriverBiDi"], "parameters": ["webDriverBiDi"],
"expectations": ["PASS"] "expectations": ["PASS"]
}, },
{
"testIdPattern": "[launcher.spec] Launcher specs Puppeteer Puppeteer.launch should be able to launch Firefox",
"platforms": ["darwin", "linux", "win32"],
"parameters": ["chrome"],
"expectations": ["SKIP"]
},
{ {
"testIdPattern": "[launcher.spec] Launcher specs Puppeteer Puppeteer.launch should work with no default arguments", "testIdPattern": "[launcher.spec] Launcher specs Puppeteer Puppeteer.launch should work with no default arguments",
"platforms": ["darwin", "linux", "win32"], "platforms": ["darwin", "linux", "win32"],
@ -1145,12 +1151,6 @@
"parameters": ["cdp", "firefox"], "parameters": ["cdp", "firefox"],
"expectations": ["SKIP"] "expectations": ["SKIP"]
}, },
{
"testIdPattern": "[launcher.spec] Launcher specs Puppeteer Puppeteer.launch should be able to launch Firefox",
"platforms": ["darwin", "linux", "win32"],
"parameters": ["cdp", "chrome"],
"expectations": ["FAIL"]
},
{ {
"testIdPattern": "[launcher.spec] Launcher specs Puppeteer Puppeteer.launch should be able to launch Firefox", "testIdPattern": "[launcher.spec] Launcher specs Puppeteer Puppeteer.launch should be able to launch Firefox",
"platforms": ["darwin", "linux", "win32"], "platforms": ["darwin", "linux", "win32"],

View File

@ -15,46 +15,39 @@
*/ */
import expect from 'expect'; import expect from 'expect';
import { import {CDPBrowser} from 'puppeteer-core/internal/common/Browser.js';
CDPBrowser,
CDPBrowserContext,
} from 'puppeteer-core/internal/common/Browser.js';
import {getTestState} from './mocha-utils'; // eslint-disable-line import/extensions import {getTestState, launch} from './mocha-utils.js';
import {attachFrame} from './utils.js'; import {attachFrame} from './utils.js';
describe('TargetManager', () => { describe('TargetManager', () => {
/* We use a special browser for this test as we need the --site-per-process flag */ /* We use a special browser for this test as we need the --site-per-process flag */
let browser: CDPBrowser; let testState: Awaited<ReturnType<typeof launch>> & {
let context: CDPBrowserContext; browser: CDPBrowser;
};
before(async () => { beforeEach(async () => {
const {puppeteer, defaultBrowserOptions} = getTestState(); const {defaultBrowserOptions} = getTestState();
browser = (await puppeteer.launch( testState = (await launch(
Object.assign({}, defaultBrowserOptions, { Object.assign({}, defaultBrowserOptions, {
args: (defaultBrowserOptions.args || []).concat([ args: (defaultBrowserOptions.args || []).concat([
'--site-per-process', '--site-per-process',
'--remote-debugging-port=21222', '--remote-debugging-port=21222',
'--host-rules=MAP * 127.0.0.1', '--host-rules=MAP * 127.0.0.1',
]), ]),
}) }),
)) as CDPBrowser; {createPage: false}
}); )) as Awaited<ReturnType<typeof launch>> & {
browser: CDPBrowser;
beforeEach(async () => { };
context = await browser.createIncognitoBrowserContext();
}); });
afterEach(async () => { afterEach(async () => {
await context.close(); await testState.close();
});
after(async () => {
await browser.close();
}); });
it('should handle targets', async () => { it('should handle targets', async () => {
const {server} = getTestState(); const {server, context, browser} = testState;
const targetManager = browser._targetManager(); const targetManager = browser._targetManager();
expect(targetManager.getAvailableTargets().size).toBe(2); expect(targetManager.getAvailableTargets().size).toBe(2);

View File

@ -19,6 +19,7 @@ import expect from 'expect';
import { import {
getTestState, getTestState,
launch,
setupTestBrowserHooks, setupTestBrowserHooks,
setupTestPageAndContextHooks, setupTestPageAndContextHooks,
} from './mocha-utils.js'; } from './mocha-utils.js';
@ -29,11 +30,12 @@ describe('Chromium-Specific Launcher tests', function () {
it('should be able to connect using browserUrl, with and without trailing slash', async () => { it('should be able to connect using browserUrl, with and without trailing slash', async () => {
const {defaultBrowserOptions, puppeteer} = getTestState(); const {defaultBrowserOptions, puppeteer} = getTestState();
const originalBrowser = await puppeteer.launch( const {close} = await launch(
Object.assign({}, defaultBrowserOptions, { Object.assign({}, defaultBrowserOptions, {
args: ['--remote-debugging-port=21222'], args: ['--remote-debugging-port=21222'],
}) })
); );
try {
const browserURL = 'http://127.0.0.1:21222'; const browserURL = 'http://127.0.0.1:21222';
const browser1 = await puppeteer.connect({browserURL}); const browser1 = await puppeteer.connect({browserURL});
@ -55,23 +57,26 @@ describe('Chromium-Specific Launcher tests', function () {
}) })
).toBe(56); ).toBe(56);
browser2.disconnect(); browser2.disconnect();
await originalBrowser.close(); } finally {
await close();
}
}); });
it('should throw when using both browserWSEndpoint and browserURL', async () => { it('should throw when using both browserWSEndpoint and browserURL', async () => {
const {defaultBrowserOptions, puppeteer} = getTestState(); const {defaultBrowserOptions, puppeteer} = getTestState();
const originalBrowser = await puppeteer.launch( const {browser, close} = await launch(
Object.assign({}, defaultBrowserOptions, { Object.assign({}, defaultBrowserOptions, {
args: ['--remote-debugging-port=21222'], args: ['--remote-debugging-port=21222'],
}) })
); );
try {
const browserURL = 'http://127.0.0.1:21222'; const browserURL = 'http://127.0.0.1:21222';
let error!: Error; let error!: Error;
await puppeteer await puppeteer
.connect({ .connect({
browserURL, browserURL,
browserWSEndpoint: originalBrowser.wsEndpoint(), browserWSEndpoint: browser.wsEndpoint(),
}) })
.catch(error_ => { .catch(error_ => {
return (error = error_); return (error = error_);
@ -79,17 +84,19 @@ describe('Chromium-Specific Launcher tests', function () {
expect(error.message).toContain( expect(error.message).toContain(
'Exactly one of browserWSEndpoint, browserURL or transport' 'Exactly one of browserWSEndpoint, browserURL or transport'
); );
} finally {
await originalBrowser.close(); await close();
}
}); });
it('should throw when trying to connect to non-existing browser', async () => { it('should throw when trying to connect to non-existing browser', async () => {
const {defaultBrowserOptions, puppeteer} = getTestState(); const {defaultBrowserOptions, puppeteer} = getTestState();
const originalBrowser = await puppeteer.launch( const {close} = await launch(
Object.assign({}, defaultBrowserOptions, { Object.assign({}, defaultBrowserOptions, {
args: ['--remote-debugging-port=21222'], args: ['--remote-debugging-port=21222'],
}) })
); );
try {
const browserURL = 'http://127.0.0.1:32333'; const browserURL = 'http://127.0.0.1:32333';
let error!: Error; let error!: Error;
@ -99,41 +106,53 @@ describe('Chromium-Specific Launcher tests', function () {
expect(error.message).toContain( expect(error.message).toContain(
'Failed to fetch browser webSocket URL from' 'Failed to fetch browser webSocket URL from'
); );
await originalBrowser.close(); } finally {
await close();
}
}); });
}); });
describe('Puppeteer.launch |pipe| option', function () { describe('Puppeteer.launch |pipe| option', function () {
it('should support the pipe option', async () => { it('should support the pipe option', async () => {
const {defaultBrowserOptions, puppeteer} = getTestState(); const {defaultBrowserOptions} = getTestState();
const options = Object.assign({pipe: true}, defaultBrowserOptions); const options = Object.assign({pipe: true}, defaultBrowserOptions);
const browser = await puppeteer.launch(options); const {browser, close} = await launch(options, {createPage: false});
try {
expect(await browser.pages()).toHaveLength(1); expect(await browser.pages()).toHaveLength(1);
expect(browser.wsEndpoint()).toBe(''); expect(browser.wsEndpoint()).toBe('');
const page = await browser.newPage(); const page = await browser.newPage();
expect(await page.evaluate('11 * 11')).toBe(121); expect(await page.evaluate('11 * 11')).toBe(121);
await page.close(); await page.close();
await browser.close(); } finally {
await close();
}
}); });
it('should support the pipe argument', async () => { it('should support the pipe argument', async () => {
const {defaultBrowserOptions, puppeteer} = getTestState(); const {defaultBrowserOptions} = getTestState();
const options = Object.assign({}, defaultBrowserOptions); const options = Object.assign({}, defaultBrowserOptions);
options.args = ['--remote-debugging-pipe'].concat(options.args || []); options.args = ['--remote-debugging-pipe'].concat(options.args || []);
const browser = await puppeteer.launch(options); const {browser, close} = await launch(options);
try {
expect(browser.wsEndpoint()).toBe(''); expect(browser.wsEndpoint()).toBe('');
const page = await browser.newPage(); const page = await browser.newPage();
expect(await page.evaluate('11 * 11')).toBe(121); expect(await page.evaluate('11 * 11')).toBe(121);
await page.close(); await page.close();
await browser.close(); } finally {
await close();
}
}); });
it('should fire "disconnected" when closing with pipe', async () => { it('should fire "disconnected" when closing with pipe', async () => {
const {defaultBrowserOptions, puppeteer} = getTestState(); const {defaultBrowserOptions} = getTestState();
const options = Object.assign({pipe: true}, defaultBrowserOptions); const options = Object.assign({pipe: true}, defaultBrowserOptions);
const browser = await puppeteer.launch(options); const {browser, close} = await launch(options);
try {
const disconnectedEventPromise = waitEvent(browser, 'disconnected'); const disconnectedEventPromise = waitEvent(browser, 'disconnected');
// Emulate user exiting browser. // Emulate user exiting browser.
browser.process()!.kill(); browser.process()!.kill();
await disconnectedEventPromise; await disconnectedEventPromise;
} finally {
await close();
}
}); });
}); });
}); });

View File

@ -20,6 +20,7 @@ import {
getTestState, getTestState,
setupTestBrowserHooks, setupTestBrowserHooks,
setupTestPageAndContextHooks, setupTestPageAndContextHooks,
launch,
} from './mocha-utils.js'; } from './mocha-utils.js';
describe('Cookie specs', () => { describe('Cookie specs', () => {
@ -480,16 +481,15 @@ describe('Cookie specs', () => {
]); ]);
}); });
it('should set secure same-site cookies from a frame', async () => { it('should set secure same-site cookies from a frame', async () => {
const {httpsServer, puppeteer, defaultBrowserOptions} = getTestState(); const {httpsServer, defaultBrowserOptions} = getTestState();
const browser = await puppeteer.launch({ const {browser, close} = await launch({
...defaultBrowserOptions, ...defaultBrowserOptions,
ignoreHTTPSErrors: true, ignoreHTTPSErrors: true,
}); });
const page = await browser.newPage();
try { try {
const page = await browser.newPage();
await page.goto(httpsServer.PREFIX + '/grid.html'); await page.goto(httpsServer.PREFIX + '/grid.html');
await page.evaluate(src => { await page.evaluate(src => {
let fulfill!: () => void; let fulfill!: () => void;
@ -533,8 +533,7 @@ describe('Cookie specs', () => {
] ]
); );
} finally { } finally {
await page.close(); await close();
await browser.close();
} }
}); });
}); });

View File

@ -19,13 +19,10 @@ import os from 'os';
import path from 'path'; import path from 'path';
import expect from 'expect'; import expect from 'expect';
import { import {PuppeteerLaunchOptions} from 'puppeteer-core/internal/node/PuppeteerNode.js';
PuppeteerLaunchOptions,
PuppeteerNode,
} from 'puppeteer-core/internal/node/PuppeteerNode.js';
import {rmSync} from 'puppeteer-core/internal/node/util/fs.js'; import {rmSync} from 'puppeteer-core/internal/node/util/fs.js';
import {getTestState} from './mocha-utils.js'; import {getTestState, launch} from './mocha-utils.js';
const TMP_FOLDER = path.join(os.tmpdir(), 'pptr_tmp_folder-'); const TMP_FOLDER = path.join(os.tmpdir(), 'pptr_tmp_folder-');
@ -59,7 +56,7 @@ describe('headful tests', function () {
headless: boolean; headless: boolean;
devtools: boolean; devtools: boolean;
}; };
const browsers: any[] = []; const browsers: Array<() => Promise<void>> = [];
beforeEach(() => { beforeEach(() => {
const {server, defaultBrowserOptions} = getTestState(); const {server, defaultBrowserOptions} = getTestState();
@ -96,29 +93,24 @@ describe('headful tests', function () {
}); });
}); });
async function launchBrowser(puppeteer: PuppeteerNode, options: any) { async function launchBrowser(options: any) {
const browser = await puppeteer.launch(options); const {browser, close} = await launch(options, {createContext: false});
browsers.push(browser); browsers.push(close);
return browser; return browser;
} }
afterEach(() => { afterEach(async () => {
for (const i in browsers) { await Promise.all(
const browser = browsers[i]; browsers.map((close, index) => {
if (browser.isConnected()) { delete browsers[index];
browser.close(); return close();
} })
delete browsers[i]; );
}
}); });
describe('HEADFUL', function () { describe('HEADFUL', function () {
it('background_page target type should be available', async () => { it('background_page target type should be available', async () => {
const {puppeteer} = getTestState(); const browserWithExtension = await launchBrowser(extensionOptions);
const browserWithExtension = await launchBrowser(
puppeteer,
extensionOptions
);
const page = await browserWithExtension.newPage(); const page = await browserWithExtension.newPage();
const backgroundPageTarget = await browserWithExtension.waitForTarget( const backgroundPageTarget = await browserWithExtension.waitForTarget(
target => { target => {
@ -130,8 +122,8 @@ describe('headful tests', function () {
expect(backgroundPageTarget).toBeTruthy(); expect(backgroundPageTarget).toBeTruthy();
}); });
it('service_worker target type should be available', async () => { it('service_worker target type should be available', async () => {
const {puppeteer, defaultBrowserOptions} = getTestState(); const {defaultBrowserOptions} = getTestState();
const browserWithExtension = await launchBrowser(puppeteer, { const browserWithExtension = await launchBrowser({
...defaultBrowserOptions, ...defaultBrowserOptions,
headless: false, headless: false,
args: [ args: [
@ -150,11 +142,7 @@ describe('headful tests', function () {
expect(serviceWorkerTarget).toBeTruthy(); expect(serviceWorkerTarget).toBeTruthy();
}); });
it('target.page() should return a background_page', async function () { it('target.page() should return a background_page', async function () {
const {puppeteer} = getTestState(); const browserWithExtension = await launchBrowser(extensionOptions);
const browserWithExtension = await launchBrowser(
puppeteer,
extensionOptions
);
const backgroundPageTarget = await browserWithExtension.waitForTarget( const backgroundPageTarget = await browserWithExtension.waitForTarget(
target => { target => {
return target.type() === 'background_page'; return target.type() === 'background_page';
@ -175,7 +163,7 @@ describe('headful tests', function () {
}); });
it('target.page() should return a DevTools page if custom isPageTarget is provided', async function () { it('target.page() should return a DevTools page if custom isPageTarget is provided', async function () {
const {puppeteer} = getTestState(); const {puppeteer} = getTestState();
const originalBrowser = await launchBrowser(puppeteer, devtoolsOptions); const originalBrowser = await launchBrowser(devtoolsOptions);
const browserWSEndpoint = originalBrowser.wsEndpoint(); const browserWSEndpoint = originalBrowser.wsEndpoint();
@ -197,25 +185,21 @@ describe('headful tests', function () {
}) })
).toBe(6); ).toBe(6);
expect(await browser.pages()).toContainEqual(page); expect(await browser.pages()).toContainEqual(page);
await browser.close();
}); });
it('should have default url when launching browser', async function () { it('should have default url when launching browser', async function () {
const {puppeteer} = getTestState(); const browser = await launchBrowser(extensionOptions);
const browser = await launchBrowser(puppeteer, extensionOptions);
const pages = (await browser.pages()).map((page: {url: () => any}) => { const pages = (await browser.pages()).map((page: {url: () => any}) => {
return page.url(); return page.url();
}); });
expect(pages).toEqual(['about:blank']); expect(pages).toEqual(['about:blank']);
await browser.close();
}); });
it('headless should be able to read cookies written by headful', async () => { it('headless should be able to read cookies written by headful', async () => {
/* Needs investigation into why but this fails consistently on Windows CI. */ /* Needs investigation into why but this fails consistently on Windows CI. */
const {server, puppeteer} = getTestState(); const {server} = getTestState();
const userDataDir = await mkdtemp(TMP_FOLDER); const userDataDir = await mkdtemp(TMP_FOLDER);
// Write a cookie in headful chrome // Write a cookie in headful chrome
const headfulBrowser = await launchBrowser( const headfulBrowser = await launchBrowser(
puppeteer,
Object.assign({userDataDir}, headfulOptions) Object.assign({userDataDir}, headfulOptions)
); );
const headfulPage = await headfulBrowser.newPage(); const headfulPage = await headfulBrowser.newPage();
@ -227,7 +211,6 @@ describe('headful tests', function () {
await headfulBrowser.close(); await headfulBrowser.close();
// Read the cookie from headless chrome // Read the cookie from headless chrome
const headlessBrowser = await launchBrowser( const headlessBrowser = await launchBrowser(
puppeteer,
Object.assign({userDataDir}, headlessOptions) Object.assign({userDataDir}, headlessOptions)
); );
const headlessPage = await headlessBrowser.newPage(); const headlessPage = await headlessBrowser.newPage();
@ -244,10 +227,10 @@ describe('headful tests', function () {
}); });
// TODO: Support OOOPIF. @see https://github.com/puppeteer/puppeteer/issues/2548 // TODO: Support OOOPIF. @see https://github.com/puppeteer/puppeteer/issues/2548
it.skip('OOPIF: should report google.com frame', async () => { it.skip('OOPIF: should report google.com frame', async () => {
const {server, puppeteer} = getTestState(); const {server} = getTestState();
// https://google.com is isolated by default in Chromium embedder. // https://google.com is isolated by default in Chromium embedder.
const browser = await launchBrowser(puppeteer, headfulOptions); const browser = await launchBrowser(headfulOptions);
const page = await browser.newPage(); const page = await browser.newPage();
await page.goto(server.EMPTY_PAGE); await page.goto(server.EMPTY_PAGE);
await page.setRequestInterception(true); await page.setRequestInterception(true);
@ -270,12 +253,11 @@ describe('headful tests', function () {
}) })
.sort(); .sort();
expect(urls).toEqual([server.EMPTY_PAGE, 'https://google.com/']); expect(urls).toEqual([server.EMPTY_PAGE, 'https://google.com/']);
await browser.close();
}); });
it('OOPIF: should expose events within OOPIFs', async () => { it('OOPIF: should expose events within OOPIFs', async () => {
const {server, puppeteer} = getTestState(); const {server} = getTestState();
const browser = await launchBrowser(puppeteer, forcedOopifOptions); const browser = await launchBrowser(forcedOopifOptions);
const page = await browser.newPage(); const page = await browser.newPage();
// Setup our session listeners to observe OOPIF activity. // Setup our session listeners to observe OOPIF activity.
@ -333,9 +315,9 @@ describe('headful tests', function () {
expect(requests).toContain(`http://oopifdomain:${server.PORT}/fetch`); expect(requests).toContain(`http://oopifdomain:${server.PORT}/fetch`);
}); });
it('should close browser with beforeunload page', async () => { it('should close browser with beforeunload page', async () => {
const {server, puppeteer} = getTestState(); const {server} = getTestState();
const browser = await launchBrowser(puppeteer, headfulOptions); const browser = await launchBrowser(headfulOptions);
const page = await browser.newPage(); const page = await browser.newPage();
await page.goto(server.PREFIX + '/beforeunload.html'); await page.goto(server.PREFIX + '/beforeunload.html');
// We have to interact with a page so that 'beforeunload' handlers // We have to interact with a page so that 'beforeunload' handlers
@ -344,10 +326,7 @@ describe('headful tests', function () {
await browser.close(); await browser.close();
}); });
it('should open devtools when "devtools: true" option is given', async () => { it('should open devtools when "devtools: true" option is given', async () => {
const {puppeteer} = getTestState();
const browser = await launchBrowser( const browser = await launchBrowser(
puppeteer,
Object.assign({devtools: true}, headfulOptions) Object.assign({devtools: true}, headfulOptions)
); );
const context = await browser.createIncognitoBrowserContext(); const context = await browser.createIncognitoBrowserContext();
@ -363,8 +342,7 @@ describe('headful tests', function () {
describe('Page.bringToFront', function () { describe('Page.bringToFront', function () {
it('should work', async () => { it('should work', async () => {
const {puppeteer} = getTestState(); const browser = await launchBrowser(headfulOptions);
const browser = await launchBrowser(puppeteer, headfulOptions);
const page1 = await browser.newPage(); const page1 = await browser.newPage();
const page2 = await browser.newPage(); const page2 = await browser.newPage();
@ -400,8 +378,8 @@ describe('headful tests', function () {
describe('Page.screenshot', function () { describe('Page.screenshot', function () {
it('should run in parallel in multiple pages', async () => { it('should run in parallel in multiple pages', async () => {
const {server, puppeteer} = getTestState(); const {server} = getTestState();
const browser = await puppeteer.launch(headfulOptions); const browser = await launchBrowser(headfulOptions);
const context = await browser.createIncognitoBrowserContext(); const context = await browser.createIncognitoBrowserContext();
const N = 2; const N = 2;

View File

@ -39,6 +39,7 @@ describe('ignoreHTTPSErrors', function () {
{ignoreHTTPSErrors: true}, {ignoreHTTPSErrors: true},
defaultBrowserOptions defaultBrowserOptions
); );
// eslint-disable-next-line no-restricted-syntax
browser = await puppeteer.launch(options); browser = await puppeteer.launch(options);
}); });

View File

@ -26,13 +26,20 @@ import {Page} from 'puppeteer-core/internal/api/Page.js';
import {rmSync} from 'puppeteer-core/internal/node/util/fs.js'; import {rmSync} from 'puppeteer-core/internal/node/util/fs.js';
import sinon from 'sinon'; import sinon from 'sinon';
import {getTestState, itOnlyRegularInstall} from './mocha-utils.js'; import {
getTestState,
itOnlyRegularInstall,
launch,
setupTestBrowserHooks,
} from './mocha-utils.js';
import {dumpFrames, waitEvent} from './utils.js'; import {dumpFrames, waitEvent} from './utils.js';
const TMP_FOLDER = path.join(os.tmpdir(), 'pptr_tmp_folder-'); const TMP_FOLDER = path.join(os.tmpdir(), 'pptr_tmp_folder-');
const FIREFOX_TIMEOUT = 30 * 1000; const FIREFOX_TIMEOUT = 30 * 1000;
describe('Launcher specs', function () { describe('Launcher specs', function () {
setupTestBrowserHooks();
if (getTestState().isFirefox) { if (getTestState().isFirefox) {
this.timeout(FIREFOX_TIMEOUT); this.timeout(FIREFOX_TIMEOUT);
} }
@ -42,7 +49,8 @@ describe('Launcher specs', function () {
it('should reject navigation when browser closes', async () => { it('should reject navigation when browser closes', async () => {
const {server, puppeteer, defaultBrowserOptions} = getTestState(); const {server, puppeteer, defaultBrowserOptions} = getTestState();
server.setRoute('/one-style.css', () => {}); server.setRoute('/one-style.css', () => {});
const browser = await puppeteer.launch(defaultBrowserOptions); const {browser, close} = await launch(defaultBrowserOptions);
try {
const remote = await puppeteer.connect({ const remote = await puppeteer.connect({
browserWSEndpoint: browser.wsEndpoint(), browserWSEndpoint: browser.wsEndpoint(),
}); });
@ -61,13 +69,15 @@ describe('Launcher specs', function () {
'Protocol error (Page.navigate): Target closed.', 'Protocol error (Page.navigate): Target closed.',
].includes(error.message) ].includes(error.message)
).toBeTruthy(); ).toBeTruthy();
await browser.close(); } finally {
await close();
}
}); });
it('should reject waitForSelector when browser closes', async () => { it('should reject waitForSelector when browser closes', async () => {
const {server, puppeteer, defaultBrowserOptions} = getTestState(); const {server, puppeteer, defaultBrowserOptions} = getTestState();
server.setRoute('/empty.html', () => {}); server.setRoute('/empty.html', () => {});
const browser = await puppeteer.launch(defaultBrowserOptions); const {browser, close} = await launch(defaultBrowserOptions);
try {
const remote = await puppeteer.connect({ const remote = await puppeteer.connect({
browserWSEndpoint: browser.wsEndpoint(), browserWSEndpoint: browser.wsEndpoint(),
}); });
@ -80,14 +90,16 @@ describe('Launcher specs', function () {
remote.disconnect(); remote.disconnect();
const error = await watchdog; const error = await watchdog;
expect(error.message).toContain('Protocol error'); expect(error.message).toContain('Protocol error');
await browser.close(); } finally {
await close();
}
}); });
}); });
describe('Browser.close', function () { describe('Browser.close', function () {
it('should terminate network waiters', async () => { it('should terminate network waiters', async () => {
const {server, puppeteer, defaultBrowserOptions} = getTestState(); const {server, puppeteer, defaultBrowserOptions} = getTestState();
const {browser, close} = await launch(defaultBrowserOptions);
const browser = await puppeteer.launch(defaultBrowserOptions); try {
const remote = await puppeteer.connect({ const remote = await puppeteer.connect({
browserWSEndpoint: browser.wsEndpoint(), browserWSEndpoint: browser.wsEndpoint(),
}); });
@ -106,19 +118,20 @@ describe('Launcher specs', function () {
expect(message).toContain('Target closed'); expect(message).toContain('Target closed');
expect(message).not.toContain('Timeout'); expect(message).not.toContain('Timeout');
} }
await browser.close(); } finally {
await close();
}
}); });
}); });
describe('Puppeteer.launch', function () { describe('Puppeteer.launch', function () {
it('can launch and close the browser', async () => { it('can launch and close the browser', async () => {
const {defaultBrowserOptions, puppeteer} = getTestState(); const {defaultBrowserOptions} = getTestState();
const browser = await puppeteer.launch(defaultBrowserOptions); const {close} = await launch(defaultBrowserOptions);
await browser.close(); await close();
}); });
it('should reject all promises when browser is closed', async () => { it('should reject all promises when browser is closed', async () => {
const {defaultBrowserOptions, puppeteer} = getTestState(); const {defaultBrowserOptions} = getTestState();
const browser = await puppeteer.launch(defaultBrowserOptions); const {page, close} = await launch(defaultBrowserOptions);
const page = await browser.newPage();
let error!: Error; let error!: Error;
const neverResolves = page const neverResolves = page
.evaluate(() => { .evaluate(() => {
@ -127,32 +140,36 @@ describe('Launcher specs', function () {
.catch(error_ => { .catch(error_ => {
return (error = error_); return (error = error_);
}); });
await browser.close(); await close();
await neverResolves; await neverResolves;
expect(error.message).toContain('Protocol error'); expect(error.message).toContain('Protocol error');
}); });
it('should reject if executable path is invalid', async () => { it('should reject if executable path is invalid', async () => {
const {defaultBrowserOptions, puppeteer} = getTestState(); const {defaultBrowserOptions} = getTestState();
let waitError!: Error; let waitError!: Error;
const options = Object.assign({}, defaultBrowserOptions, { const options = Object.assign({}, defaultBrowserOptions, {
executablePath: 'random-invalid-path', executablePath: 'random-invalid-path',
}); });
await puppeteer.launch(options).catch(error => { await launch(options).catch(error => {
return (waitError = error); return (waitError = error);
}); });
expect(waitError.message).toContain('Failed to launch'); expect(waitError.message).toContain('Failed to launch');
}); });
it('userDataDir option', async () => { it('userDataDir option', async () => {
const {defaultBrowserOptions, puppeteer} = getTestState(); const {defaultBrowserOptions} = getTestState();
const userDataDir = await mkdtemp(TMP_FOLDER); const userDataDir = await mkdtemp(TMP_FOLDER);
const options = Object.assign({userDataDir}, defaultBrowserOptions); const options = Object.assign({userDataDir}, defaultBrowserOptions);
const browser = await puppeteer.launch(options); const {context, close} = await launch(options);
// Open a page to make sure its functional. // Open a page to make sure its functional.
await browser.newPage(); try {
await context.newPage();
expect(fs.readdirSync(userDataDir).length).toBeGreaterThan(0); expect(fs.readdirSync(userDataDir).length).toBeGreaterThan(0);
await browser.close(); } finally {
await close();
}
expect(fs.readdirSync(userDataDir).length).toBeGreaterThan(0); expect(fs.readdirSync(userDataDir).length).toBeGreaterThan(0);
// This might throw. See https://github.com/puppeteer/puppeteer/issues/2778 // This might throw. See https://github.com/puppeteer/puppeteer/issues/2778
try { try {
@ -172,8 +189,8 @@ describe('Launcher specs', function () {
// Path should be empty before starting the browser. // Path should be empty before starting the browser.
expect(fs.readdirSync(testTmpDir)).toHaveLength(0); expect(fs.readdirSync(testTmpDir)).toHaveLength(0);
const browser = await puppeteer.launch(defaultBrowserOptions); const {context, close} = await launch(defaultBrowserOptions);
try {
// One profile folder should have been created at this moment. // One profile folder should have been created at this moment.
const profiles = fs.readdirSync(testTmpDir); const profiles = fs.readdirSync(testTmpDir);
expect(profiles).toHaveLength(1); expect(profiles).toHaveLength(1);
@ -182,8 +199,11 @@ describe('Launcher specs', function () {
); );
// Open a page to make sure its functional. // Open a page to make sure its functional.
await browser.newPage(); await context.newPage();
await browser.close(); } finally {
await close();
}
// Profile should be deleted after closing the browser // Profile should be deleted after closing the browser
expect(fs.readdirSync(testTmpDir)).toHaveLength(0); expect(fs.readdirSync(testTmpDir)).toHaveLength(0);
@ -191,7 +211,7 @@ describe('Launcher specs', function () {
puppeteer.configuration.temporaryDirectory = oldTmpDir; puppeteer.configuration.temporaryDirectory = oldTmpDir;
}); });
it('userDataDir option restores preferences', async () => { it('userDataDir option restores preferences', async () => {
const {defaultBrowserOptions, puppeteer} = getTestState(); const {defaultBrowserOptions} = getTestState();
const userDataDir = await mkdtemp(TMP_FOLDER); const userDataDir = await mkdtemp(TMP_FOLDER);
@ -200,14 +220,18 @@ describe('Launcher specs', function () {
await writeFile(prefsJSPath, prefsJSContent); await writeFile(prefsJSPath, prefsJSContent);
const options = Object.assign({userDataDir}, defaultBrowserOptions); const options = Object.assign({userDataDir}, defaultBrowserOptions);
const browser = await puppeteer.launch(options); const {context, close} = await launch(options);
try {
// Open a page to make sure its functional. // Open a page to make sure its functional.
await browser.newPage(); await context.newPage();
expect(fs.readdirSync(userDataDir).length).toBeGreaterThan(0); expect(fs.readdirSync(userDataDir).length).toBeGreaterThan(0);
await browser.close(); await close();
expect(fs.readdirSync(userDataDir).length).toBeGreaterThan(0); expect(fs.readdirSync(userDataDir).length).toBeGreaterThan(0);
expect(await readFile(prefsJSPath, 'utf8')).toBe(prefsJSContent); expect(await readFile(prefsJSPath, 'utf8')).toBe(prefsJSContent);
} finally {
await close();
}
// This might throw. See https://github.com/puppeteer/puppeteer/issues/2778 // This might throw. See https://github.com/puppeteer/puppeteer/issues/2778
try { try {
@ -215,7 +239,7 @@ describe('Launcher specs', function () {
} catch {} } catch {}
}); });
it('userDataDir argument', async () => { it('userDataDir argument', async () => {
const {isChrome, puppeteer, defaultBrowserOptions} = getTestState(); const {isChrome, defaultBrowserOptions} = getTestState();
const userDataDir = await mkdtemp(TMP_FOLDER); const userDataDir = await mkdtemp(TMP_FOLDER);
const options = Object.assign({}, defaultBrowserOptions); const options = Object.assign({}, defaultBrowserOptions);
@ -231,9 +255,9 @@ describe('Launcher specs', function () {
userDataDir, userDataDir,
]; ];
} }
const browser = await puppeteer.launch(options); const {close} = await launch(options);
expect(fs.readdirSync(userDataDir).length).toBeGreaterThan(0); expect(fs.readdirSync(userDataDir).length).toBeGreaterThan(0);
await browser.close(); await close();
expect(fs.readdirSync(userDataDir).length).toBeGreaterThan(0); expect(fs.readdirSync(userDataDir).length).toBeGreaterThan(0);
// This might throw. See https://github.com/puppeteer/puppeteer/issues/2778 // This might throw. See https://github.com/puppeteer/puppeteer/issues/2778
try { try {
@ -241,7 +265,7 @@ describe('Launcher specs', function () {
} catch {} } catch {}
}); });
it('userDataDir argument with non-existent dir', async () => { it('userDataDir argument with non-existent dir', async () => {
const {isChrome, puppeteer, defaultBrowserOptions} = getTestState(); const {isChrome, defaultBrowserOptions} = getTestState();
const userDataDir = await mkdtemp(TMP_FOLDER); const userDataDir = await mkdtemp(TMP_FOLDER);
rmSync(userDataDir); rmSync(userDataDir);
@ -258,9 +282,9 @@ describe('Launcher specs', function () {
userDataDir, userDataDir,
]; ];
} }
const browser = await puppeteer.launch(options); const {close} = await launch(options);
expect(fs.readdirSync(userDataDir).length).toBeGreaterThan(0); expect(fs.readdirSync(userDataDir).length).toBeGreaterThan(0);
await browser.close(); await close();
expect(fs.readdirSync(userDataDir).length).toBeGreaterThan(0); expect(fs.readdirSync(userDataDir).length).toBeGreaterThan(0);
// This might throw. See https://github.com/puppeteer/puppeteer/issues/2778 // This might throw. See https://github.com/puppeteer/puppeteer/issues/2778
try { try {
@ -268,19 +292,23 @@ describe('Launcher specs', function () {
} catch {} } catch {}
}); });
it('userDataDir option should restore state', async () => { it('userDataDir option should restore state', async () => {
const {server, puppeteer, defaultBrowserOptions} = getTestState(); const {server, defaultBrowserOptions} = getTestState();
const userDataDir = await mkdtemp(TMP_FOLDER); const userDataDir = await mkdtemp(TMP_FOLDER);
const options = Object.assign({userDataDir}, defaultBrowserOptions); const options = Object.assign({userDataDir}, defaultBrowserOptions);
const browser = await puppeteer.launch(options); const {browser, close} = await launch(options);
try {
const page = await browser.newPage(); const page = await browser.newPage();
await page.goto(server.EMPTY_PAGE); await page.goto(server.EMPTY_PAGE);
await page.evaluate(() => { await page.evaluate(() => {
return (localStorage['hey'] = 'hello'); return (localStorage['hey'] = 'hello');
}); });
await browser.close(); } finally {
await close();
}
const browser2 = await puppeteer.launch(options); const {browser: browser2, close: close2} = await launch(options);
try {
const page2 = await browser2.newPage(); const page2 = await browser2.newPage();
await page2.goto(server.EMPTY_PAGE); await page2.goto(server.EMPTY_PAGE);
expect( expect(
@ -288,27 +316,34 @@ describe('Launcher specs', function () {
return localStorage['hey']; return localStorage['hey'];
}) })
).toBe('hello'); ).toBe('hello');
await browser2.close(); } finally {
await close2();
}
// This might throw. See https://github.com/puppeteer/puppeteer/issues/2778 // This might throw. See https://github.com/puppeteer/puppeteer/issues/2778
try { try {
rmSync(userDataDir); rmSync(userDataDir);
} catch {} } catch {}
}); });
it('userDataDir option should restore cookies', async () => { it('userDataDir option should restore cookies', async () => {
const {server, puppeteer, defaultBrowserOptions} = getTestState(); const {server, defaultBrowserOptions} = getTestState();
const userDataDir = await mkdtemp(TMP_FOLDER); const userDataDir = await mkdtemp(TMP_FOLDER);
const options = Object.assign({userDataDir}, defaultBrowserOptions); const options = Object.assign({userDataDir}, defaultBrowserOptions);
const browser = await puppeteer.launch(options); const {browser, close} = await launch(options);
try {
const page = await browser.newPage(); const page = await browser.newPage();
await page.goto(server.EMPTY_PAGE); await page.goto(server.EMPTY_PAGE);
await page.evaluate(() => { await page.evaluate(() => {
return (document.cookie = return (document.cookie =
'doSomethingOnlyOnce=true; expires=Fri, 31 Dec 9999 23:59:59 GMT'); 'doSomethingOnlyOnce=true; expires=Fri, 31 Dec 9999 23:59:59 GMT');
}); });
await browser.close(); } finally {
await close();
}
const browser2 = await puppeteer.launch(options); const {browser: browser2, close: close2} = await launch(options);
try {
const page2 = await browser2.newPage(); const page2 = await browser2.newPage();
await page2.goto(server.EMPTY_PAGE); await page2.goto(server.EMPTY_PAGE);
expect( expect(
@ -316,7 +351,10 @@ describe('Launcher specs', function () {
return document.cookie; return document.cookie;
}) })
).toBe('doSomethingOnlyOnce=true'); ).toBe('doSomethingOnlyOnce=true');
await browser2.close(); } finally {
await close2();
}
// This might throw. See https://github.com/puppeteer/puppeteer/issues/2778 // This might throw. See https://github.com/puppeteer/puppeteer/issues/2778
try { try {
rmSync(userDataDir); rmSync(userDataDir);
@ -371,28 +409,29 @@ describe('Launcher specs', function () {
} }
}); });
it('should work with no default arguments', async () => { it('should work with no default arguments', async () => {
const {defaultBrowserOptions, puppeteer} = getTestState(); const {defaultBrowserOptions} = getTestState();
const options = Object.assign({}, defaultBrowserOptions); const options = Object.assign({}, defaultBrowserOptions);
options.ignoreDefaultArgs = true; options.ignoreDefaultArgs = true;
const browser = await puppeteer.launch(options); const {context, close} = await launch(options);
try { try {
const page = await browser.newPage(); const page = await context.newPage();
expect(await page.evaluate('11 * 11')).toBe(121); expect(await page.evaluate('11 * 11')).toBe(121);
await page.close(); await page.close();
} finally { } finally {
await browser.close(); await close();
} }
}); });
it('should filter out ignored default arguments in Chrome', async () => { it('should filter out ignored default arguments in Chrome', async () => {
const {defaultBrowserOptions, puppeteer} = getTestState(); const {defaultBrowserOptions, puppeteer} = getTestState();
// Make sure we launch with `--enable-automation` by default. // Make sure we launch with `--enable-automation` by default.
const defaultArgs = puppeteer.defaultArgs(); const defaultArgs = puppeteer.defaultArgs();
const browser = await puppeteer.launch( const {browser, close} = await launch(
Object.assign({}, defaultBrowserOptions, { Object.assign({}, defaultBrowserOptions, {
// Ignore first and third default argument. // Ignore first and third default argument.
ignoreDefaultArgs: [defaultArgs[0]!, defaultArgs[2]], ignoreDefaultArgs: [defaultArgs[0]!, defaultArgs[2]],
}) })
); );
try {
const spawnargs = browser.process()!.spawnargs; const spawnargs = browser.process()!.spawnargs;
if (!spawnargs) { if (!spawnargs) {
throw new Error('spawnargs not present'); throw new Error('spawnargs not present');
@ -400,41 +439,52 @@ describe('Launcher specs', function () {
expect(spawnargs.indexOf(defaultArgs[0]!)).toBe(-1); expect(spawnargs.indexOf(defaultArgs[0]!)).toBe(-1);
expect(spawnargs.indexOf(defaultArgs[1]!)).not.toBe(-1); expect(spawnargs.indexOf(defaultArgs[1]!)).not.toBe(-1);
expect(spawnargs.indexOf(defaultArgs[2]!)).toBe(-1); expect(spawnargs.indexOf(defaultArgs[2]!)).toBe(-1);
await browser.close(); } finally {
await close();
}
}); });
it('should filter out ignored default argument in Firefox', async () => { it('should filter out ignored default argument in Firefox', async () => {
const {defaultBrowserOptions, puppeteer} = getTestState(); const {defaultBrowserOptions, puppeteer} = getTestState();
const defaultArgs = puppeteer.defaultArgs(); const defaultArgs = puppeteer.defaultArgs();
const browser = await puppeteer.launch( const {browser, close} = await launch(
Object.assign({}, defaultBrowserOptions, { Object.assign({}, defaultBrowserOptions, {
// Only the first argument is fixed, others are optional. // Only the first argument is fixed, others are optional.
ignoreDefaultArgs: [defaultArgs[0]!], ignoreDefaultArgs: [defaultArgs[0]!],
}) })
); );
try {
const spawnargs = browser.process()!.spawnargs; const spawnargs = browser.process()!.spawnargs;
if (!spawnargs) { if (!spawnargs) {
throw new Error('spawnargs not present'); throw new Error('spawnargs not present');
} }
expect(spawnargs.indexOf(defaultArgs[0]!)).toBe(-1); expect(spawnargs.indexOf(defaultArgs[0]!)).toBe(-1);
expect(spawnargs.indexOf(defaultArgs[1]!)).not.toBe(-1); expect(spawnargs.indexOf(defaultArgs[1]!)).not.toBe(-1);
await browser.close(); } finally {
await close();
}
}); });
it('should have default URL when launching browser', async function () { it('should have default URL when launching browser', async function () {
const {defaultBrowserOptions, puppeteer} = getTestState(); const {defaultBrowserOptions} = getTestState();
const browser = await puppeteer.launch(defaultBrowserOptions); const {browser, close} = await launch(defaultBrowserOptions, {
createContext: false,
});
try {
const pages = (await browser.pages()).map(page => { const pages = (await browser.pages()).map(page => {
return page.url(); return page.url();
}); });
expect(pages).toEqual(['about:blank']); expect(pages).toEqual(['about:blank']);
await browser.close(); } finally {
await close();
}
}); });
it('should have custom URL when launching browser', async () => { it('should have custom URL when launching browser', async () => {
const {server, puppeteer, defaultBrowserOptions} = getTestState(); const {server, defaultBrowserOptions} = getTestState();
const options = Object.assign({}, defaultBrowserOptions); const options = Object.assign({}, defaultBrowserOptions);
options.args = [server.EMPTY_PAGE].concat(options.args || []); options.args = [server.EMPTY_PAGE].concat(options.args || []);
const browser = await puppeteer.launch(options); const {browser, close} = await launch(options, {createContext: false});
try {
const pages = await browser.pages(); const pages = await browser.pages();
expect(pages).toHaveLength(1); expect(pages).toHaveLength(1);
const page = pages[0]!; const page = pages[0]!;
@ -442,80 +492,95 @@ describe('Launcher specs', function () {
await page.waitForNavigation(); await page.waitForNavigation();
} }
expect(page.url()).toBe(server.EMPTY_PAGE); expect(page.url()).toBe(server.EMPTY_PAGE);
await browser.close(); } finally {
await close();
}
}); });
it('should pass the timeout parameter to browser.waitForTarget', async () => { it('should pass the timeout parameter to browser.waitForTarget', async () => {
const {puppeteer, defaultBrowserOptions} = getTestState(); const {defaultBrowserOptions} = getTestState();
const options = Object.assign({}, defaultBrowserOptions, { const options = Object.assign({}, defaultBrowserOptions, {
timeout: 1, timeout: 1,
}); });
let error!: Error; let error!: Error;
await puppeteer.launch(options).catch(error_ => { await launch(options).catch(error_ => {
return (error = error_); return (error = error_);
}); });
expect(error).toBeInstanceOf(TimeoutError); expect(error).toBeInstanceOf(TimeoutError);
}); });
it('should work with timeout = 0', async () => { it('should work with timeout = 0', async () => {
const {puppeteer, defaultBrowserOptions} = getTestState(); const {defaultBrowserOptions} = getTestState();
const options = Object.assign({}, defaultBrowserOptions, { const options = Object.assign({}, defaultBrowserOptions, {
timeout: 0, timeout: 0,
}); });
const browser = await puppeteer.launch(options); const {close} = await launch(options);
await browser.close(); await close();
}); });
it('should set the default viewport', async () => { it('should set the default viewport', async () => {
const {puppeteer, defaultBrowserOptions} = getTestState(); const {defaultBrowserOptions} = getTestState();
const options = Object.assign({}, defaultBrowserOptions, { const options = Object.assign({}, defaultBrowserOptions, {
defaultViewport: { defaultViewport: {
width: 456, width: 456,
height: 789, height: 789,
}, },
}); });
const browser = await puppeteer.launch(options); const {context, close} = await launch(options);
const page = await browser.newPage();
try {
const page = await context.newPage();
expect(await page.evaluate('window.innerWidth')).toBe(456); expect(await page.evaluate('window.innerWidth')).toBe(456);
expect(await page.evaluate('window.innerHeight')).toBe(789); expect(await page.evaluate('window.innerHeight')).toBe(789);
await browser.close(); } finally {
await close();
}
}); });
it('should disable the default viewport', async () => { it('should disable the default viewport', async () => {
const {puppeteer, defaultBrowserOptions} = getTestState(); const {defaultBrowserOptions} = getTestState();
const options = Object.assign({}, defaultBrowserOptions, { const options = Object.assign({}, defaultBrowserOptions, {
defaultViewport: null, defaultViewport: null,
}); });
const browser = await puppeteer.launch(options); const {context, close} = await launch(options);
const page = await browser.newPage(); try {
const page = await context.newPage();
expect(page.viewport()).toBe(null); expect(page.viewport()).toBe(null);
await browser.close(); } finally {
await close();
}
}); });
it('should take fullPage screenshots when defaultViewport is null', async () => { it('should take fullPage screenshots when defaultViewport is null', async () => {
const {server, puppeteer, defaultBrowserOptions} = getTestState(); const {server, defaultBrowserOptions} = getTestState();
const options = Object.assign({}, defaultBrowserOptions, { const options = Object.assign({}, defaultBrowserOptions, {
defaultViewport: null, defaultViewport: null,
}); });
const browser = await puppeteer.launch(options); const {context, close} = await launch(options);
const page = await browser.newPage(); try {
const page = await context.newPage();
await page.goto(server.PREFIX + '/grid.html'); await page.goto(server.PREFIX + '/grid.html');
const screenshot = await page.screenshot({ const screenshot = await page.screenshot({
fullPage: true, fullPage: true,
}); });
expect(screenshot).toBeInstanceOf(Buffer); expect(screenshot).toBeInstanceOf(Buffer);
await browser.close(); } finally {
await close();
}
}); });
it('should set the debugging port', async () => { it('should set the debugging port', async () => {
const {puppeteer, defaultBrowserOptions} = getTestState(); const {defaultBrowserOptions} = getTestState();
const options = Object.assign({}, defaultBrowserOptions, { const options = Object.assign({}, defaultBrowserOptions, {
defaultViewport: null, defaultViewport: null,
debuggingPort: 9999, debuggingPort: 9999,
}); });
const browser = await puppeteer.launch(options); const {browser, close} = await launch(options);
try {
const url = new URL(browser.wsEndpoint()); const url = new URL(browser.wsEndpoint());
await browser.close();
expect(url.port).toBe('9999'); expect(url.port).toBe('9999');
} finally {
await close();
}
}); });
it('should not allow setting debuggingPort and pipe', async () => { it('should not allow setting debuggingPort and pipe', async () => {
const {puppeteer, defaultBrowserOptions} = getTestState(); const {defaultBrowserOptions} = getTestState();
const options = Object.assign({}, defaultBrowserOptions, { const options = Object.assign({}, defaultBrowserOptions, {
defaultViewport: null, defaultViewport: null,
@ -524,13 +589,13 @@ describe('Launcher specs', function () {
}); });
let error!: Error; let error!: Error;
await puppeteer.launch(options).catch(error_ => { await launch(options).catch(error_ => {
return (error = error_); return (error = error_);
}); });
expect(error.message).toContain('either pipe or debugging port'); expect(error.message).toContain('either pipe or debugging port');
}); });
it('should launch Chrome properly with --no-startup-window and waitForInitialPage=false', async () => { it('should launch Chrome properly with --no-startup-window and waitForInitialPage=false', async () => {
const {defaultBrowserOptions, puppeteer} = getTestState(); const {defaultBrowserOptions} = getTestState();
const options = { const options = {
waitForInitialPage: false, waitForInitialPage: false,
// This is needed to prevent Puppeteer from adding an initial blank page. // This is needed to prevent Puppeteer from adding an initial blank page.
@ -539,39 +604,46 @@ describe('Launcher specs', function () {
...defaultBrowserOptions, ...defaultBrowserOptions,
args: ['--no-startup-window'], args: ['--no-startup-window'],
}; };
const browser = await puppeteer.launch(options); const {browser, close} = await launch(options, {createContext: false});
try {
const pages = await browser.pages(); const pages = await browser.pages();
expect(pages).toHaveLength(0); expect(pages).toHaveLength(0);
await browser.close(); } finally {
await close();
}
}); });
}); });
describe('Puppeteer.launch', function () { describe('Puppeteer.launch', function () {
itOnlyRegularInstall('should be able to launch Chrome', async () => { itOnlyRegularInstall('should be able to launch Chrome', async () => {
const {puppeteer} = getTestState(); const {browser, close} = await launch({product: 'chrome'});
const browser = await puppeteer.launch({product: 'chrome'}); try {
const userAgent = await browser.userAgent(); const userAgent = await browser.userAgent();
await browser.close();
expect(userAgent).toContain('Chrome'); expect(userAgent).toContain('Chrome');
} finally {
await close();
}
}); });
it('should be able to launch Firefox', async function () { it('should be able to launch Firefox', async function () {
this.timeout(FIREFOX_TIMEOUT); this.timeout(FIREFOX_TIMEOUT);
const {puppeteer} = getTestState(); const {browser, close} = await launch({product: 'firefox'});
const browser = await puppeteer.launch({product: 'firefox'}); try {
const userAgent = await browser.userAgent(); const userAgent = await browser.userAgent();
await browser.close();
expect(userAgent).toContain('Firefox'); expect(userAgent).toContain('Firefox');
} finally {
await close();
}
}); });
}); });
describe('Puppeteer.connect', function () { describe('Puppeteer.connect', function () {
it('should be able to connect multiple times to the same browser', async () => { it('should be able to connect multiple times to the same browser', async () => {
const {puppeteer, defaultBrowserOptions} = getTestState(); const {puppeteer, defaultBrowserOptions} = getTestState();
const {browser, close} = await launch(defaultBrowserOptions);
const originalBrowser = await puppeteer.launch(defaultBrowserOptions); try {
const otherBrowser = await puppeteer.connect({ const otherBrowser = await puppeteer.connect({
browserWSEndpoint: originalBrowser.wsEndpoint(), browserWSEndpoint: browser.wsEndpoint(),
}); });
const page = await otherBrowser.newPage(); const page = await otherBrowser.newPage();
expect( expect(
@ -581,55 +653,69 @@ describe('Launcher specs', function () {
).toBe(56); ).toBe(56);
otherBrowser.disconnect(); otherBrowser.disconnect();
const secondPage = await originalBrowser.newPage(); const secondPage = await browser.newPage();
expect( expect(
await secondPage.evaluate(() => { await secondPage.evaluate(() => {
return 7 * 6; return 7 * 6;
}) })
).toBe(42); ).toBe(42);
await originalBrowser.close(); } finally {
await close();
}
}); });
it('should be able to close remote browser', async () => { it('should be able to close remote browser', async () => {
const {defaultBrowserOptions, puppeteer} = getTestState(); const {defaultBrowserOptions, puppeteer} = getTestState();
const {browser, close} = await launch(defaultBrowserOptions);
const originalBrowser = await puppeteer.launch(defaultBrowserOptions); try {
const remoteBrowser = await puppeteer.connect({ const remoteBrowser = await puppeteer.connect({
browserWSEndpoint: originalBrowser.wsEndpoint(), browserWSEndpoint: browser.wsEndpoint(),
}); });
await Promise.all([ await Promise.all([
waitEvent(originalBrowser, 'disconnected'), waitEvent(browser, 'disconnected'),
remoteBrowser.close(), remoteBrowser.close(),
]); ]);
} finally {
await close();
}
}); });
it('should be able to connect to a browser with no page targets', async () => { it('should be able to connect to a browser with no page targets', async () => {
const {defaultBrowserOptions, puppeteer} = getTestState(); const {defaultBrowserOptions, puppeteer} = getTestState();
const {browser, close} = await launch(defaultBrowserOptions);
const originalBrowser = await puppeteer.launch(defaultBrowserOptions); try {
const pages = await originalBrowser.pages(); const pages = await browser.pages();
await Promise.all( await Promise.all(
pages.map(page => { pages.map(page => {
return page.close(); return page.close();
}) })
); );
const remoteBrowser = await puppeteer.connect({ const remoteBrowser = await puppeteer.connect({
browserWSEndpoint: originalBrowser.wsEndpoint(), browserWSEndpoint: browser.wsEndpoint(),
}); });
await Promise.all([ await Promise.all([
waitEvent(originalBrowser, 'disconnected'), waitEvent(browser, 'disconnected'),
remoteBrowser.close(), remoteBrowser.close(),
]); ]);
} finally {
await close();
}
}); });
it('should support ignoreHTTPSErrors option', async () => { it('should support ignoreHTTPSErrors option', async () => {
const {httpsServer, puppeteer, defaultBrowserOptions} = getTestState(); const {puppeteer, defaultBrowserOptions} = getTestState();
const {httpsServer, browser, close} = await launch(
defaultBrowserOptions,
{
createContext: false,
}
);
const originalBrowser = await puppeteer.launch(defaultBrowserOptions); try {
const browserWSEndpoint = originalBrowser.wsEndpoint(); const browserWSEndpoint = browser.wsEndpoint();
const remoteBrowser = await puppeteer.connect({
const browser = await puppeteer.connect({
browserWSEndpoint, browserWSEndpoint,
ignoreHTTPSErrors: true, ignoreHTTPSErrors: true,
}); });
const page = await browser.newPage(); const page = await remoteBrowser.newPage();
let error!: Error; let error!: Error;
const [serverRequest, response] = await Promise.all([ const [serverRequest, response] = await Promise.all([
httpsServer.waitForRequest('/empty.html'), httpsServer.waitForRequest('/empty.html'),
@ -645,18 +731,24 @@ describe('Launcher specs', function () {
.replace('v', ' '); .replace('v', ' ');
expect(response.securityDetails().protocol()).toBe(protocol); expect(response.securityDetails().protocol()).toBe(protocol);
await page.close(); await page.close();
await browser.close(); await remoteBrowser.close();
} finally {
await close();
}
}); });
it('should support targetFilter option in puppeteer.launch', async () => { it('should support targetFilter option in puppeteer.launch', async () => {
const {puppeteer, defaultBrowserOptions} = getTestState(); const {defaultBrowserOptions} = getTestState();
const browser = await puppeteer.launch({ const {browser, close} = await launch(
{
...defaultBrowserOptions, ...defaultBrowserOptions,
targetFilter: target => { targetFilter: target => {
return target.type !== 'page'; return target.type !== 'page';
}, },
waitForInitialPage: false, waitForInitialPage: false,
}); },
{createContext: false}
);
try { try {
const targets = browser.targets(); const targets = browser.targets();
expect(targets).toHaveLength(1); expect(targets).toHaveLength(1);
@ -666,36 +758,37 @@ describe('Launcher specs', function () {
}) })
).toBeUndefined(); ).toBeUndefined();
} finally { } finally {
await browser.close(); await close();
} }
}); });
// @see https://github.com/puppeteer/puppeteer/issues/4197 // @see https://github.com/puppeteer/puppeteer/issues/4197
it('should support targetFilter option', async () => { it('should support targetFilter option', async () => {
const {server, puppeteer, defaultBrowserOptions} = getTestState(); const {puppeteer, defaultBrowserOptions} = getTestState();
const {server, browser, close} = await launch(defaultBrowserOptions, {
const originalBrowser = await puppeteer.launch(defaultBrowserOptions); createContext: false,
const browserWSEndpoint = originalBrowser.wsEndpoint(); });
try {
const page1 = await originalBrowser.newPage(); const browserWSEndpoint = browser.wsEndpoint();
const page1 = await browser.newPage();
await page1.goto(server.EMPTY_PAGE); await page1.goto(server.EMPTY_PAGE);
const page2 = await originalBrowser.newPage(); const page2 = await browser.newPage();
await page2.goto(server.EMPTY_PAGE + '?should-be-ignored'); await page2.goto(server.EMPTY_PAGE + '?should-be-ignored');
const browser = await puppeteer.connect({ const remoteBrowser = await puppeteer.connect({
browserWSEndpoint, browserWSEndpoint,
targetFilter: (targetInfo: Protocol.Target.TargetInfo) => { targetFilter: (targetInfo: Protocol.Target.TargetInfo) => {
return !targetInfo.url?.includes('should-be-ignored'); return !targetInfo.url?.includes('should-be-ignored');
}, },
}); });
const pages = await browser.pages(); const pages = await remoteBrowser.pages();
await page2.close(); await page2.close();
await page1.close(); await page1.close();
await browser.disconnect(); remoteBrowser.disconnect();
await originalBrowser.close(); await browser.close();
expect( expect(
pages pages
@ -704,18 +797,21 @@ describe('Launcher specs', function () {
}) })
.sort() .sort()
).toEqual(['about:blank', server.EMPTY_PAGE]); ).toEqual(['about:blank', server.EMPTY_PAGE]);
} finally {
await close();
}
}); });
it('should be able to reconnect to a disconnected browser', async () => { it('should be able to reconnect to a disconnected browser', async () => {
const {server, puppeteer, defaultBrowserOptions} = getTestState(); const {puppeteer, defaultBrowserOptions} = getTestState();
const {server, browser, close} = await launch(defaultBrowserOptions);
const originalBrowser = await puppeteer.launch(defaultBrowserOptions); try {
const browserWSEndpoint = originalBrowser.wsEndpoint(); const browserWSEndpoint = browser.wsEndpoint();
const page = await originalBrowser.newPage(); const page = await browser.newPage();
await page.goto(server.PREFIX + '/frames/nested-frames.html'); await page.goto(server.PREFIX + '/frames/nested-frames.html');
originalBrowser.disconnect(); browser.disconnect();
const browser = await puppeteer.connect({browserWSEndpoint}); const remoteBrowser = await puppeteer.connect({browserWSEndpoint});
const pages = await browser.pages(); const pages = await remoteBrowser.pages();
const restoredPage = pages.find(page => { const restoredPage = pages.find(page => {
return page.url() === server.PREFIX + '/frames/nested-frames.html'; return page.url() === server.PREFIX + '/frames/nested-frames.html';
})!; })!;
@ -731,13 +827,19 @@ describe('Launcher specs', function () {
return 7 * 8; return 7 * 8;
}) })
).toBe(56); ).toBe(56);
await browser.close(); await remoteBrowser.close();
} finally {
await close();
}
}); });
// @see https://github.com/puppeteer/puppeteer/issues/4197#issuecomment-481793410 // @see https://github.com/puppeteer/puppeteer/issues/4197#issuecomment-481793410
it('should be able to connect to the same page simultaneously', async () => { it('should be able to connect to the same page simultaneously', async () => {
const {puppeteer, defaultBrowserOptions} = getTestState(); const {puppeteer, defaultBrowserOptions} = getTestState();
const {browser: browserOne, close} = await launch(
defaultBrowserOptions
);
const browserOne = await puppeteer.launch(defaultBrowserOptions); try {
const browserTwo = await puppeteer.connect({ const browserTwo = await puppeteer.connect({
browserWSEndpoint: browserOne.wsEndpoint(), browserWSEndpoint: browserOne.wsEndpoint(),
}); });
@ -759,11 +861,18 @@ describe('Launcher specs', function () {
return 7 * 6; return 7 * 6;
}) })
).toBe(42); ).toBe(42);
await browserOne.close(); } finally {
await close();
}
}); });
it('should be able to reconnect', async () => { it('should be able to reconnect', async () => {
const {puppeteer, server, defaultBrowserOptions} = getTestState(); const {puppeteer, defaultBrowserOptions} = getTestState();
const browserOne = await puppeteer.launch(defaultBrowserOptions); const {
server,
browser: browserOne,
close,
} = await launch(defaultBrowserOptions);
try {
const browserWSEndpoint = browserOne.wsEndpoint(); const browserWSEndpoint = browserOne.wsEndpoint();
const pageOne = await browserOne.newPage(); const pageOne = await browserOne.newPage();
await pageOne.goto(server.EMPTY_PAGE); await pageOne.goto(server.EMPTY_PAGE);
@ -782,6 +891,9 @@ describe('Launcher specs', function () {
}); });
await bodyHandle!.dispose(); await bodyHandle!.dispose();
await browserTwo.close(); await browserTwo.close();
} finally {
await close();
}
}); });
}); });
describe('Puppeteer.executablePath', function () { describe('Puppeteer.executablePath', function () {
@ -828,9 +940,10 @@ describe('Launcher specs', function () {
describe('Browser target events', function () { describe('Browser target events', function () {
it('should work', async () => { it('should work', async () => {
const {server, puppeteer, defaultBrowserOptions} = getTestState(); const {defaultBrowserOptions} = getTestState();
const {browser, server, close} = await launch(defaultBrowserOptions);
const browser = await puppeteer.launch(defaultBrowserOptions); try {
const events: string[] = []; const events: string[] = [];
browser.on('targetcreated', () => { browser.on('targetcreated', () => {
return events.push('CREATED'); return events.push('CREATED');
@ -845,15 +958,18 @@ describe('Launcher specs', function () {
await page.goto(server.EMPTY_PAGE); await page.goto(server.EMPTY_PAGE);
await page.close(); await page.close();
expect(events).toEqual(['CREATED', 'CHANGED', 'DESTROYED']); expect(events).toEqual(['CREATED', 'CHANGED', 'DESTROYED']);
await browser.close(); } finally {
await close();
}
}); });
}); });
describe('Browser.Events.disconnected', function () { describe('Browser.Events.disconnected', function () {
it('should be emitted when: browser gets closed, disconnected or underlying websocket gets closed', async () => { it('should be emitted when: browser gets closed, disconnected or underlying websocket gets closed', async () => {
const {puppeteer, defaultBrowserOptions} = getTestState(); const {puppeteer, defaultBrowserOptions} = getTestState();
const originalBrowser = await puppeteer.launch(defaultBrowserOptions); const {browser, close} = await launch(defaultBrowserOptions);
const browserWSEndpoint = originalBrowser.wsEndpoint(); try {
const browserWSEndpoint = browser.wsEndpoint();
const remoteBrowser1 = await puppeteer.connect({ const remoteBrowser1 = await puppeteer.connect({
browserWSEndpoint, browserWSEndpoint,
}); });
@ -864,7 +980,7 @@ describe('Launcher specs', function () {
let disconnectedOriginal = 0; let disconnectedOriginal = 0;
let disconnectedRemote1 = 0; let disconnectedRemote1 = 0;
let disconnectedRemote2 = 0; let disconnectedRemote2 = 0;
originalBrowser.on('disconnected', () => { browser.on('disconnected', () => {
return ++disconnectedOriginal; return ++disconnectedOriginal;
}); });
remoteBrowser1.on('disconnected', () => { remoteBrowser1.on('disconnected', () => {
@ -885,13 +1001,16 @@ describe('Launcher specs', function () {
await Promise.all([ await Promise.all([
waitEvent(remoteBrowser1, 'disconnected'), waitEvent(remoteBrowser1, 'disconnected'),
waitEvent(originalBrowser, 'disconnected'), waitEvent(browser, 'disconnected'),
originalBrowser.close(), browser.close(),
]); ]);
expect(disconnectedOriginal).toBe(1); expect(disconnectedOriginal).toBe(1);
expect(disconnectedRemote1).toBe(1); expect(disconnectedRemote1).toBe(1);
expect(disconnectedRemote2).toBe(1); expect(disconnectedRemote2).toBe(1);
} finally {
await close();
}
}); });
}); });
}); });

View File

@ -364,47 +364,69 @@ export const createTimeout = <T>(
}); });
}; };
const browserCleanups: Array<() => Promise<void>> = []; let browserCleanups: Array<() => Promise<void>> = [];
export const launch = async ( export const launch = async (
options: PuppeteerLaunchOptions launchOptions: PuppeteerLaunchOptions,
options: {
createContext?: boolean;
createPage?: boolean;
} = {}
): Promise< ): Promise<
PuppeteerTestState & { PuppeteerTestState & {
close: () => Promise<void>; close: () => Promise<void>;
} }
> => { > => {
const {createContext = true, createPage = true} = options;
const close = async () => { const close = async () => {
let cleanup = browserCleanups.pop(); let cleanup = browserCleanups.pop();
try {
while (cleanup) { while (cleanup) {
await cleanup(); await cleanup();
cleanup = browserCleanups.pop(); cleanup = browserCleanups.pop();
} }
} catch (error) {
// If the browser was closed by other mean swallow the error
// and mark he browser as closed
if ((error as any)?.message.includes('Connection closed')) {
browserCleanups = [];
return;
}
throw error;
}
}; };
try { try {
const browser = await puppeteer.launch({ const browser = await puppeteer.launch({
...defaultBrowserOptions, ...defaultBrowserOptions,
...options, ...launchOptions,
}); });
browserCleanups.push(() => { browserCleanups.push(() => {
return browser.close(); return browser.close();
}); });
const context = await browser.createIncognitoBrowserContext(); let context: BrowserContext;
let page: Page;
if (createContext) {
context = await browser.createIncognitoBrowserContext();
browserCleanups.push(() => { browserCleanups.push(() => {
return context.close(); return context.close();
}); });
const page = await context.newPage(); if (createPage) {
page = await context.newPage();
browserCleanups.push(() => { browserCleanups.push(() => {
return page.close(); return page.close();
}); });
}
}
return { return {
...getTestState(), ...getTestState(),
browser, browser,
context, context: context!,
page, page: page!,
close, close,
}; };
} catch (error) { } catch (error) {

View File

@ -30,6 +30,7 @@ describeWithDebugLogs('OOPIF', function () {
before(async () => { before(async () => {
const {puppeteer, defaultBrowserOptions} = getTestState(); const {puppeteer, defaultBrowserOptions} = getTestState();
// eslint-disable-next-line no-restricted-syntax
browser = await puppeteer.launch( browser = await puppeteer.launch(
Object.assign({}, defaultBrowserOptions, { Object.assign({}, defaultBrowserOptions, {
args: (defaultBrowserOptions.args || []).concat([ args: (defaultBrowserOptions.args || []).concat([

View File

@ -21,9 +21,8 @@ import os from 'os';
import {TestServer} from '@pptr/testserver'; import {TestServer} from '@pptr/testserver';
import expect from 'expect'; import expect from 'expect';
import type {Browser} from 'puppeteer-core/internal/api/Browser.js';
import {getTestState} from './mocha-utils.js'; import {getTestState, launch} from './mocha-utils.js';
let HOSTNAME = os.hostname(); let HOSTNAME = os.hostname();
@ -52,12 +51,13 @@ function getEmptyPageUrl(server: TestServer): string {
} }
describe('request proxy', () => { describe('request proxy', () => {
let browser: Browser;
let proxiedRequestUrls: string[]; let proxiedRequestUrls: string[];
let proxyServer: Server; let proxyServer: Server;
let proxyServerUrl: string; let proxyServerUrl: string;
const defaultArgs = [ const defaultArgs = [
'--disable-features=NetworkTimeServiceQuerying', // We disable this in tests so that proxy-related tests don't intercept queries from this service in headful. // We disable this in tests so that proxy-related tests
// don't intercept queries from this service in headful.
'--disable-features=NetworkTimeServiceQuerying',
]; ];
beforeEach(() => { beforeEach(() => {
@ -97,8 +97,6 @@ describe('request proxy', () => {
}); });
afterEach(async () => { afterEach(async () => {
await browser.close();
await new Promise((resolve, reject) => { await new Promise((resolve, reject) => {
proxyServer.close(error => { proxyServer.close(error => {
if (error) { if (error) {
@ -111,27 +109,29 @@ describe('request proxy', () => {
}); });
it('should proxy requests when configured', async () => { it('should proxy requests when configured', async () => {
const {puppeteer, defaultBrowserOptions, server} = getTestState(); const {defaultBrowserOptions, server} = getTestState();
const emptyPageUrl = getEmptyPageUrl(server); const emptyPageUrl = getEmptyPageUrl(server);
browser = await puppeteer.launch({ const {browser, close} = await launch({
...defaultBrowserOptions, ...defaultBrowserOptions,
args: [...defaultArgs, `--proxy-server=${proxyServerUrl}`], args: [...defaultArgs, `--proxy-server=${proxyServerUrl}`],
}); });
try {
const page = await browser.newPage(); const page = await browser.newPage();
const response = (await page.goto(emptyPageUrl))!; const response = (await page.goto(emptyPageUrl))!;
expect(response.ok()).toBe(true); expect(response.ok()).toBe(true);
expect(proxiedRequestUrls).toEqual([emptyPageUrl]); expect(proxiedRequestUrls).toEqual([emptyPageUrl]);
} finally {
await close();
}
}); });
it('should respect proxy bypass list', async () => { it('should respect proxy bypass list', async () => {
const {puppeteer, defaultBrowserOptions, server} = getTestState(); const {defaultBrowserOptions, server} = getTestState();
const emptyPageUrl = getEmptyPageUrl(server); const emptyPageUrl = getEmptyPageUrl(server);
browser = await puppeteer.launch({ const {browser, close} = await launch({
...defaultBrowserOptions, ...defaultBrowserOptions,
args: [ args: [
...defaultArgs, ...defaultArgs,
@ -139,39 +139,43 @@ describe('request proxy', () => {
`--proxy-bypass-list=${new URL(emptyPageUrl).host}`, `--proxy-bypass-list=${new URL(emptyPageUrl).host}`,
], ],
}); });
try {
const page = await browser.newPage(); const page = await browser.newPage();
const response = (await page.goto(emptyPageUrl))!; const response = (await page.goto(emptyPageUrl))!;
expect(response.ok()).toBe(true); expect(response.ok()).toBe(true);
expect(proxiedRequestUrls).toEqual([]); expect(proxiedRequestUrls).toEqual([]);
} finally {
await close();
}
}); });
describe('in incognito browser context', () => { describe('in incognito browser context', () => {
it('should proxy requests when configured at browser level', async () => { it('should proxy requests when configured at browser level', async () => {
const {puppeteer, defaultBrowserOptions, server} = getTestState(); const {defaultBrowserOptions, server} = getTestState();
const emptyPageUrl = getEmptyPageUrl(server); const emptyPageUrl = getEmptyPageUrl(server);
browser = await puppeteer.launch({ const {browser, close} = await launch({
...defaultBrowserOptions, ...defaultBrowserOptions,
args: [...defaultArgs, `--proxy-server=${proxyServerUrl}`], args: [...defaultArgs, `--proxy-server=${proxyServerUrl}`],
}); });
try {
const context = await browser.createIncognitoBrowserContext(); const context = await browser.createIncognitoBrowserContext();
const page = await context.newPage(); const page = await context.newPage();
const response = (await page.goto(emptyPageUrl))!; const response = (await page.goto(emptyPageUrl))!;
expect(response.ok()).toBe(true); expect(response.ok()).toBe(true);
expect(proxiedRequestUrls).toEqual([emptyPageUrl]); expect(proxiedRequestUrls).toEqual([emptyPageUrl]);
} finally {
await close();
}
}); });
it('should respect proxy bypass list when configured at browser level', async () => { it('should respect proxy bypass list when configured at browser level', async () => {
const {puppeteer, defaultBrowserOptions, server} = getTestState(); const {defaultBrowserOptions, server} = getTestState();
const emptyPageUrl = getEmptyPageUrl(server); const emptyPageUrl = getEmptyPageUrl(server);
browser = await puppeteer.launch({ const {browser, close} = await launch({
...defaultBrowserOptions, ...defaultBrowserOptions,
args: [ args: [
...defaultArgs, ...defaultArgs,
@ -179,28 +183,30 @@ describe('request proxy', () => {
`--proxy-bypass-list=${new URL(emptyPageUrl).host}`, `--proxy-bypass-list=${new URL(emptyPageUrl).host}`,
], ],
}); });
try {
const context = await browser.createIncognitoBrowserContext(); const context = await browser.createIncognitoBrowserContext();
const page = await context.newPage(); const page = await context.newPage();
const response = (await page.goto(emptyPageUrl))!; const response = (await page.goto(emptyPageUrl))!;
expect(response.ok()).toBe(true); expect(response.ok()).toBe(true);
expect(proxiedRequestUrls).toEqual([]); expect(proxiedRequestUrls).toEqual([]);
} finally {
await close();
}
}); });
/** /**
* See issues #7873, #7719, and #7698. * See issues #7873, #7719, and #7698.
*/ */
it('should proxy requests when configured at context level', async () => { it('should proxy requests when configured at context level', async () => {
const {puppeteer, defaultBrowserOptions, server} = getTestState(); const {defaultBrowserOptions, server} = getTestState();
const emptyPageUrl = getEmptyPageUrl(server); const emptyPageUrl = getEmptyPageUrl(server);
browser = await puppeteer.launch({ const {browser, close} = await launch({
...defaultBrowserOptions, ...defaultBrowserOptions,
args: defaultArgs, args: defaultArgs,
}); });
try {
const context = await browser.createIncognitoBrowserContext({ const context = await browser.createIncognitoBrowserContext({
proxyServer: proxyServerUrl, proxyServer: proxyServerUrl,
}); });
@ -208,19 +214,21 @@ describe('request proxy', () => {
const response = (await page.goto(emptyPageUrl))!; const response = (await page.goto(emptyPageUrl))!;
expect(response.ok()).toBe(true); expect(response.ok()).toBe(true);
expect(proxiedRequestUrls).toEqual([emptyPageUrl]); expect(proxiedRequestUrls).toEqual([emptyPageUrl]);
} finally {
await close();
}
}); });
it('should respect proxy bypass list when configured at context level', async () => { it('should respect proxy bypass list when configured at context level', async () => {
const {puppeteer, defaultBrowserOptions, server} = getTestState(); const {defaultBrowserOptions, server} = getTestState();
const emptyPageUrl = getEmptyPageUrl(server); const emptyPageUrl = getEmptyPageUrl(server);
browser = await puppeteer.launch({ const {browser, close} = await launch({
...defaultBrowserOptions, ...defaultBrowserOptions,
args: defaultArgs, args: defaultArgs,
}); });
try {
const context = await browser.createIncognitoBrowserContext({ const context = await browser.createIncognitoBrowserContext({
proxyServer: proxyServerUrl, proxyServer: proxyServerUrl,
proxyBypassList: [new URL(emptyPageUrl).host], proxyBypassList: [new URL(emptyPageUrl).host],
@ -229,8 +237,10 @@ describe('request proxy', () => {
const response = (await page.goto(emptyPageUrl))!; const response = (await page.goto(emptyPageUrl))!;
expect(response.ok()).toBe(true); expect(response.ok()).toBe(true);
expect(proxiedRequestUrls).toEqual([]); expect(proxiedRequestUrls).toEqual([]);
} finally {
await close();
}
}); });
}); });
}); });

View File

@ -20,6 +20,7 @@ import {
getTestState, getTestState,
setupTestBrowserHooks, setupTestBrowserHooks,
setupTestPageAndContextHooks, setupTestPageAndContextHooks,
launch,
} from './mocha-utils.js'; } from './mocha-utils.js';
describe('Screenshots', function () { describe('Screenshots', function () {
@ -223,9 +224,9 @@ describe('Screenshots', function () {
expect(screenshot).toBeGolden('screenshot-element-bounding-box.png'); expect(screenshot).toBeGolden('screenshot-element-bounding-box.png');
}); });
it('should work with a null viewport', async () => { it('should work with a null viewport', async () => {
const {defaultBrowserOptions, puppeteer, server} = getTestState(); const {defaultBrowserOptions, server} = getTestState();
const browser = await puppeteer.launch({ const {browser, close} = await launch({
...defaultBrowserOptions, ...defaultBrowserOptions,
defaultViewport: null, defaultViewport: null,
}); });
@ -240,7 +241,7 @@ describe('Screenshots', function () {
const screenshot = await elementHandle.screenshot(); const screenshot = await elementHandle.screenshot();
expect(screenshot).toBeTruthy(); expect(screenshot).toBeTruthy();
} finally { } finally {
await browser.close(); await close();
} }
}); });
it('should take into account padding and border', async () => { it('should take into account padding and border', async () => {

View File

@ -18,35 +18,30 @@ import fs from 'fs';
import path from 'path'; import path from 'path';
import expect from 'expect'; import expect from 'expect';
import {Browser} from 'puppeteer-core/internal/api/Browser.js';
import {Page} from 'puppeteer-core/internal/api/Page.js';
import {getTestState} from './mocha-utils.js'; import {getTestState, launch} from './mocha-utils.js';
describe('Tracing', function () { describe('Tracing', function () {
let outputFile!: string; let outputFile!: string;
let browser!: Browser; let testState: Awaited<ReturnType<typeof launch>>;
let page!: Page;
/* we manually manage the browser here as we want a new browser for each /* we manually manage the browser here as we want a new browser for each
* individual test, which isn't the default behaviour of getTestState() * individual test, which isn't the default behaviour of getTestState()
*/ */
beforeEach(async () => { beforeEach(async () => {
const {defaultBrowserOptions, puppeteer} = getTestState(); const {defaultBrowserOptions} = getTestState();
browser = await puppeteer.launch(defaultBrowserOptions); testState = await launch(defaultBrowserOptions);
page = await browser.newPage();
outputFile = path.join(__dirname, 'trace.json'); outputFile = path.join(__dirname, 'trace.json');
}); });
afterEach(async () => { afterEach(async () => {
await browser.close(); await testState.close();
if (fs.existsSync(outputFile)) { if (fs.existsSync(outputFile)) {
fs.unlinkSync(outputFile); fs.unlinkSync(outputFile);
} }
}); });
it('should output a trace', async () => { it('should output a trace', async () => {
const {server} = getTestState(); const {server, page} = testState;
await page.tracing.start({screenshots: true, path: outputFile}); await page.tracing.start({screenshots: true, path: outputFile});
await page.goto(server.PREFIX + '/grid.html'); await page.goto(server.PREFIX + '/grid.html');
@ -55,6 +50,7 @@ describe('Tracing', function () {
}); });
it('should run with custom categories if provided', async () => { it('should run with custom categories if provided', async () => {
const {page} = testState;
await page.tracing.start({ await page.tracing.start({
path: outputFile, path: outputFile,
categories: ['-*', 'disabled-by-default-devtools.timeline.frame'], categories: ['-*', 'disabled-by-default-devtools.timeline.frame'],
@ -77,6 +73,7 @@ describe('Tracing', function () {
}); });
it('should run with default categories', async () => { it('should run with default categories', async () => {
const {page} = testState;
await page.tracing.start({ await page.tracing.start({
path: outputFile, path: outputFile,
}); });
@ -92,6 +89,7 @@ describe('Tracing', function () {
); );
}); });
it('should throw if tracing on two pages', async () => { it('should throw if tracing on two pages', async () => {
const {page, browser} = testState;
await page.tracing.start({path: outputFile}); await page.tracing.start({path: outputFile});
const newPage = await browser.newPage(); const newPage = await browser.newPage();
let error!: Error; let error!: Error;
@ -103,7 +101,7 @@ describe('Tracing', function () {
await page.tracing.stop(); await page.tracing.stop();
}); });
it('should return a buffer', async () => { it('should return a buffer', async () => {
const {server} = getTestState(); const {page, server} = testState;
await page.tracing.start({screenshots: true, path: outputFile}); await page.tracing.start({screenshots: true, path: outputFile});
await page.goto(server.PREFIX + '/grid.html'); await page.goto(server.PREFIX + '/grid.html');
@ -112,7 +110,7 @@ describe('Tracing', function () {
expect(trace.toString()).toEqual(buf.toString()); expect(trace.toString()).toEqual(buf.toString());
}); });
it('should work without options', async () => { it('should work without options', async () => {
const {server} = getTestState(); const {page, server} = testState;
await page.tracing.start(); await page.tracing.start();
await page.goto(server.PREFIX + '/grid.html'); await page.goto(server.PREFIX + '/grid.html');
@ -121,7 +119,7 @@ describe('Tracing', function () {
}); });
it('should return undefined in case of Buffer error', async () => { it('should return undefined in case of Buffer error', async () => {
const {server} = getTestState(); const {page, server} = testState;
await page.tracing.start({screenshots: true}); await page.tracing.start({screenshots: true});
await page.goto(server.PREFIX + '/grid.html'); await page.goto(server.PREFIX + '/grid.html');
@ -139,7 +137,7 @@ describe('Tracing', function () {
}); });
it('should support a buffer without a path', async () => { it('should support a buffer without a path', async () => {
const {server} = getTestState(); const {page, server} = testState;
await page.tracing.start({screenshots: true}); await page.tracing.start({screenshots: true});
await page.goto(server.PREFIX + '/grid.html'); await page.goto(server.PREFIX + '/grid.html');
@ -148,6 +146,7 @@ describe('Tracing', function () {
}); });
it('should properly fail if readProtocolStream errors out', async () => { it('should properly fail if readProtocolStream errors out', async () => {
const {page} = testState;
await page.tracing.start({path: __dirname}); await page.tracing.start({path: __dirname});
let error!: Error; let error!: Error;