From 2ec2068e420481c412361902ce654fddcd253cfc Mon Sep 17 00:00:00 2001 From: charlierudolph Date: Fri, 17 Jul 2015 16:01:09 -0700 Subject: switch to firefox for travis --- karma.conf.js | 2 +- package.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index 9300887..07c7ba8 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -1,6 +1,6 @@ module.exports = function (config) { config.set({ - browsers: ['Chrome'], + browsers: ['Firefox'], files: ['mocha_test/**/*_test.js'], frameworks: ['browserify', 'mocha'], preprocessors: { diff --git a/package.json b/package.json index 22c072d..276e942 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "jshint": "~2.8.0", "karma": "^0.13.2", "karma-browserify": "^4.2.1", - "karma-chrome-launcher": "^0.2.0", + "karma-firefox-launcher": "^0.1.6", "karma-mocha": "^0.2.0", "lodash": "^3.9.0", "mkdirp": "~0.5.1", @@ -54,8 +54,8 @@ }, "scripts": { "mocha-node-test": "mocha mocha_test/", - "mocha-browser-tests": "karma start", - "mocha-test": "npm run mocha-node-test && npm run mocha-browser-tests", + "mocha-browser-test": "karma start", + "mocha-test": "npm run mocha-node-test && npm run mocha-browser-test", "nodeunit-test": "nodeunit test/test-async.js", "test": "npm run-script lint && npm run nodeunit-test && npm run mocha-test", "lint": "jshint lib/*.js test/*.js perf/*.js && jscs lib/*.js test/*.js perf/*.js", -- cgit v1.2.1