diff --git a/karma.conf.js b/karma.conf.js index 94e4a0e7d7..885d170363 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -4,7 +4,6 @@ var fs = require('fs'); var path = require('path'); var mkdirp = require('mkdirp'); var baseBundleDirpath = path.join(__dirname, '.karma'); -var osName = require('os-name'); var browserPlatformPairs = { 'chrome@latest': 'Windows 8', @@ -24,15 +23,6 @@ module.exports = function (config) { 'expect', 'mocha' ], - plugins: [ - 'karma-browserify', - 'karma-chrome-launcher', - 'karma-phantomjs-launcher', - 'karma-expect', - 'karma-mocha', - 'karma-spec-reporter', - require('@coderbyheart/karma-sauce-launcher') - ], files: [ // we use the BDD interface for all of the tests that // aren't interface-specific. @@ -61,8 +51,8 @@ module.exports = function (config) { }, reporters: ['spec'], colors: true, - browsers: [osName() === 'macOS Sierra' ? 'Chrome' : 'PhantomJS'], // This is the default browser to run, locally - logLevel: config.LOG_DEBUG, + browsers: ['PhantomJS'], + logLevel: config.LOG_INFO, client: { mocha: { reporter: 'html' diff --git a/package.json b/package.json index 63d87fe2b0..0b59475a6e 100644 --- a/package.json +++ b/package.json @@ -314,12 +314,10 @@ "growl": "1.10.2", "he": "1.1.1", "json3": "3.3.2", - "lodash.create": "3.1.1", "mkdirp": "0.5.1", "supports-color": "3.1.2" }, "devDependencies": { - "@coderbyheart/karma-sauce-launcher": "git://github.com/coderbyheart/karma-sauce-launcher#5259942cd6d40090eaa13ceeef5b0b8738c7710f", "assert": "^1.4.1", "browserify": "^14.4.0", "buffer": "^4.9.1", @@ -334,12 +332,14 @@ "eslint-plugin-promise": "^3.4.0", "eslint-plugin-standard": "^3.0.1", "expect.js": "^0.3.1", - "karma": "1.3.0", + "karma": "^1.7.1", "karma-browserify": "^5.0.5", "karma-chrome-launcher": "^2.0.0", "karma-expect": "^1.1.2", "karma-mocha": "^1.3.0", - "karma-phantomjs-launcher": "0.2.3", + "karma-mocha-reporter": "^2.2.4", + "karma-phantomjs-launcher": "^1.0.4", + "karma-sauce-launcher": "^1.2.0", "karma-spec-reporter": "0.0.31", "nyc": "^11.2.1", "os-name": "^2.0.1",