diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-01-06 13:27:33 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-01-10 12:30:42 -0600 |
| commit | c2bd29ec7ba06d5aeeee9c054f5e90d3a740a5aa (patch) | |
| tree | c47fb1a2bccdcc8999413f360d885205f8ef5db2 /config | |
| parent | 8b26f8edea98d3971e81ec4fa05a875a05e32d58 (diff) | |
| download | gitlab-ce-c2bd29ec7ba06d5aeeee9c054f5e90d3a740a5aa.tar.gz | |
simplify and combine karma file patterns
Diffstat (limited to 'config')
| -rw-r--r-- | config/karma.config.js | 13 |
1 files changed, 3 insertions, 10 deletions
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' }, }); }; |