diff options
| author | Phil Hughes <me@iamphill.com> | 2019-05-01 08:10:15 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-05-01 08:10:15 +0000 |
| commit | da443ff064bd74a84b40a3af31ca00385bb39008 (patch) | |
| tree | b7b29b3b05247808f686770b23c8a6e9ce57a3d5 /config | |
| parent | e7c4ca86d971cd99786cf695f631e9b60c098d87 (diff) | |
| parent | d89b19476d80612e97a2853249fabc63a5ff3f42 (diff) | |
| download | gitlab-ce-da443ff064bd74a84b40a3af31ca00385bb39008.tar.gz | |
Merge branch 'winh-binary-fixture-path' into 'master'
Use FIXTURES_PATH constant for binary fixtures in frontend tests
See merge request gitlab-org/gitlab-ce!27891
Diffstat (limited to 'config')
| -rw-r--r-- | config/karma.config.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/karma.config.js b/config/karma.config.js index 7e1e89f3c10..dfcb5c4646e 100644 --- a/config/karma.config.js +++ b/config/karma.config.js @@ -110,7 +110,7 @@ module.exports = function(config) { frameworks: ['jasmine'], files: [ { pattern: 'spec/javascripts/test_bundle.js', watched: false }, - { pattern: 'spec/javascripts/fixtures/**/*@(.json|.html|.png)', included: false }, + { pattern: `spec/javascripts/fixtures/**/*@(.json|.html|.png|.bmpr|.pdf)`, included: false }, ], preprocessors: { 'spec/javascripts/**/*.js': ['webpack', 'sourcemap'], |