diff options
| author | Mike Greiling <mike@pixelcog.com> | 2019-07-17 17:47:33 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-07-19 02:27:14 -0500 |
| commit | 89142f985deaff5cd60db0a95f05b646641f6f04 (patch) | |
| tree | 1f8d726e2af1201091dabc3fe4da47140b13ba18 /config | |
| parent | faa17d526371a34325705b8de9594e4e9df03298 (diff) | |
| download | gitlab-ce-89142f985deaff5cd60db0a95f05b646641f6f04.tar.gz | |
Move frontend fixtures to tmp/tests
Diffstat (limited to 'config')
| -rw-r--r-- | config/karma.config.js | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/config/karma.config.js b/config/karma.config.js index 2a5bf3581e0..4aaa773d6cc 100644 --- a/config/karma.config.js +++ b/config/karma.config.js @@ -107,7 +107,8 @@ if (specFilters.length) { module.exports = function(config) { process.env.TZ = 'Etc/UTC'; - const fixturesPath = `${IS_EE ? 'ee/' : ''}spec/javascripts/fixtures`; + const fixturesPath = `tmp/tests/frontend/fixtures${IS_EE ? '-ee' : ''}`; + const staticFixturesPath = 'spec/javascripts/fixtures/static'; const karmaConfig = { basePath: ROOT_PATH, @@ -131,8 +132,13 @@ module.exports = function(config) { frameworks: ['jasmine'], files: [ { pattern: 'spec/javascripts/test_bundle.js', watched: false }, - { pattern: `${fixturesPath}/**/*@(.json|.html|.png|.bmpr|.pdf)`, included: false }, + { pattern: `${fixturesPath}/**/*`, included: false }, + { pattern: `${staticFixturesPath}/**/*`, included: false }, ], + proxies: { + '/fixtures/': `/base/${fixturesPath}/`, + '/fixtures/static/': `/base/${staticFixturesPath}/`, + }, preprocessors: { 'spec/javascripts/**/*.js': ['webpack', 'sourcemap'], 'ee/spec/javascripts/**/*.js': ['webpack', 'sourcemap'], |