diff options
| author | Hendrik Leppelsack <hendrik@leppelsack.de> | 2016-03-25 16:22:59 +0100 |
|---|---|---|
| committer | Hendrik Leppelsack <hendrik@leppelsack.de> | 2016-03-25 16:22:59 +0100 |
| commit | b0c2b8e4380fafdfffcd9844235fb43e265cdaca (patch) | |
| tree | a51994c992fbfab51f74497fbbffce8a0c7357cf /karma.conf.js | |
| parent | 9ed868cf879a0adbb326f01fde296bcd667f39d7 (diff) | |
fix travis tests
Diffstat (limited to 'karma.conf.js')
| -rw-r--r-- | karma.conf.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/karma.conf.js b/karma.conf.js index 58b66679..4ee11425 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -12,7 +12,6 @@ module.exports = function(config) { // list of files / patterns to load in the browser files: [ - '../../core/vendor/underscore/underscore.js', 'js/vendor/angular/angular.js', 'js/vendor/angular-route/angular-route.js', 'js/vendor/angular-uuid4/angular-uuid4.js', @@ -23,6 +22,7 @@ module.exports = function(config) { 'js/dav/dav.js', 'js/vendor/vcard/src/vcard.js', + 'js/vendor/underscore/underscore.js', 'js/vendor/angular-mocks/angular-mocks.js', 'js/public/script.js', @@ -81,7 +81,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 |