diff options
| author | Christoph Wurst <ChristophWurst@users.noreply.github.com> | 2017-11-12 11:44:35 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-12 11:44:35 +0300 |
| commit | bb6b35c79bfdeb35d7f68f8a73b10fc7cebacaa1 (patch) | |
| tree | 7d9e70d52385d9abaf8f12ddec46cf9ab1a10d93 /karma.conf.js | |
| parent | 36528c9e9b49001c6b333f7f9ad283737f96ba72 (diff) | |
| parent | ff1e3c75e956660484432d20b62a1b07c4538156 (diff) | |
Merge pull request #602 from nextcloud/fix/js-test-execution-config
Fix js tests execution
Diffstat (limited to 'karma.conf.js')
| -rw-r--r-- | karma.conf.js | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/karma.conf.js b/karma.conf.js index ac73e20ce..eb9b5e854 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -19,9 +19,6 @@ module.exports = function (config) { {pattern: 'node_modules/jquery/dist/jquery.js', included: true}, {pattern: 'node_modules/underscore/underscore.js', included: true}, {pattern: 'js/tests/test-main.js', included: true}, - //{pattern: 'js/**/*.js', included: false}, - //{pattern: 'js/*.js', included: false}, - //{pattern: 'js/templates/*.html', included: false}, // all files ending in "_test" {pattern: 'js/tests/*_spec.js', watched: false}, {pattern: 'js/tests/**/*_spec.js', watched: false}, @@ -36,12 +33,10 @@ module.exports = function (config) { // preprocess matching files before serving them to the browser // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor preprocessors: { - //'js/build/build.js': ['webpack'], 'js/**[!vendor]/*[!spec].js': ['coverage'], // add webpack as preprocessor 'js/tests/*_spec.js': ['webpack'], 'js/tests/**/*_spec.js': ['webpack'] - //'js/build/build.js': ['webpack', 'sourcemap'] }, webpackMiddleware: { |