Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

cherry-pick(#20336): Revert "chore: respect headless option when reusing browser (#19980)" (#20340)

Browse source 
This reverts commit e674ea217f.
This commit is contained in:
Dmitry Gozman 2023-01-24 13:06:01 -08:00 committed by GitHub
parent f8a46e34b8
commit aea542f7a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
packages/playwright-core/src/remote/playwrightConnection.ts
View file

@ -220,7 +220,10 @@ export class PlaywrightConnection {
} }
if (!browser) { if (!browser) {
browser = await playwright[(this._options.browserName || 'chromium') as 'chromium'].launch(serverSideCallMetadata(), this._options.launchOptions); browser = await playwright[(this._options.browserName || 'chromium') as 'chromium'].launch(serverSideCallMetadata(), {
...this._options.launchOptions,
headless: !!process.env.PW_DEBUG_CONTROLLER_HEADLESS,
});
browser.on(Browser.Events.Disconnected, () => { browser.on(Browser.Events.Disconnected, () => {
// Underlying browser did close for some reason - force disconnect the client. // Underlying browser did close for some reason - force disconnect the client.
this.close({ code: 1001, reason: 'Browser closed' }); this.close({ code: 1001, reason: 'Browser closed' });
@ -284,6 +287,8 @@ function launchOptionsHash(options: LaunchOptions) {
if (copy[key] === defaultLaunchOptions[key]) if (copy[key] === defaultLaunchOptions[key])
delete copy[key]; delete copy[key];
} }
for (const key of optionsThatAllowBrowserReuse)
delete copy[key];
return JSON.stringify(copy); return JSON.stringify(copy);
} }
@ -295,3 +300,7 @@ const defaultLaunchOptions: LaunchOptions = {
headless: true, headless: true,
devtools: false, devtools: false,
}; };
const optionsThatAllowBrowserReuse: (keyof LaunchOptions)[] = [
'headless',
];

1
tests/library/debug-controller.spec.ts
View file

@ -30,6 +30,7 @@ type Fixtures = {
const test = baseTest.extend<Fixtures>({ const test = baseTest.extend<Fixtures>({
wsEndpoint: async ({ }, use) => { wsEndpoint: async ({ }, use) => {
process.env.PW_DEBUG_CONTROLLER_HEADLESS = '1';
const server = new PlaywrightServer({ path: '/' + createGuid(), maxConnections: Number.MAX_VALUE, enableSocksProxy: false }); const server = new PlaywrightServer({ path: '/' + createGuid(), maxConnections: Number.MAX_VALUE, enableSocksProxy: false });
const wsEndpoint = await server.listen(); const wsEndpoint = await server.listen();
await use(wsEndpoint); await use(wsEndpoint);