diff options
| author | Christoph Wurst <christoph@winzerhof-wurst.at> | 2017-11-06 11:16:15 +0300 |
|---|---|---|
| committer | Christoph Wurst <christoph@winzerhof-wurst.at> | 2017-11-06 11:18:27 +0300 |
| commit | ff1e3c75e956660484432d20b62a1b07c4538156 (patch) | |
| tree | 9a66a44831c55de7c7107c188fe9d1a5b4498aca /karma.conf.js | |
| parent | 972bc9964a27189fde99bb8c104d121f595476dc (diff) | |
Fix js tests execution
Due to the new split webpack config, the app was started (again) which
has been fixed in a previous PR but due to re-ordering of webpack
config properties, this seems to have come back. Not js unit tests can
be executed successfully again.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
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: { |