kyfx
/
playwright
mirror of https://github.com/microsoft/playwright.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: prefer channel browser for ui mode and codegen (#35588)

This commit is contained in:
Yury Semikhatsky 2025-04-14 10:39:53 -07:00 committed by GitHub
parent 4e3b01ff83
commit c1f1c039d9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/playwright-core/src/server/recorder/recorderApp.ts
View File

@ -115,6 +115,8 @@ export class RecorderApp extends EventEmitter implements IRecorderApp {
useWebSocket: isUnderTest(),
handleSIGINT: recorder.handleSIGINT,
executablePath: inspectedContext._browser.options.isChromium ? inspectedContext._browser.options.customExecutablePath : undefined,
// Use the same channel as the inspected context to guarantee that the browser is installed.
channel: inspectedContext._browser.options.isChromium ? inspectedContext._browser.options.channel : undefined,
}
});
const controller = new ProgressController(serverSideCallMetadata(), context._browser);

20
packages/playwright/src/runner/testServer.ts
View File

@ -442,10 +442,12 @@ export async function runUIMode(configFile: string | undefined, configCLIOverrid
if (options.host !== undefined || options.port !== undefined) {
await openTraceInBrowser(server.urlPrefix('human-readable'));
} else {
const channel = await installedChromiumChannelForUI(configLocation, configCLIOverrides);
const page = await openTraceViewerApp(server.urlPrefix('precise'), 'chromium', {
headless: isUnderTest() && process.env.PWTEST_HEADED_FOR_TEST !== '1',
persistentContextOptions: {
handleSIGINT: false,
channel,
},
});
page.on('close', () => cancelPromise.resolve());
@ -453,6 +455,20 @@ export async function runUIMode(configFile: string | undefined, configCLIOverrid
});
}
// Pick first channel that is used by one of the projects, to ensure it is installed on the machine.
async function installedChromiumChannelForUI(configLocation: ConfigLocation, configCLIOverrides: ConfigCLIOverrides) {
const config = await loadConfig(configLocation, configCLIOverrides).catch(e => null);
if (!config)
return undefined;
if (config.projects.some(p => (!p.project.use.browserName || p.project.use.browserName === 'chromium') && !p.project.use.channel))
return undefined;
for (const channel of ['chromium', 'chrome', 'msedge']) {
if (config.projects.some(p => p.project.use.channel === channel))
return channel;
}
return undefined;
}
export async function runTestServer(configFile: string | undefined, configCLIOverrides: ConfigCLIOverrides, options: { host?: string, port?: number }): Promise<reporterTypes.FullResult['status'] | 'restarted'> {
const configLocation = resolveConfigLocation(configFile);
return await innerRunTestServer(configLocation, configCLIOverrides, options, async server => {
@ -461,7 +477,7 @@ export async function runTestServer(configFile: string | undefined, configCLIOve
});
}
async function innerRunTestServer(configLocation: ConfigLocation, configCLIOverrides: ConfigCLIOverrides, options: { host?: string, port?: number }, openUI: (server: HttpServer, cancelPromise: ManualPromise<void>, configLocation: ConfigLocation) => Promise<void>): Promise<reporterTypes.FullResult['status'] | 'restarted'> {
async function innerRunTestServer(configLocation: ConfigLocation, configCLIOverrides: ConfigCLIOverrides, options: { host?: string, port?: number }, openUI: (server: HttpServer, cancelPromise: ManualPromise<void>) => Promise<void>): Promise<reporterTypes.FullResult['status'] | 'restarted'> {
if (restartWithExperimentalTsEsm(undefined, true))
return 'restarted';
const testServer = new TestServer(configLocation, configCLIOverrides);
@ -471,7 +487,7 @@ async function innerRunTestServer(configLocation: ConfigLocation, configCLIOverr
void sigintWatcher.promise().then(() => cancelPromise.resolve());
try {
const server = await testServer.start(options);
await openUI(server, cancelPromise, configLocation);
await openUI(server, cancelPromise);
await cancelPromise;
} finally {
await testServer.stop();