summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcharlierudolph <charles.rudolph@originate.com>2015-07-17 16:01:09 -0700
committercharlierudolph <charles.rudolph@originate.com>2015-07-17 16:01:09 -0700
commit2ec2068e420481c412361902ce654fddcd253cfc (patch)
tree370c0b1d1d50558cb8a8cd80e2eb3324c451c85d
parenta23d3a2250923b082bb4bb73167dd04c9906c07d (diff)
downloadasync-2ec2068e420481c412361902ce654fddcd253cfc.tar.gz
switch to firefox for travis
-rw-r--r--karma.conf.js2
-rw-r--r--package.json6
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",