diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 13:16:36 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 13:16:36 +0000 |
commit | 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch) | |
tree | 07e7870bca8aed6d61fdcc810731c50d2c40af47 /jest.config.js | |
parent | 27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff) | |
download | gitlab-ce-311b0269b4eb9839fa63f80c8d7a58f32b8138a0.tar.gz |
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to 'jest.config.js')
-rw-r--r-- | jest.config.js | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/jest.config.js b/jest.config.js index 4d9e19abbaf..96a62b18d8f 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,5 +1,14 @@ +const fs = require('fs'); +const IS_JH = require('./config/helpers/is_jh_env'); const baseConfig = require('./jest.config.base'); -module.exports = { - ...baseConfig('spec/frontend'), -}; +// TODO: Remove existsSync once jh has added jest.config.js +if (IS_JH && fs.existsSync('./jh/jest.config.js')) { + // We can't be explicit with eslint-disable rules because in JH it'll pass import/no-unresolved + // eslint-disable-next-line + module.exports = require('./jh/jest.config'); +} else { + module.exports = { + ...baseConfig('spec/frontend'), + }; +} |