diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-07 00:10:15 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-07 00:10:15 +0300 |
commit | 0790cf032c70b3df250e1953a3a11b71d835c5a1 (patch) | |
tree | ca31b07a5623da26df1fa0323832c7896b5e3386 /config | |
parent | 37419c44f04cd802ac89fe2d54b8501a0718a5e3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r-- | config/webpack.config.js | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index cdfe292ca70..374b8fdbbc3 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -119,6 +119,15 @@ if (IS_EE) { }); } +if (!IS_PRODUCTION) { + const fixtureDir = IS_EE ? 'fixtures-ee' : 'fixtures'; + + Object.assign(alias, { + test_fixtures: path.join(ROOT_PATH, `tmp/tests/frontend/${fixtureDir}`), + test_helpers: path.join(ROOT_PATH, 'spec/frontend_integration/test_helpers'), + }); +} + let dll; if (VENDOR_DLL && !IS_PRODUCTION) { |