Skip to content

armgit / mocha

Public Imported from GitHub
0

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

revert 93392dd; downgrade to phantomjs v1.9.8; closes #2840 (#2841)

Christopher Hiller4aaaaddef40c
diff --git a/karma.conf.js b/karma.conf.js
index 30d57146..2ba9d4d2 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -4,6 +4,7 @@ var fs = require('fs');
var path = require('path');
var mkdirp = require('mkdirp');
var baseBundleDirpath = path.join(__dirname, '.karma');
+var osName = require('os-name');
module.exports = function (config) {
var bundleDirpath;
@@ -47,7 +48,7 @@ module.exports = function (config) {
},
reporters: ['spec'],
colors: true,
- browsers: ['PhantomJS'], // This is the default browser to run, locally
+ browsers: [osName() === 'macOS Sierra' ? 'Chrome' : 'PhantomJS'], // This is the default browser to run, locally
logLevel: config.LOG_INFO,
client: {
mocha: {
diff --git a/package.json b/package.json
index fff3c635..562a182a 100644
--- a/package.json
+++ b/package.json
@@ -336,10 +336,11 @@
"karma-chrome-launcher": "^2.0.0",
"karma-expect": "^1.1.2",
"karma-mocha": "^1.3.0",
- "karma-phantomjs-launcher": "^1.0.2",
+ "karma-phantomjs-launcher": "0.2.3",
"karma-sauce-launcher": "coderbyheart/karma-sauce-launcher",
"karma-spec-reporter": "0.0.26",
"nyc": "^10.0.0",
+ "os-name": "^2.0.1",
"phantomjs": "1.9.8",
"rimraf": "^2.5.2",
"should": "^11.1.1",