diff --git a/.github/workflows/tests_bidi.yml b/.github/workflows/tests_bidi.yml index 7eb41d9db4..22231f1126 100644 --- a/.github/workflows/tests_bidi.yml +++ b/.github/workflows/tests_bidi.yml @@ -32,7 +32,7 @@ jobs: strategy: fail-fast: false matrix: - channel: [bidi-chromium, bidi-firefox-nightly] + channel: [bidi-chromium, moz-firefox] steps: - uses: actions/checkout@v4 if: github.event_name != 'workflow_dispatch' @@ -47,7 +47,7 @@ jobs: - run: npm run build - run: npx playwright install --with-deps chromium if: matrix.channel == 'bidi-chromium' - - if: matrix.channel == 'bidi-firefox-nightly' + - if: matrix.channel == 'moz-firefox' id: install_firefox run: | npx -y @puppeteer/browsers install firefox@nightly |\ diff --git a/packages/playwright-core/src/server/registry/index.ts b/packages/playwright-core/src/server/registry/index.ts index 1911740360..4dfb63b98e 100644 --- a/packages/playwright-core/src/server/registry/index.ts +++ b/packages/playwright-core/src/server/registry/index.ts @@ -475,7 +475,7 @@ function readDescriptors(browsersJSON: BrowsersJSON): BrowsersJSONDescriptor[] { export type BrowserName = 'chromium' | 'firefox' | 'webkit' | 'bidi'; type InternalTool = 'ffmpeg' | 'winldd' | 'firefox-beta' | 'chromium-tip-of-tree' | 'chromium-headless-shell' | 'chromium-tip-of-tree-headless-shell' | 'android'; -type BidiChannel = 'bidi-firefox-stable' | 'bidi-firefox-beta' | 'bidi-firefox-nightly' | 'bidi-chrome-canary' | 'bidi-chrome-stable' | 'bidi-chromium'; +type BidiChannel = 'moz-firefox' | 'moz-firefox-beta' | 'moz-firefox-nightly' | 'bidi-chrome-canary' | 'bidi-chrome-stable' | 'bidi-chromium'; type ChromiumChannel = 'chrome' | 'chrome-beta' | 'chrome-dev' | 'chrome-canary' | 'msedge' | 'msedge-beta' | 'msedge-dev' | 'msedge-canary'; const allDownloadable = ['android', 'chromium', 'firefox', 'webkit', 'ffmpeg', 'firefox-beta', 'chromium-tip-of-tree', 'chromium-headless-shell', 'chromium-tip-of-tree-headless-shell']; @@ -682,17 +682,17 @@ export class Registry { 'win32': `\\Microsoft\\Edge SxS\\Application\\msedge.exe`, })); - this._executables.push(this._createBidiFirefoxChannel('bidi-firefox-stable', { + this._executables.push(this._createBidiFirefoxChannel('moz-firefox', { 'linux': '/snap/bin/firefox', 'darwin': '/Applications/Firefox.app/Contents/MacOS/firefox', 'win32': '\\Mozilla Firefox\\firefox.exe', })); - this._executables.push(this._createBidiFirefoxChannel('bidi-firefox-beta', { + this._executables.push(this._createBidiFirefoxChannel('moz-firefox-beta', { 'linux': '/opt/firefox-beta/firefox', 'darwin': '/Applications/Firefox.app/Contents/MacOS/firefox', 'win32': '\\Mozilla Firefox\\firefox.exe', })); - this._executables.push(this._createBidiFirefoxChannel('bidi-firefox-nightly', { + this._executables.push(this._createBidiFirefoxChannel('moz-firefox-nightly', { 'linux': '/opt/firefox-nightly/firefox', 'darwin': '/Applications/Firefox Nightly.app/Contents/MacOS/firefox', 'win32': '\\Mozilla Firefox\\firefox.exe', diff --git a/tests/bidi/README.md b/tests/bidi/README.md index 8ddf79570f..91e1124861 100644 --- a/tests/bidi/README.md +++ b/tests/bidi/README.md @@ -7,7 +7,7 @@ git clone https://github.com/microsoft/playwright.git cd playwright npm run build # call `npm run watch` for watch mode npx playwright install chromium -npm run biditest -- --project='bidi-firefox-beta-*' +npm run biditest -- --project='moz-firefox-*' ``` To install beta channel of Firefox, run the following command in the project root: @@ -16,7 +16,7 @@ npx -y @puppeteer/browsers install firefox@beta ``` After that you need to pass custom firefox binary path to the test runner via `BIDI_FFPATH`: ```sh -BIDI_FFPATH='/Users/myself/playwright/firefox/mac_arm-beta_138.0b5/Firefox.app/Contents/MacOS/firefox' npm run biditest -- --project='bidi-firefox-beta-*' +BIDI_FFPATH='/Users/myself/playwright/firefox/mac_arm-beta_138.0b5/Firefox.app/Contents/MacOS/firefox' npm run biditest -- --project='moz-firefox-*' ``` For custom Chromium path use `BIDI_CRPATH`. diff --git a/tests/bidi/playwright.config.ts b/tests/bidi/playwright.config.ts index f9e79ae902..05340d683a 100644 --- a/tests/bidi/playwright.config.ts +++ b/tests/bidi/playwright.config.ts @@ -76,7 +76,7 @@ const getExecutablePath = (browserName: BrowserName) => { const browserToChannels = { '_bidiChromium': ['bidi-chromium', 'bidi-chrome-canary', 'bidi-chrome-stable'], - '_bidiFirefox': ['bidi-firefox-nightly', 'bidi-firefox-beta', 'bidi-firefox-stable'], + '_bidiFirefox': ['moz-firefox'], }; for (const [key, channels] of Object.entries(browserToChannels)) {