Skip to content

Commit dc161df

Browse files
authored
fix(launch): throw upon page argument when non-persistent (#1144)
1 parent 9d6aa96 commit dc161df

File tree

4 files changed

+18
-6
lines changed

4 files changed

+18
-6
lines changed

src/server/chromium.ts

+2
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,8 @@ export class Chromium implements BrowserType {
178178
throw new Error('Pass userDataDir parameter instead of specifying --user-data-dir argument');
179179
if (args.find(arg => arg.startsWith('--remote-debugging-')))
180180
throw new Error('Playwright manages remote debugging connection itself.');
181+
if (launchType !== 'persistent' && args.find(arg => !arg.startsWith('-')))
182+
throw new Error('Arguments can not specify page to be opened');
181183

182184
const chromeArguments = [...DEFAULT_ARGS];
183185
chromeArguments.push(`--user-data-dir=${userDataDir}`);

src/server/firefox.ts

+8-6
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ export class Firefox implements BrowserType {
8585
return browserContext;
8686
}
8787

88-
private async _launchServer(options: LaunchOptions = {}, connectionType: LaunchType, userDataDir?: string, port?: number): Promise<{ browserServer: BrowserServer, transport?: ConnectionTransport }> {
88+
private async _launchServer(options: LaunchOptions = {}, launchType: LaunchType, userDataDir?: string, port?: number): Promise<{ browserServer: BrowserServer, transport?: ConnectionTransport }> {
8989
const {
9090
ignoreDefaultArgs = false,
9191
args = [],
@@ -107,9 +107,9 @@ export class Firefox implements BrowserType {
107107
}
108108

109109
if (!ignoreDefaultArgs)
110-
firefoxArguments.push(...this._defaultArgs(options, userDataDir!, port || 0));
110+
firefoxArguments.push(...this._defaultArgs(options, launchType, userDataDir!, port || 0));
111111
else if (Array.isArray(ignoreDefaultArgs))
112-
firefoxArguments.push(...this._defaultArgs(options, userDataDir!, port || 0).filter(arg => !ignoreDefaultArgs.includes(arg)));
112+
firefoxArguments.push(...this._defaultArgs(options, launchType, userDataDir!, port || 0).filter(arg => !ignoreDefaultArgs.includes(arg)));
113113
else
114114
firefoxArguments.push(...args);
115115

@@ -155,8 +155,8 @@ export class Firefox implements BrowserType {
155155
const timeoutError = new TimeoutError(`Timed out after ${timeout} ms while trying to connect to Firefox!`);
156156
const match = await waitForLine(launchedProcess, launchedProcess.stdout, /^Juggler listening on (ws:\/\/.*)$/, timeout, timeoutError);
157157
const browserWSEndpoint = match[1];
158-
browserServer = new BrowserServer(launchedProcess, gracefullyClose, connectionType === 'server' ? browserWSEndpoint : null);
159-
return { browserServer, transport: connectionType === 'server' ? undefined : new platform.WebSocketTransport(browserWSEndpoint) };
158+
browserServer = new BrowserServer(launchedProcess, gracefullyClose, launchType === 'server' ? browserWSEndpoint : null);
159+
return { browserServer, transport: launchType === 'server' ? undefined : new platform.WebSocketTransport(browserWSEndpoint) };
160160
}
161161

162162
async connect(options: ConnectOptions): Promise<FFBrowser> {
@@ -176,7 +176,7 @@ export class Firefox implements BrowserType {
176176
return { TimeoutError };
177177
}
178178

179-
private _defaultArgs(options: BrowserArgOptions = {}, userDataDir: string, port: number): string[] {
179+
private _defaultArgs(options: BrowserArgOptions = {}, launchType: LaunchType, userDataDir: string, port: number): string[] {
180180
const {
181181
devtools = false,
182182
headless = !devtools,
@@ -189,6 +189,8 @@ export class Firefox implements BrowserType {
189189
throw new Error('Pass userDataDir parameter instead of specifying -profile argument');
190190
if (args.find(arg => arg.startsWith('-juggler')))
191191
throw new Error('Use the port parameter instead of -juggler argument');
192+
if (launchType !== 'persistent' && args.find(arg => !arg.startsWith('-')))
193+
throw new Error('Arguments can not specify page to be opened');
192194

193195
const firefoxArguments = ['-no-remote'];
194196
if (headless) {

src/server/webkit.ts

+2
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,8 @@ export class WebKit implements BrowserType {
181181
const userDataDirArg = args.find(arg => arg.startsWith('--user-data-dir='));
182182
if (userDataDirArg)
183183
throw new Error('Pass userDataDir parameter instead of specifying --user-data-dir argument');
184+
if (launchType !== 'persistent' && args.find(arg => !arg.startsWith('-')))
185+
throw new Error('Arguments can not specify page to be opened');
184186
const webkitArguments = ['--inspector-pipe'];
185187
if (headless)
186188
webkitArguments.push('--headless');

test/launcher.spec.js

+6
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@ module.exports.describe = function({testRunner, expect, defaultBrowserOptions, p
4545
await playwright.launch(options).catch(e => waitError = e);
4646
expect(waitError.message).toContain('launchPersistent');
4747
});
48+
it('should throw if page argument is passed', async() => {
49+
let waitError = null;
50+
const options = Object.assign({}, defaultBrowserOptions, { args: ['http://example.com'] });
51+
await playwright.launch(options).catch(e => waitError = e);
52+
expect(waitError.message).toContain('can not specify page');
53+
});
4854
it('should reject if executable path is invalid', async({server}) => {
4955
let waitError = null;
5056
const options = Object.assign({}, defaultBrowserOptions, {executablePath: 'random-invalid-path'});

0 commit comments

Comments
 (0)