Merge pull request #570 from marmelab/fix_tests

[RFR] Fix tests
marmelab · Jul 23, 2015 · 428c22c · 428c22c
2 parents 58919a5 + 24922d9
commit 428c22c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/javascripts/test/karma.conf.js b/src/javascripts/test/karma.conf.js
@@ -13,8 +13,8 @@ module.exports = function (config) {
         frameworks: ['jasmine'],
         files: [
             '../../node_modules/angular/angular.js',
-            '../../node_modules/angular-bootstrap/dist/ui-bootstrap.min.js',
-            '../../node_modules/angular-bootstrap/dist/ui-bootstrap-tpls.min.js',
+            '../../node_modules/angular-bootstrap/ui-bootstrap.min.js',
+            '../../node_modules/angular-bootstrap/ui-bootstrap-tpls.min.js',
             '../../node_modules/angular-mocks/angular-mocks.js',
             '../../node_modules/angular-numeraljs/dist/angular-numeraljs.min.js',
             '../../node_modules/numeral/numeral.js',

diff --git a/src/javascripts/vendors.js b/src/javascripts/vendors.js
@@ -10,6 +10,7 @@ require('textangular');
 require('ui-select');
 
 require('../../node_modules/angular-numeraljs/dist/angular-numeraljs');
+require('angular-bootstrap/ui-bootstrap');
 require('angular-bootstrap/ui-bootstrap-tpls');
 require('../../node_modules/ng-file-upload/dist/ng-file-upload');