From c2bd29ec7ba06d5aeeee9c054f5e90d3a740a5aa Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Fri, 6 Jan 2017 13:27:33 -0600 Subject: simplify and combine karma file patterns --- config/karma.config.js | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'config') diff --git a/config/karma.config.js b/config/karma.config.js index 478ef082547..0a3530b65ac 100644 --- a/config/karma.config.js +++ b/config/karma.config.js @@ -8,20 +8,13 @@ module.exports = function(config) { basePath: ROOT_PATH, frameworks: ['jquery-2.1.0', 'jasmine'], files: [ - 'spec/javascripts/*_spec.js', - 'spec/javascripts/*_spec.js.es6', - { pattern: 'spec/javascripts/fixtures/**/*.html', included: false, served: true }, - { pattern: 'spec/javascripts/fixtures/**/*.json', included: false, served: true }, + 'spec/javascripts/**/*_spec.js?(.es6)', + { pattern: 'spec/javascripts/fixtures/**/*@(.json|.html|.html.raw)', included: false }, ], preprocessors: { - 'spec/javascripts/*_spec.js': ['webpack'], - 'spec/javascripts/*_spec.js.es6': ['webpack'], - 'app/assets/javascripts/**/*.js': ['webpack'], - 'app/assets/javascripts/**/*.js.es6': ['webpack'], + 'spec/javascripts/**/*_spec.js?(.es6)': ['webpack'], }, - webpack: webpackConfig, - webpackMiddleware: { stats: 'errors-only' }, }); }; -- cgit v1.2.1