anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1140 from greggzigler/travis_karma

Browse source 
Add karma to travis
This commit is contained in:
Matias Alejo Garcia 2014-08-21 10:45:27 -04:00
commit 9bf7586de0
4 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
.travis.yml
View file

@ -1,9 +1,16 @@
language: node_js language: node_js
node_js: node_js:
- '0.10' - '0.10'
before_install: npm install -g grunt-cli before_install:
install: npm install - npm install -g bower
before_script: grunt shell - npm install -g grunt-cli
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
install:
- npm install
- bower install
before_script:
- grunt shell --target=dev
notifications: notifications:
hipchat: hipchat:
rooms: rooms:

3
bower.json
View file

@ -23,5 +23,8 @@
"mousetrap": "1.4.6", "mousetrap": "1.4.6",
"zeroclipboard": "~2.1.6", "zeroclipboard": "~2.1.6",
"ng-idle": "*" "ng-idle": "*"
},
"resolutions": {
"angular": "=1.2.19"
} }
} }

7
js/services/notifications.js
View file

@ -200,8 +200,11 @@ factory('notification', ['$timeout',
}, settings[type].duration); }, settings[type].duration);
} }
// Movile notification // Mobile notification
window.navigator.vibrate([200,100,200]); if (window && window.navigator && window.navigator.vibrate) {
window.navigator.vibrate([200,100,200]);
};
if (document.hidden && (type == 'info' || type == 'funds')) { if (document.hidden && (type == 'info' || type == 'funds')) {
new window.Notification(title, {body: content, icon:'img/notification.png'}); new window.Notification(title, {body: content, icon:'img/notification.png'});
} }

3
package.json
View file

@ -24,7 +24,7 @@
"setup-shell": "node shell/scripts/download-atom-shell.js", "setup-shell": "node shell/scripts/download-atom-shell.js",
"start": "node server.js", "start": "node server.js",
"coverage": "./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha -- --reporter spec test", "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/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", "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", "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" "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 +60,7 @@
"istanbul": "0.2.10", "istanbul": "0.2.10",
"karma": "0.12.9", "karma": "0.12.9",
"karma-chrome-launcher": "0.1.3", "karma-chrome-launcher": "0.1.3",
"karma-firefox-launcher": "~0.1",
"karma-mocha": "0.1.3", "karma-mocha": "0.1.3",
"karma-phantomjs-launcher": "^0.1.4", "karma-phantomjs-launcher": "^0.1.4",
"mocha": "1.18.2", "mocha": "1.18.2",