diff options
| author | Christoph Wurst <christoph@winzerhof-wurst.at> | 2015-09-05 14:51:11 +0300 |
|---|---|---|
| committer | Christoph Wurst <christoph@winzerhof-wurst.at> | 2015-09-05 14:51:11 +0300 |
| commit | 323fd3eadb4a540c03da7ff00fee6104e6f3dd41 (patch) | |
| tree | e20e66ffcd4637cebc2323c1a50707584c89efb8 /karma.conf.js | |
| parent | e21c88bcaa171c37bc1b4b426fcc2b3cd91f8e6d (diff) | |
use own jquery for unit tests because oc7/oc8 path differs
Diffstat (limited to 'karma.conf.js')
| -rw-r--r-- | karma.conf.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/karma.conf.js b/karma.conf.js index 910a0f8be..7f7d5380e 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -9,15 +9,16 @@ module.exports = function(config) { // list of files / patterns to load in the browser files: [ - '../../core/vendor/underscore/underscore.js', - '../../core/vendor/jquery/jquery.min.js', + 'js/vendor/jquery/dist/jquery.js', {pattern: 'js/*/*.js', included: false}, {pattern: 'js/*.js', included: false}, {pattern: 'js/templates/*.html', included: false}, {pattern: 'js/vendor/backbone/backbone.js', included: false}, - {pattern: 'js/vendor/handlebars/handlebars.js', included: false}, {pattern: 'js/vendor/backbone.marionette/lib/backbone.marionette.js', included: false}, + {pattern: 'js/vendor/jquery/dist/jquery.js', included: false}, + {pattern: 'js/vendor/handlebars/handlebars.js', included: false}, {pattern: 'js/vendor/text/text.js', included: false}, + {pattern: 'js/vendor/underscore/underscore.js', included: false}, {pattern: 'js/tests/mocks/*.js', included: false}, {pattern: 'js/tests/*.js', included: false}, 'js/tests/test-main.js' |