From 2b26188f5e96520cf6236cc8b43e5feda2f0d4e1 Mon Sep 17 00:00:00 2001 From: Gregg Zigler Date: Wed, 20 Aug 2014 09:44:42 -0700 Subject: [PATCH] experiment using firefox instead of chrome --- karma.conf.js | 2 +- package.json | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index 48a1e18f3..52bd39b48 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -99,7 +99,7 @@ module.exports = function(config) { // start these browsers // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher - browsers: ['Chrome'], + browsers: ['Firefox'], // Continuous Integration mode diff --git a/package.json b/package.json index c807a8ba3..ac7eaec7f 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,8 @@ "setup-shell": "node shell/scripts/download-atom-shell.js", "start": "node server.js", "coverage": "./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha -- --reporter spec test", - "test": "./node_modules/karma/bin/karma start --single-run && node_modules/.bin/istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js", + "test-original": "./node_modules/.bin/istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js", + "test": "./node_modules/karma/bin/karma start --browsers Firefox --single-run --captureTimeout 10000", "dist": "node shell/scripts/dist.js", "sign": "gpg -u 1112CFA1 --output browser-extensions/firefox/copay.xpi.sig --detach-sig browser-extensions/firefox/copay.xpi; gpg -u 1112CFA1 --output browser-extensions/chrome/copay-chrome-extension.zip.sig --detach-sig browser-extensions/chrome/copay-chrome-extension.zip", "verify": "gpg --verify browser-extensions/firefox/copay.xpi.sig browser-extensions/firefox/copay.xpi; gpg --verify browser-extensions/chrome/copay-chrome-extension.zip.sig browser-extensions/chrome/copay-chrome-extension.zip" @@ -60,6 +61,7 @@ "istanbul": "0.2.10", "karma": "0.12.9", "karma-chrome-launcher": "0.1.3", + "karma-firefox-launcher": "~0.1", "karma-mocha": "0.1.3", "karma-phantomjs-launcher": "^0.1.4", "mocha": "1.18.2",