From 0c872e02b2c822e3397515ec324051ff540f0cd5 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 20 Dec 2022 14:22:11 +0000 Subject: Add latest changes from gitlab-org/gitlab@15-7-stable-ee --- jest.config.integration.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'jest.config.integration.js') 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(/.*)$': '/jh/spec/frontend_integration/test_helpers$1', }, }), - timers: 'real', + fakeTimers: { + enableGlobally: false, + }, testTimeout: process.env.CI ? 20000 : 7000, }; -- cgit v1.2.3