From 99be17276439731ffea47063abe50371e43ca229 Mon Sep 17 00:00:00 2001 From: Gregg Zigler Date: Tue, 19 Aug 2014 11:21:24 -0700 Subject: [PATCH 01/18] add karma to travis --- .travis.yml | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5a0bbe949..ad25e8dbd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,10 @@ before_install: npm install -g grunt-cli install: npm install before_script: grunt shell notifications: - hipchat: - rooms: - secure: ibsyaK2/7hdms9pRHCibamfUtA1yb5Ib3tIQOChwnfNSkpOy5ZViuq92duPZpKacgNuRmiwp6wfbDY8duLiadwnCet4V3dHAGqt+t9o+O7A9DzxNeYFFHnnrhqhg95PjWK6UyFqrQajPIr+n11M2itEQLa7kljQxJZ3Z26zJCdI= + email: + recipients: + - gregg@bitpay.com template: - '%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message} (Details/Change view)' format: html - on_success: never + on_success: always diff --git a/package.json b/package.json index bdb0562f2..3bffb680a 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "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/.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/.bin/karma start --single-run --browsers PhantomJS && node_modules/.bin/istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js", "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" From 95cf9f663e1ba39704b95622b5f8ea1958899502 Mon Sep 17 00:00:00 2001 From: Gregg Zigler Date: Tue, 19 Aug 2014 11:24:20 -0700 Subject: [PATCH 02/18] fix yml syntax errors --- .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index ad25e8dbd..570c51884 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,5 @@ before_script: grunt shell notifications: email: recipients: - - gregg@bitpay.com - template: - - '%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message} (Details/Change view)' - format: html + - gregg@bitpay.com on_success: always From 43de3b606381abd7c0dec19cd9880c603a2bc2af Mon Sep 17 00:00:00 2001 From: Gregg Zigler Date: Tue, 19 Aug 2014 11:36:29 -0700 Subject: [PATCH 03/18] fix path to karma binary --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3bffb680a..001ac67ba 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "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/.bin/karma start --single-run --browsers PhantomJS && 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/bin/karma start --single-run --browsers PhantomJS && node_modules/.bin/istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js", "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" From c91e752a39c560cc8f0bd802720a0978d8da08a8 Mon Sep 17 00:00:00 2001 From: Gregg Zigler Date: Tue, 19 Aug 2014 11:42:31 -0700 Subject: [PATCH 04/18] one more time --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 001ac67ba..931a4d525 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "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/bin/karma start --single-run --browsers PhantomJS && 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 --single-run --browsers PhantomJS && node_modules/.bin/istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js", "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" From c95a35dbc531bcdc23999d82b3aff666850f0128 Mon Sep 17 00:00:00 2001 From: Gregg Zigler Date: Tue, 19 Aug 2014 11:53:18 -0700 Subject: [PATCH 05/18] bower install required to create angular lib --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 570c51884..223099c8f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,9 @@ language: node_js node_js: - '0.10' before_install: npm install -g grunt-cli -install: npm install +install: + - npm install + - bower install before_script: grunt shell notifications: email: From 9359ac311be288d0159ea994122681f61a17e0a9 Mon Sep 17 00:00:00 2001 From: Gregg Zigler Date: Tue, 19 Aug 2014 12:51:28 -0700 Subject: [PATCH 06/18] install bower before install copay --- .travis.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 223099c8f..f96ad7ce9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,14 @@ language: node_js node_js: - '0.10' -before_install: npm install -g grunt-cli -install: +before_install: + - npm install -g bower + - npm install -g grunt-cli +install: - npm install - bower install -before_script: grunt shell +before_script: + - grunt shell notifications: email: recipients: From 22b7225bf9a38999bd603fcb86f539ecdafa50fe Mon Sep 17 00:00:00 2001 From: Gregg Zigler Date: Tue, 19 Aug 2014 13:12:06 -0700 Subject: [PATCH 07/18] save angular version to bower.json to avoid prompt during install --- bower.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bower.json b/bower.json index 0d7fd711c..6cf4486c2 100644 --- a/bower.json +++ b/bower.json @@ -24,5 +24,8 @@ "mousetrap": "1.4.6", "zeroclipboard": "~2.1.6", "ng-idle": "*" + }, + "resolutions": { + "angular": "=1.2.19" } } From 53a873379fa1074841c2a9445ea6d9cc2df98066 Mon Sep 17 00:00:00 2001 From: Gregg Zigler Date: Tue, 19 Aug 2014 13:36:10 -0700 Subject: [PATCH 08/18] need target=dev in order for karma to find sinon --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f96ad7ce9..70110c05d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ install: - npm install - bower install before_script: - - grunt shell + - grunt shell --target=dev notifications: email: recipients: From 55e98ef5082a325a877caf484a22e721c909e348 Mon Sep 17 00:00:00 2001 From: Gregg Zigler Date: Tue, 19 Aug 2014 14:10:33 -0700 Subject: [PATCH 09/18] change PhantomJS to Firefox browser to that window.navigator.vibrate will pass --- .travis.yml | 2 ++ package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 70110c05d..1b2bc21d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,8 @@ install: - bower install before_script: - grunt shell --target=dev + - export DISPLAY=:99.0 + - sh -e /etc/init.d/xvfb start notifications: email: recipients: diff --git a/package.json b/package.json index 931a4d525..9268fc3e5 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "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 --browsers PhantomJS && 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 --single-run --browsers Firefox && node_modules/.bin/istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js", "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" From 3f180fec27e38bc9921f4ba8a5cbca24e8515ae5 Mon Sep 17 00:00:00 2001 From: Gregg Zigler Date: Tue, 19 Aug 2014 14:41:55 -0700 Subject: [PATCH 10/18] do not try to vibrate in travis --- js/services/notifications.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/js/services/notifications.js b/js/services/notifications.js index 908ae74b7..ba8cb49f9 100644 --- a/js/services/notifications.js +++ b/js/services/notifications.js @@ -200,8 +200,11 @@ factory('notification', ['$timeout', }, settings[type].duration); } - // Movile notification - window.navigator.vibrate([200,100,200]); + // Mobile notification + if (window && window.navigator && window.navigator.vibrate) { + window.navigator.vibrate([200,100,200]); + }; + if (document.hidden && (type == 'info' || type == 'funds')) { new window.Notification(title, {body: content, icon:'img/notification.png'}); } From 7955ffc06f051a68bbbfe19aee25709568d38015 Mon Sep 17 00:00:00 2001 From: Gregg Zigler Date: Tue, 19 Aug 2014 14:58:29 -0700 Subject: [PATCH 11/18] change firefox back to headless PhantomJS browser, now that vibrate call is guarded --- .travis.yml | 2 -- package.json | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1b2bc21d6..70110c05d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,6 @@ install: - bower install before_script: - grunt shell --target=dev - - export DISPLAY=:99.0 - - sh -e /etc/init.d/xvfb start notifications: email: recipients: diff --git a/package.json b/package.json index 9268fc3e5..931a4d525 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "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 --browsers Firefox && 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 --single-run --browsers PhantomJS && node_modules/.bin/istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js", "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" From fb1c061e367cde3125fe01e2b0e3902ba1b5a6cb Mon Sep 17 00:00:00 2001 From: Gregg Zigler Date: Tue, 19 Aug 2014 16:20:02 -0700 Subject: [PATCH 12/18] try firefox again, lowercase this time --- .travis.yml | 2 ++ package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 70110c05d..4b6d61667 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,8 @@ node_js: before_install: - npm install -g bower - npm install -g grunt-cli + - "export DISPLAY=:99.0" + - "sh -e /etc/init.d/xvfb start" install: - npm install - bower install diff --git a/package.json b/package.json index 931a4d525..b6c2ff8de 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "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 --browsers PhantomJS && 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 --single-run --browsers firefox && node_modules/.bin/istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js", "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" From 6b93658429a5d0c8e4d4f9909be8c393c12b7951 Mon Sep 17 00:00:00 2001 From: Gregg Zigler Date: Tue, 19 Aug 2014 16:29:09 -0700 Subject: [PATCH 13/18] try removing browser option from karma start --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b6c2ff8de..c807a8ba3 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "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 --browsers firefox && 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 --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", "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" From 5d12fd953dabfec1b6b2bbf10bbe14d55964fe54 Mon Sep 17 00:00:00 2001 From: Gregg Zigler Date: Tue, 19 Aug 2014 16:57:24 -0700 Subject: [PATCH 14/18] travis ubuntu needs CHROME_BIN env variable to find browser --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 4b6d61667..491ad92cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ node_js: before_install: - npm install -g bower - npm install -g grunt-cli + - "export CHROME_BIN=/usr/bin/chromium-browser" - "export DISPLAY=:99.0" - "sh -e /etc/init.d/xvfb start" install: From 2b26188f5e96520cf6236cc8b43e5feda2f0d4e1 Mon Sep 17 00:00:00 2001 From: Gregg Zigler Date: Wed, 20 Aug 2014 09:44:42 -0700 Subject: [PATCH 15/18] 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", From f654e1722f0d158598c2167e8d93b07207a1d869 Mon Sep 17 00:00:00 2001 From: Gregg Zigler Date: Wed, 20 Aug 2014 10:11:00 -0700 Subject: [PATCH 16/18] use firefox when running karma in travis --- .travis.yml | 5 ++--- karma.conf.js | 2 +- package.json | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 491ad92cf..bb5a27f85 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,8 @@ node_js: before_install: - npm install -g bower - npm install -g grunt-cli - - "export CHROME_BIN=/usr/bin/chromium-browser" - - "export DISPLAY=:99.0" - - "sh -e /etc/init.d/xvfb start" + - export DISPLAY=:99.0 + - sh -e /etc/init.d/xvfb start install: - npm install - bower install diff --git a/karma.conf.js b/karma.conf.js index 52bd39b48..48a1e18f3 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: ['Firefox'], + browsers: ['Chrome'], // Continuous Integration mode diff --git a/package.json b/package.json index ac7eaec7f..2f98b762e 100644 --- a/package.json +++ b/package.json @@ -24,8 +24,7 @@ "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-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", + "test": "./node_modules/.bin/istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && ./node_modules/karma/bin/karma start --browsers Firefox --single-run", "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" From 87fc39f8f82c29627624de6668c86d10b08eed30 Mon Sep 17 00:00:00 2001 From: Gregg Zigler Date: Wed, 20 Aug 2014 10:19:54 -0700 Subject: [PATCH 17/18] use firefox instead of chrome when running karma in travis change notification settings back to original hipchat room --- .travis.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index bb5a27f85..2cffb832f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,10 @@ install: before_script: - grunt shell --target=dev notifications: - email: - recipients: - - gregg@bitpay.com - on_success: always + hipchat: + rooms: + secure: ibsyaK2/7hdms9pRHCibamfUtA1yb5Ib3tIQOChwnfNSkpOy5ZViuq92duPZpKacgNuRmiwp6wfbDY8duLiadwnCet4V3dHAGqt+t9o+O7A9DzxNeYFFHnnrhqhg95PjWK6UyFqrQajPIr+n11M2itEQLa7kljQxJZ3Z26zJCdI= + template: + - '%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message} (Details/Change view)' + format: html + on_success: never \ No newline at end of file From 904a87b483385a8625ff9616dc19c23c74d34054 Mon Sep 17 00:00:00 2001 From: Gregg Zigler Date: Wed, 20 Aug 2014 10:35:23 -0700 Subject: [PATCH 18/18] use firefox instead of chrome when running karma in travis clean up a few accidental changes --- .travis.yml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2cffb832f..15feb56fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,4 +18,4 @@ notifications: template: - '%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message} (Details/Change view)' format: html - on_success: never \ No newline at end of file + on_success: never diff --git a/package.json b/package.json index 2f98b762e..449f59d17 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "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/.bin/istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && ./node_modules/karma/bin/karma start --browsers Firefox --single-run", + "test": "node_modules/.bin/istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && ./node_modules/karma/bin/karma start --browsers Firefox --single-run", "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"