Skip to content

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

Revert "chore: tidy up headless-shell hacks (#33967)" (#34659)

Max Schmitt427d7a22ea9b
diff --git a/packages/playwright-core/browsers.json b/packages/playwright-core/browsers.json
index 07e34d3fcd..2a160902f1 100644
--- a/packages/playwright-core/browsers.json
+++ b/packages/playwright-core/browsers.json
@@ -7,12 +7,24 @@
"installByDefault": true,
"browserVersion": "133.0.6943.35"
},
+ {
+ "name": "chromium-headless-shell",
+ "revision": "1157",
+ "installByDefault": true,
+ "browserVersion": "133.0.6943.35"
+ },
{
"name": "chromium-tip-of-tree",
"revision": "1300",
"installByDefault": false,
"browserVersion": "134.0.6998.0"
},
+ {
+ "name": "chromium-tip-of-tree-headless-shell",
+ "revision": "1300",
+ "installByDefault": false,
+ "browserVersion": "134.0.6998.0"
+ },
{
"name": "firefox",
"revision": "1474",
diff --git a/packages/playwright-core/src/server/registry/index.ts b/packages/playwright-core/src/server/registry/index.ts
index c4d7f2ffbb..c221fc01c2 100644
--- a/packages/playwright-core/src/server/registry/index.ts
+++ b/packages/playwright-core/src/server/registry/index.ts
@@ -445,14 +445,7 @@ type BrowsersJSONDescriptor = {
};
function readDescriptors(browsersJSON: BrowsersJSON): BrowsersJSONDescriptor[] {
- const headlessShells: BrowsersJSON['browsers'] = [];
- for (const browserName of ['chromium', 'chromium-tip-of-tree']) {
- headlessShells.push({
- ...browsersJSON.browsers.find(browser => browser.name === browserName)!,
- name: `${browserName}-headless-shell`,
- });
- }
- return [...browsersJSON.browsers, ...headlessShells].map(obj => {
+ return (browsersJSON['browsers']).map(obj => {
const name = obj.name;
const revisionOverride = (obj.revisionOverrides || {})[hostPlatform];
const revision = revisionOverride || obj.revision;
diff --git a/utils/roll_browser.js b/utils/roll_browser.js
index 324147d1aa..93c85db128 100755
--- a/utils/roll_browser.js
+++ b/utils/roll_browser.js
@@ -94,6 +94,18 @@ Example:
console.log('\nUpdating browser version in browsers.json...');
for (const descriptor of descriptors)
descriptor.browserVersion = browserVersion;
+
+ // 4.1 chromium-headless-shell is equal to chromium version.
+ if (browserName === 'chromium') {
+ const headlessShellBrowser = await browsersJSON.browsers.find(b => b.name === 'chromium-headless-shell');
+ headlessShellBrowser.revision = revision;
+ headlessShellBrowser.browserVersion = browserVersion;
+ } else if (browserName === 'chromium-tip-of-tree') {
+ const tipOfTreeBrowser = await browsersJSON.browsers.find(b => b.name === 'chromium-tip-of-tree-headless-shell');
+ tipOfTreeBrowser.revision = revision;
+ tipOfTreeBrowser.browserVersion = browserVersion;
+ }
+
fs.writeFileSync(path.join(CORE_PATH, 'browsers.json'), JSON.stringify(browsersJSON, null, 2) + '\n');
}