☕️ Classic, reliable, trusted test framework for Node.js and the browser
fix bad merge of karma.conf.js
Christopher Hiller16762d1a521c
diff --git a/karma.conf.js b/karma.conf.jsindex e245aa47..76e8ae63 100644--- a/karma.conf.js+++ b/karma.conf.js@@ -60,6 +60,7 @@ module.exports = function(config) {console.error('CI mode enabled');if (env.TRAVIS) {console.error('Travis-CI detected');+ bundleDirpath = path.join(baseBundleDirpath, process.env.TRAVIS_BUILD_ID);if (env.SAUCE_USERNAME && env.SAUCE_ACCESS_KEY) {// correlate build/tunnel with TravissauceConfig = {@@ -67,14 +68,16 @@ module.exports = function(config) {+ ' (' + env.TRAVIS_BUILD_ID + ')',tunnelIdentifier: env.TRAVIS_JOB_NUMBER};- console.error('Configured SauceLabs')+ console.error('Configured SauceLabs');} else {console.error('No SauceLabs credentials present');}} else if (env.APPVEYOR) {console.error('AppVeyor detected');+ bundleDirpath = path.join(baseBundleDirpath, process.env.APPVEYOR_BUILD_ID);} else {- console.error('Local/unknown environment detected')+ console.error('Local/unknown environment detected');+ bundleDirpath = path.join(baseBundleDirpath, 'local');// don't need to run sauce from appveyor b/c travis does it.if (!(env.SAUCE_USERNAME || env.SAUCE_ACCESS_KEY)) {console.error('No SauceLabs credentials present');@@ -85,6 +88,7 @@ module.exports = function(config) {console.error('Configured SauceLabs');}}+ mkdirp.sync(bundleDirpath);} else {console.error('CI mode disabled');}