diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml index 4c3a483a..12e7c10b 100644 --- a/.github/workflows/e2e-tests.yaml +++ b/.github/workflows/e2e-tests.yaml @@ -7,11 +7,14 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - browser: [chrome] - version: [stable, beta, dev] + browser: [chrome, stable] + version: [stable, beta] include: - browser: firefox - version: nightly + version: [nightly, esr] + include: + - browser: chrome + version: [dev] steps: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 diff --git a/test/karma.conf.js b/test/karma.conf.js index 660faf46..23130246 100644 --- a/test/karma.conf.js +++ b/test/karma.conf.js @@ -11,29 +11,7 @@ const os = require('os'); const puppeteerBrowsers = require('@puppeteer/browsers'); -async function determineFirefoxVersion(version) { - const rawVersions = await fetch('https://product-details.mozilla.org/1.0/firefox_versions.json'); - const versions = await rawVersions.json(); - return versions.FIREFOX_NIGHTLY; - // TODO: support stable, beta, nightly, esr. - // This has issues with the assumptions browsers makes about download urls - // (or Firefox about directory structure and where it includes the platform) - // This base url coems close: - // 'https://archive.mozilla.org/pub/firefox/releases/' + buildId + '/' + platform + '/en-US/'; -} - async function download(browser, version, cacheDir, platform) { - if (browser === 'firefox') { - // TODO: see above, resolve stable, beta, nightly, esr - const buildId = await determineFirefoxVersion(version); - await puppeteerBrowsers.install({ - browser, - buildId, - cacheDir, - platform, - }); - return buildId; - } const buildId = await puppeteerBrowsers .resolveBuildId(browser, platform, version); await puppeteerBrowsers.install({