Skip to content
This repository has been archived by the owner on Dec 4, 2023. It is now read-only.

Commit

Permalink
use Chrome for browser tests when run on macOS Sierra; closes mochajs…
Browse files Browse the repository at this point in the history
  • Loading branch information
boneskull committed Oct 10, 2016
1 parent 4a8e3c9 commit 0557598
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 2 additions & 1 deletion karma.conf.js
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'],
browsers: [osName() === 'macOS Sierra' ? 'Chrome' : 'PhantomJS'],
logLevel: config.LOG_INFO,
client: {
mocha: {
Expand Down
2 changes: 2 additions & 0 deletions package.json
Expand Up @@ -324,11 +324,13 @@
"expect.js": "^0.3.1",
"karma": "^1.1.0",
"karma-browserify": "^5.0.5",
"karma-chrome-launcher": "^2.0.0",
"karma-expect": "^1.1.2",
"karma-no-mocha": "^2.0.0",
"karma-phantomjs-launcher": "^0.2.3",
"karma-sauce-launcher": "^1.0.0",
"karma-spec-reporter": "0.0.26",
"os-name": "^2.0.1",
"phantomjs": "1.9.8",
"rimraf": "^2.5.2",
"should": "^9.0.2",
Expand Down

0 comments on commit 0557598

Please sign in to comment.