Skip to content

Commit

Permalink
fix(karma): do not use angular 1.6.x
Browse files Browse the repository at this point in the history
This commit fixes the angular-mocks code to using the angular 1.5.x
branch of the codebase.  It also removes the double-call to angular in
the test output.
  • Loading branch information
Jonathan Niles authored and sfount committed Dec 13, 2016
1 parent ad89816 commit b8d0c67
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"angular-ui-select": "^0.17.1"
},
"devDependencies": {
"angular-mocks": "^1.5.9"
"angular-mocks": "1.5.9"
},
"resolutions": {
"angular": "1.5.9"
Expand Down
3 changes: 1 addition & 2 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@ module.exports = function(config) {

// list of files / patterns to load in the browser
files: [
'client/vendor/angular/angular.js',
'client/vendor/angular-mocks/angular-mocks.js',
'bin/client/js/vendor.min.js',
'client/vendor/angular-mocks/angular-mocks.js',
'bin/client/js/bhima.min.js',
'bin/client/partials/**/*.html',
'test/client-unit/**/*.spec.js'
Expand Down

0 comments on commit b8d0c67

Please sign in to comment.