Skip to content

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

chore: set CURL_COOKIE_JAR_PATH env var for WK only in persistent mode (#36521)

Max Schmitt4c35451323be
diff --git a/packages/playwright-core/src/server/bidi/bidiChromium.ts b/packages/playwright-core/src/server/bidi/bidiChromium.ts
index 38a23580c4..fdeb39a5a4 100644
--- a/packages/playwright-core/src/server/bidi/bidiChromium.ts
+++ b/packages/playwright-core/src/server/bidi/bidiChromium.ts
@@ -77,7 +77,7 @@ export class BidiChromium extends BrowserType {
return error;
}
- override amendEnvironment(env: Env, userDataDir: string, executable: string, browserArguments: string[]): Env {
+ override amendEnvironment(env: Env): Env {
return env;
}
diff --git a/packages/playwright-core/src/server/bidi/bidiFirefox.ts b/packages/playwright-core/src/server/bidi/bidiFirefox.ts
index f10808a13d..74530ee55a 100644
--- a/packages/playwright-core/src/server/bidi/bidiFirefox.ts
+++ b/packages/playwright-core/src/server/bidi/bidiFirefox.ts
@@ -57,7 +57,7 @@ export class BidiFirefox extends BrowserType {
return error;
}
- override amendEnvironment(env: Env, userDataDir: string, executable: string, browserArguments: string[]): Env {
+ override amendEnvironment(env: Env): Env {
if (!path.isAbsolute(os.homedir()))
throw new Error(`Cannot launch Firefox with relative home directory. Did you set ${os.platform() === 'win32' ? 'USERPROFILE' : 'HOME'} to a relative path?`);
diff --git a/packages/playwright-core/src/server/browserType.ts b/packages/playwright-core/src/server/browserType.ts
index 554382b3a2..483c5b958e 100644
--- a/packages/playwright-core/src/server/browserType.ts
+++ b/packages/playwright-core/src/server/browserType.ts
@@ -204,7 +204,7 @@ export abstract class BrowserType extends SdkObject {
const { launchedProcess, gracefullyClose, kill } = await launchProcess({
command: prepared.executable,
args: prepared.browserArguments,
- env: this.amendEnvironment(env, prepared.userDataDir, prepared.executable, prepared.browserArguments),
+ env: this.amendEnvironment(env, prepared.userDataDir, isPersistent),
handleSIGINT,
handleSIGTERM,
handleSIGHUP,
@@ -327,7 +327,7 @@ export abstract class BrowserType extends SdkObject {
abstract defaultArgs(options: types.LaunchOptions, isPersistent: boolean, userDataDir: string): string[];
abstract connectToTransport(transport: ConnectionTransport, options: BrowserOptions, browserLogsCollector: RecentLogsCollector): Promise<Browser>;
- abstract amendEnvironment(env: Env, userDataDir: string, executable: string, browserArguments: string[]): Env;
+ abstract amendEnvironment(env: Env, userDataDir: string, isPersistent: boolean): Env;
abstract doRewriteStartupLog(error: ProtocolError): ProtocolError;
abstract attemptToGracefullyCloseBrowser(transport: ConnectionTransport): void;
}
diff --git a/packages/playwright-core/src/server/chromium/chromium.ts b/packages/playwright-core/src/server/chromium/chromium.ts
index 8f1d0e8f0c..f2dfb7b2ab 100644
--- a/packages/playwright-core/src/server/chromium/chromium.ts
+++ b/packages/playwright-core/src/server/chromium/chromium.ts
@@ -158,7 +158,7 @@ export class Chromium extends BrowserType {
return error;
}
- override amendEnvironment(env: Env, userDataDir: string, executable: string, browserArguments: string[]): Env {
+ override amendEnvironment(env: Env): Env {
return env;
}
diff --git a/packages/playwright-core/src/server/firefox/firefox.ts b/packages/playwright-core/src/server/firefox/firefox.ts
index 5e51688977..56040fc152 100644
--- a/packages/playwright-core/src/server/firefox/firefox.ts
+++ b/packages/playwright-core/src/server/firefox/firefox.ts
@@ -52,7 +52,7 @@ export class Firefox extends BrowserType {
return error;
}
- override amendEnvironment(env: Env, userDataDir: string, executable: string, browserArguments: string[]): Env {
+ override amendEnvironment(env: Env): Env {
if (!path.isAbsolute(os.homedir()))
throw new Error(`Cannot launch Firefox with relative home directory. Did you set ${os.platform() === 'win32' ? 'USERPROFILE' : 'HOME'} to a relative path?`);
if (os.platform() === 'linux') {
diff --git a/packages/playwright-core/src/server/webkit/webkit.ts b/packages/playwright-core/src/server/webkit/webkit.ts
index 5b5519264c..9d147cc1f3 100644
--- a/packages/playwright-core/src/server/webkit/webkit.ts
+++ b/packages/playwright-core/src/server/webkit/webkit.ts
@@ -38,8 +38,11 @@ export class WebKit extends BrowserType {
return WKBrowser.connect(this.attribution.playwright, transport, options);
}
- override amendEnvironment(env: Env, userDataDir: string, executable: string, browserArguments: string[]): Env {
- return { ...env, CURL_COOKIE_JAR_PATH: path.join(userDataDir, 'cookiejar.db') };
+ override amendEnvironment(env: Env, userDataDir: string, isPersistent: boolean): Env {
+ return {
+ ...env,
+ CURL_COOKIE_JAR_PATH: process.platform === 'win32' && isPersistent ? path.join(userDataDir, 'cookiejar.db') : undefined,
+ };
}
override doRewriteStartupLog(error: ProtocolError): ProtocolError {