Skip to content

armgit / mocha

Public Imported from GitHub
0

☕️ Classic, reliable, trusted test framework for Node.js and the browser

Fix: karma-mocha should run both browser bundles (#4663)

Juerg Bf033ff1ab561
diff --git a/karma.conf.js b/karma.conf.js
index 9f05b3e2..f94dbdba 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -29,6 +29,11 @@ const BASE_BUNDLE_DIR_PATH = path.join(__dirname, '.karma');
const env = process.env;
const hostname = os.hostname();
+if (fs.existsSync('./mocha.js') && fs.existsSync('./mocha-es5.js')) {
+ fs.renameSync('./mocha.js', './mocha-es2018.js');
+ fs.renameSync('./mocha-es5.js', './mocha.js');
+}
+
const SAUCE_BROWSER_PLATFORM_MAP = {
'chrome@latest': 'Windows 10',
'MicrosoftEdge@latest': 'Windows 10',
diff --git a/karma_no-ie11.conf.js b/karma_no-ie11.conf.js
index 8dacc483..443a3236 100644
--- a/karma_no-ie11.conf.js
+++ b/karma_no-ie11.conf.js
@@ -18,6 +18,11 @@ const BASE_BUNDLE_DIR_PATH = path.join(__dirname, '.karma');
const env = process.env;
const hostname = os.hostname();
+if (fs.existsSync('./mocha.js') && fs.existsSync('./mocha-es2018.js')) {
+ fs.renameSync('./mocha.js', './mocha-es5.js');
+ fs.renameSync('./mocha-es2018.js', './mocha.js');
+}
+
const SAUCE_BROWSER_PLATFORM_MAP = {
'chrome@latest': 'Windows 10',
'MicrosoftEdge@latest': 'Windows 10',
diff --git a/package-scripts.js b/package-scripts.js
index 425e95df..75ef029d 100644
--- a/package-scripts.js
+++ b/package-scripts.js
@@ -211,7 +211,7 @@ module.exports = {
},
unit: {
script:
- 'cross-env NODE_PATH=. karma start karma.conf.js --single-run --colors && cross-env NODE_PATH=. karma start karma_no-ie11.conf.js --single-run --colors',
+ 'cross-env NODE_PATH=. karma start karma_no-ie11.conf.js --single-run --colors && cross-env NODE_PATH=. karma start karma.conf.js --single-run --colors',
description: 'Run browser unit tests'
},
bdd: {