From 5764a761929f2158820aaffcb04a43724f1a3560 Mon Sep 17 00:00:00 2001 From: Max Schmitt Date: Tue, 11 Feb 2025 14:24:55 +0100 Subject: [PATCH] review feedback --- packages/playwright-core/src/client/browserType.ts | 4 +++- packages/playwright-core/src/server/browserType.ts | 2 +- tests/library/defaultbrowsercontext-2.spec.ts | 13 +++---------- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/packages/playwright-core/src/client/browserType.ts b/packages/playwright-core/src/client/browserType.ts index 36b9fe4d7e..bc1f4536e0 100644 --- a/packages/playwright-core/src/client/browserType.ts +++ b/packages/playwright-core/src/client/browserType.ts @@ -14,6 +14,8 @@ * limitations under the License. */ +import path from 'path'; + import { Browser } from './browser'; import { BrowserContext, prepareBrowserContextParams } from './browserContext'; import { ChannelOwner } from './channelOwner'; @@ -97,7 +99,7 @@ export class BrowserType extends ChannelOwner imple ignoreAllDefaultArgs: !!options.ignoreDefaultArgs && !Array.isArray(options.ignoreDefaultArgs), env: options.env ? envObjectToArray(options.env) : undefined, channel: options.channel, - userDataDir, + userDataDir: path.isAbsolute(userDataDir) ? userDataDir : path.resolve(userDataDir), }; return await this._wrapApiCall(async () => { const result = await this._channel.launchPersistentContext(persistentParams); diff --git a/packages/playwright-core/src/server/browserType.ts b/packages/playwright-core/src/server/browserType.ts index a1121693b5..47586a42fd 100644 --- a/packages/playwright-core/src/server/browserType.ts +++ b/packages/playwright-core/src/server/browserType.ts @@ -189,7 +189,7 @@ export abstract class BrowserType extends SdkObject { if (userDataDir) { if (!path.isAbsolute(userDataDir)) - userDataDir = path.resolve(userDataDir); + throw new Error('userDataDir must be an absolute path'); // Firefox bails if the profile directory does not exist, Chrome creates it. We ensure consistent behavior here. if (!await existsAsync(userDataDir)) await fs.promises.mkdir(userDataDir, { recursive: true, mode: 0o700 }); diff --git a/tests/library/defaultbrowsercontext-2.spec.ts b/tests/library/defaultbrowsercontext-2.spec.ts index abf616161e..f3f273724a 100644 --- a/tests/library/defaultbrowsercontext-2.spec.ts +++ b/tests/library/defaultbrowsercontext-2.spec.ts @@ -103,16 +103,9 @@ it('should accept userDataDir', async ({ createUserDataDir, browserType }) => { it('should accept relative userDataDir', async ({ createUserDataDir, browserType }) => { const userDataDir = await createUserDataDir(); - const cwd = process.cwd(); - try { - console.log(userDataDir); - process.chdir(userDataDir); - const context = await browserType.launchPersistentContext('foobar'); - expect(fs.readdirSync(path.join(userDataDir, 'foobar')).length).toBeGreaterThan(0); - await context.close(); - } finally { - process.chdir(cwd); - } + const context = await browserType.launchPersistentContext(path.relative(process.cwd(), path.join(userDataDir, 'foobar'))); + expect(fs.readdirSync(path.join(userDataDir, 'foobar')).length).toBeGreaterThan(0); + await context.close(); }); it('should restore state from userDataDir', async ({ browserType, server, createUserDataDir, isMac, browserName }) => {