Skip to content

Commit b5e5f71

Browse files
authored
Merge pull request webrtcHacks#1157 from webrtcHacks/test-logging
test: ignore CHROME_BIN/FIREFOX_BIN environment variables
2 parents 1ee2f65 + 42d3a29 commit b5e5f71

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

test/karma.conf.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
'use strict';
1010

1111
const os = require('os');
12+
const path = require('path');
1213
const puppeteerBrowsers = require('@puppeteer/browsers');
1314

1415
async function download(browser, version, cacheDir, platform) {
@@ -24,7 +25,7 @@ async function download(browser, version, cacheDir, platform) {
2425
}
2526

2627
module.exports = async(config) => {
27-
const cacheDir = process.cwd() + '/browsers';
28+
const cacheDir = path.join(process.cwd(), 'browsers');
2829
const platform = puppeteerBrowsers.detectBrowserPlatform();
2930

3031
let browsers;
@@ -58,13 +59,13 @@ module.exports = async(config) => {
5859
'/Contents/MacOS/Safari Technology Preview';
5960
}
6061

61-
if (browsers.includes('firefox') && !process.env.FIREFOX_BIN) {
62+
if (browsers.includes('firefox')) {
6263
const buildId = await download('firefox', process.env.BVER || 'stable',
6364
cacheDir, platform);
6465
process.env.FIREFOX_BIN = puppeteerBrowsers
6566
.computeExecutablePath({browser: 'firefox', buildId, cacheDir, platform});
6667
}
67-
if (browsers.includes('chrome') && !process.env.CHROME_BIN) {
68+
if (browsers.includes('chrome')) {
6869
const buildId = await download('chrome', process.env.BVER || 'stable',
6970
cacheDir, platform);
7071
process.env.CHROME_BIN = puppeteerBrowsers

0 commit comments

Comments
 (0)