From 42d3a29d764c3d7d0be95d7787b77111de67035c Mon Sep 17 00:00:00 2001 From: Philipp Hancke Date: Sat, 20 Apr 2024 15:59:04 -0700 Subject: [PATCH] test: ignore CHROME_BIN/FIREFOX_BIN environment variables CHROME_BIN already exists on github actions, avoiding the download of the beta/canary version. Also use path.join to join path to browser --- test/karma.conf.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/karma.conf.js b/test/karma.conf.js index 23130246..090177cb 100644 --- a/test/karma.conf.js +++ b/test/karma.conf.js @@ -9,6 +9,7 @@ 'use strict'; const os = require('os'); +const path = require('path'); const puppeteerBrowsers = require('@puppeteer/browsers'); async function download(browser, version, cacheDir, platform) { @@ -24,7 +25,7 @@ async function download(browser, version, cacheDir, platform) { } module.exports = async(config) => { - const cacheDir = process.cwd() + '/browsers'; + const cacheDir = path.join(process.cwd(), 'browsers'); const platform = puppeteerBrowsers.detectBrowserPlatform(); let browsers; @@ -58,13 +59,13 @@ module.exports = async(config) => { '/Contents/MacOS/Safari Technology Preview'; } - if (browsers.includes('firefox') && !process.env.FIREFOX_BIN) { + if (browsers.includes('firefox')) { const buildId = await download('firefox', process.env.BVER || 'stable', cacheDir, platform); process.env.FIREFOX_BIN = puppeteerBrowsers .computeExecutablePath({browser: 'firefox', buildId, cacheDir, platform}); } - if (browsers.includes('chrome') && !process.env.CHROME_BIN) { + if (browsers.includes('chrome')) { const buildId = await download('chrome', process.env.BVER || 'stable', cacheDir, platform); process.env.CHROME_BIN = puppeteerBrowsers