Playwright is a framework for Web Testing and Automation. It allows testing Chromium, Firefox and WebKit with a single API.
TypeScript automationchromechromiume2e-testingelectronend-to-end-testingfirefoxjavascriptplaywrighttesttest-automationtestingtesting-toolswebwebkit
fix(mcp): do not let empty cdpHeaders from env override config file (#39866)
Harry6165ad579b1d
diff --git a/packages/playwright-core/src/tools/mcp/config.ts b/packages/playwright-core/src/tools/mcp/config.tsindex 0b60178b24..15449f27b5 100644--- a/packages/playwright-core/src/tools/mcp/config.ts+++ b/packages/playwright-core/src/tools/mcp/config.ts@@ -276,7 +276,7 @@ export function configFromEnv(): Config & { configFile?: string } {options.browser = envToString(process.env.PLAYWRIGHT_MCP_BROWSER);options.caps = commaSeparatedList(process.env.PLAYWRIGHT_MCP_CAPS);options.cdpEndpoint = envToString(process.env.PLAYWRIGHT_MCP_CDP_ENDPOINT);- options.cdpHeader = headerParser(process.env.PLAYWRIGHT_MCP_CDP_HEADERS, {});+ options.cdpHeader = headerParser(envToString(process.env.PLAYWRIGHT_MCP_CDP_HEADERS));options.cdpTimeout = numberParser(process.env.PLAYWRIGHT_MCP_CDP_TIMEOUT);options.config = envToString(process.env.PLAYWRIGHT_MCP_CONFIG);if (process.env.PLAYWRIGHT_MCP_CONSOLE_LEVEL)@@ -427,10 +427,10 @@ export function resolutionParser(name: string, value: string | undefined): Viewpthrow new Error(`Invalid resolution format: use ${name}="800x600"`);}-export function headerParser(arg: string | undefined, previous?: Record<string, string>): Record<string, string> {+export function headerParser(arg: string | undefined, previous?: Record<string, string>): Record<string, string> | undefined {if (!arg)- return previous || {};- const result: Record<string, string> = previous || {};+ return previous;+ const result: Record<string, string> = { ...(previous ?? {}) };const colonIndex = arg.indexOf(':');const name = colonIndex === -1 ? arg.trim() : arg.substring(0, colonIndex).trim();diff --git a/tests/mcp/config.spec.ts b/tests/mcp/config.spec.tsindex 273d81b605..3f3e914c7f 100644--- a/tests/mcp/config.spec.ts+++ b/tests/mcp/config.spec.ts@@ -118,6 +118,29 @@ test('test sandbox configuration', async ({}) => {expect(await sandboxOption({ browser: 'msedge' })).toBe(true);});+test('file browser.cdpHeaders preserved when PLAYWRIGHT_MCP_CDP_HEADERS unset', async ({}, testInfo) => {+ const prev = process.env.PLAYWRIGHT_MCP_CDP_HEADERS;+ delete process.env.PLAYWRIGHT_MCP_CDP_HEADERS;+ try {+ const config: Config = {+ browser: {+ cdpEndpoint: 'ws://example.invalid',+ cdpHeaders: { Authorization: 'Bearer token-from-file' },+ },+ };+ const configPath = testInfo.outputPath('config.json');+ await fs.promises.writeFile(configPath, JSON.stringify(config, null, 2));++ const resolved = await resolveCLIConfig({ config: configPath });+ expect(resolved.browser.cdpHeaders).toEqual({ Authorization: 'Bearer token-from-file' });+ } finally {+ if (prev !== undefined)+ process.env.PLAYWRIGHT_MCP_CDP_HEADERS = prev;+ else+ delete process.env.PLAYWRIGHT_MCP_CDP_HEADERS;+ }+});+test('browser_get_config returns merged config from file, env and cli', async ({ startClient }) => {const { client } = await startClient({config: {