From 1c72d5c006776a84d5e72240b7ee6a23675aadbf Mon Sep 17 00:00:00 2001 From: Christopher Hiller Date: Sun, 9 Oct 2016 21:02:46 -0700 Subject: [PATCH] use Chrome for browser tests when run on macOS Sierra; closes #2524 --- karma.conf.js | 3 ++- package.json | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/karma.conf.js b/karma.conf.js index 72161a065f..8a85bf35cb 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'], + browsers: [osName() === 'macOS Sierra' ? 'Chrome' : 'PhantomJS'], logLevel: config.LOG_INFO, client: { mocha: { diff --git a/package.json b/package.json index 93c07b82d2..af6ba1003e 100644 --- a/package.json +++ b/package.json @@ -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",