diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-01-06 17:21:54 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-01-10 12:30:43 -0600 |
| commit | 52c6702ec708deedef189784cdcb39564b2dcf52 (patch) | |
| tree | 02e9b66893a86ddf264d31f7f101f06e50055fd1 /config/karma.config.js | |
| parent | 05b95e712d1ea70d8658de42f7c87661e6937976 (diff) | |
| download | gitlab-ce-52c6702ec708deedef189784cdcb39564b2dcf52.tar.gz | |
include spec_helper within karma config rather than each individual test
Diffstat (limited to 'config/karma.config.js')
| -rw-r--r-- | config/karma.config.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config/karma.config.js b/config/karma.config.js index 0a3530b65ac..96d33490b37 100644 --- a/config/karma.config.js +++ b/config/karma.config.js @@ -6,13 +6,14 @@ var ROOT_PATH = path.resolve(__dirname, '..'); module.exports = function(config) { config.set({ basePath: ROOT_PATH, - frameworks: ['jquery-2.1.0', 'jasmine'], + frameworks: ['jasmine'], files: [ + 'spec/javascripts/spec_helper.js', 'spec/javascripts/**/*_spec.js?(.es6)', { pattern: 'spec/javascripts/fixtures/**/*@(.json|.html|.html.raw)', included: false }, ], preprocessors: { - 'spec/javascripts/**/*_spec.js?(.es6)': ['webpack'], + 'spec/javascripts/**/*.js?(.es6)': ['webpack'], }, webpack: webpackConfig, webpackMiddleware: { stats: 'errors-only' }, |