clean up isChromiumHeadedLike

This commit is contained in:
Max Schmitt 2024-10-28 20:33:08 +01:00
parent a5ab856c27
commit a54fc302aa
2 changed files with 4 additions and 2 deletions

View file

@ -309,7 +309,7 @@ export class Chromium extends BrowserType {
if (options.devtools) if (options.devtools)
chromeArguments.push('--auto-open-devtools-for-tabs'); chromeArguments.push('--auto-open-devtools-for-tabs');
if (options.headless) { if (options.headless) {
if (process.env.PLAYWRIGHT_CHROMIUM_USE_HEADLESS_OLD) if (process.env.PLAYWRIGHT_CHROMIUM_USE_HEADLESS_OLD || options.channel === 'chromium-headless-shell')
chromeArguments.push('--headless=old'); chromeArguments.push('--headless=old');
else else
chromeArguments.push('--headless=new'); chromeArguments.push('--headless=new');

View file

@ -19,7 +19,9 @@ import { browserTest as base, expect } from '../config/browserTest';
const it = base.extend<{ isChromiumHeadedLike: boolean }>({ const it = base.extend<{ isChromiumHeadedLike: boolean }>({
isChromiumHeadedLike: async ({ browserName, headless, channel }, use) => { isChromiumHeadedLike: async ({ browserName, headless, channel }, use) => {
const isChromiumHeadedLike = browserName === 'chromium' && (!headless || !process.env.PLAYWRIGHT_CHROMIUM_USE_HEADLESS_OLD) && channel !== 'chromium-headless-shell'; const isChromiumHeadedLike = browserName === 'chromium'
&& ((headless && !process.env.PLAYWRIGHT_CHROMIUM_USE_HEADLESS_OLD
&& channel !== 'chromium-headless-shell') || !headless);
await use(isChromiumHeadedLike); await use(isChromiumHeadedLike);
}, },
}); });