Skip to content

Commit

Permalink
Update packages to use chrome for unit tests.
Browse files Browse the repository at this point in the history
Phantom js doesn't work with angular 1.5
  • Loading branch information
kerzner committed May 1, 2016
1 parent 632cc40 commit 187fdcd
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
"name": "connectivityMatrixJs",
"version": "0.0.0",
"dependencies": {
"angular-animate": "~1.4.2",
"angular-cookies": "~1.4.2",
"angular-touch": "~1.4.2",
"angular-sanitize": "~1.4.2",
"angular-messages": "~1.4.2",
"angular-aria": "~1.4.2",
"angular-animate": "~1.5.5",
"angular-cookies": "~1.5.5",
"angular-touch": "~1.5.5",
"angular-sanitize": "~1.5.5",
"angular-messages": "~1.5.5",
"angular-aria": "~1.5.5",
"jquery": "~2.1.4",
"angular-ui-router": "~0.2.15",
"bootstrap": "~3.3.5",
Expand Down
4 changes: 2 additions & 2 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ module.exports = function(config) {

frameworks: ['jasmine'],

browsers : ['PhantomJS'],
browsers : ['Chrome'],

plugins : [
'karma-phantomjs-launcher',
'karma-chrome-launcher',
'karma-coverage',
'karma-jasmine',
'karma-ng-html2js-preprocessor'
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"wiredep": "~2.2.2",
"karma": "~0.13.10",
"karma-jasmine": "~0.3.6",
"karma-phantomjs-launcher": "~0.2.1",
"karma-chrome-launcher": "~0.2.3",
"phantomjs": "~1.9.18",
"karma-coverage": "~0.5.2",
"karma-ng-html2js-preprocessor": "~0.2.0",
Expand Down

0 comments on commit 187fdcd

Please sign in to comment.