Skip to content

Commit

Permalink
revert 93392dd; downgrade to phantomjs v1.9.8; closes mochajs#2840 (m…
Browse files Browse the repository at this point in the history
  • Loading branch information
boneskull committed May 27, 2017
1 parent 99b282b commit 4aaaadd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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: {
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 4aaaadd

Please sign in to comment.