summaryrefslogtreecommitdiff
path: root/jest.config.integration.js
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-12-12 18:07:13 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-12-12 18:07:13 +0000
commitba5be4989e02566ad45191b6d97815e189a26dac (patch)
tree96a4ace3c3d61ec4aea31cbf548718ef67cfd84b /jest.config.integration.js
parent22a3da26ad21d67acaef7b2598429c8a003f1037 (diff)
downloadgitlab-ce-ba5be4989e02566ad45191b6d97815e189a26dac.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'jest.config.integration.js')
-rw-r--r--jest.config.integration.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/jest.config.integration.js b/jest.config.integration.js
index e2ce32218e0..0693a500990 100644
--- a/jest.config.integration.js
+++ b/jest.config.integration.js
@@ -24,6 +24,8 @@ module.exports = {
'^jh_else_ce_test_helpers(/.*)$': '<rootDir>/jh/spec/frontend_integration/test_helpers$1',
},
}),
- timers: 'real',
+ fakeTimers: {
+ enableGlobally: false,
+ },
testTimeout: process.env.CI ? 20000 : 7000,
};