Add latest changes from gitlab-org/gitlab@master

1 files changed, 11 insertions, 3 deletions

diff --git a/jest.config.js b/jest.config.js
index 4d9e19abbaf..00c28dad0e1 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,5 +1,13 @@
+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')) {
+  // eslint-disable-next-line global-require, import/no-unresolved
+  module.exports = require('./jh/jest.config');
+} else {
+  module.exports = {
+    ...baseConfig('spec/frontend'),
+  };
+}