Skip to content

Playwright is a framework for Web Testing and Automation. It allows testing Chromium, Firefox and WebKit with a single API.

chore: follow up to args parsing (#39178)

Dmitry Gozman7b3b57ab4cf1
diff --git a/package.json b/package.json
index d57041c30d..f8495cb1ab 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
"build-android-driver": "./utils/build_android_driver.sh",
"innerloop": "playwright run-server --reuse-browser",
"playwright-cli": "node packages/playwright/lib/mcp/terminal/cli.js",
- "test-playwright-cli": "playwright test --config=tests/mcp/playwright.config.ts --project=chrome cli.spec.ts",
+ "test-playwright-cli": "playwright test --config=tests/mcp/playwright.config.ts --project=chrome cli-",
"playwright-cli-readme": "node utils/generate_cli_help.js --readme"
},
"workspaces": [
diff --git a/packages/playwright/src/mcp/terminal/commands.ts b/packages/playwright/src/mcp/terminal/commands.ts
index 4964ab5bd3..9349268edd 100644
--- a/packages/playwright/src/mcp/terminal/commands.ts
+++ b/packages/playwright/src/mcp/terminal/commands.ts
@@ -483,7 +483,7 @@ const cookieSet = declareCommand({
options: z.object({
domain: z.string().optional().describe('Cookie domain'),
path: z.string().optional().describe('Cookie path'),
- expires: z.number().optional().describe('Cookie expiration as Unix timestamp'),
+ expires: numberArg.optional().describe('Cookie expiration as Unix timestamp'),
httpOnly: z.boolean().optional().describe('Whether the cookie is HTTP only'),
secure: z.boolean().optional().describe('Whether the cookie is secure'),
sameSite: z.enum(['Strict', 'Lax', 'None']).optional().describe('Cookie SameSite attribute'),
@@ -630,7 +630,7 @@ const routeMock = declareCommand({
pattern: z.string().describe('URL pattern to match (e.g., "**/api/users")'),
}),
options: z.object({
- status: z.number().optional().describe('HTTP status code (default: 200)'),
+ status: numberArg.optional().describe('HTTP status code (default: 200)'),
body: z.string().optional().describe('Response body (text or JSON string)'),
['content-type']: z.string().optional().describe('Content-Type header'),
header: z.union([z.string(), z.array(z.string())]).optional().transform(v => v ? (Array.isArray(v) ? v : [v]) : undefined).describe('Header to add in "Name: Value" format (repeatable)'),
diff --git a/packages/playwright/src/mcp/terminal/helpGenerator.ts b/packages/playwright/src/mcp/terminal/helpGenerator.ts
index 2e750ed3b2..800ee61155 100644
--- a/packages/playwright/src/mcp/terminal/helpGenerator.ts
+++ b/packages/playwright/src/mcp/terminal/helpGenerator.ts
@@ -155,7 +155,6 @@ function unwrapZodType(schema: zodType.ZodTypeAny): zodType.ZodTypeAny {
}
export function generateHelpJSON() {
- const stringOptions = new Set<string>();
const booleanOptions = new Set<string>();
for (const command of Object.values(commands)) {
if (!command.options)
@@ -163,8 +162,6 @@ export function generateHelpJSON() {
const optionsShape = (command.options as zodType.ZodObject<any>).shape;
for (const [name, schema] of Object.entries(optionsShape)) {
const innerSchema = unwrapZodType(schema as zodType.ZodTypeAny);
- if (innerSchema instanceof z.ZodString)
- stringOptions.add(name);
if (innerSchema instanceof z.ZodBoolean)
booleanOptions.add(name);
}
@@ -175,7 +172,6 @@ export function generateHelpJSON() {
commands: Object.fromEntries(
Object.entries(commands).map(([name, command]) => [name, generateCommandHelp(command)])
),
- stringOptions: [...stringOptions],
booleanOptions: [...booleanOptions],
};
return help;
diff --git a/packages/playwright/src/mcp/terminal/program.ts b/packages/playwright/src/mcp/terminal/program.ts
index ea971c6ad4..f2a28ca711 100644
--- a/packages/playwright/src/mcp/terminal/program.ts
+++ b/packages/playwright/src/mcp/terminal/program.ts
@@ -497,7 +497,13 @@ export async function program(packageLocation: string) {
const argv = process.argv.slice(2);
const boolean = [...help.booleanOptions, ...booleanOptions];
- const args: MinimistArgs = require('minimist')(argv, { boolean, string: [...help.stringOptions, '_'] });
+ const args: MinimistArgs = require('minimist')(argv, { boolean });
+ for (const [key, value] of Object.entries(args)) {
+ if (key !== '_' && typeof value !== 'boolean')
+ args[key] = String(value);
+ }
+ for (let index = 0; index < args._.length; index++)
+ args._[index] = String(args._[index]);
for (const option of boolean) {
if (!argv.includes(`--${option}`) && !argv.includes(`--no-${option}`))
delete args[option];
diff --git a/tests/mcp/cli-parsing.spec.ts b/tests/mcp/cli-parsing.spec.ts
index d5eb53291f..3998b464a6 100644
--- a/tests/mcp/cli-parsing.spec.ts
+++ b/tests/mcp/cli-parsing.spec.ts
@@ -56,4 +56,6 @@ test('wrong argument type', async ({ cli, server }) => {
const { error, exitCode } = await cli('mousemove', '12', 'foo');
expect(exitCode).toBe(1);
expect(error).toContain(`error: 'y' argument: expected number, received 'foo'`);
+ const press = await cli('press', '5');
+ expect(press.exitCode).toBe(0);
});