summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-01-06 18:19:42 -0600
committerMike Greiling <mike@pixelcog.com>2017-01-10 12:30:43 -0600
commita8078d629e50ec1ea0e562e24e7bd7ea8931d896 (patch)
tree848320b551cc9a79bcee9f88d3403d305116d89a /config
parentb0341c14d0657b41203b7e5d6d6cbeb64d67b387 (diff)
downloadgitlab-ce-a8078d629e50ec1ea0e562e24e7bd7ea8931d896.tar.gz
migrate all tests into a single webpack bundle
Diffstat (limited to 'config')
-rw-r--r--config/karma.config.js3
1 files changed, 1 insertions, 2 deletions
diff --git a/config/karma.config.js b/config/karma.config.js
index 96d33490b37..b317c3f00b2 100644
--- a/config/karma.config.js
+++ b/config/karma.config.js
@@ -8,8 +8,7 @@ module.exports = function(config) {
basePath: ROOT_PATH,
frameworks: ['jasmine'],
files: [
- 'spec/javascripts/spec_helper.js',
- 'spec/javascripts/**/*_spec.js?(.es6)',
+ 'spec/javascripts/test_bundle.js',
{ pattern: 'spec/javascripts/fixtures/**/*@(.json|.html|.html.raw)', included: false },
],
preprocessors: {