Merge branch 'winh-increase-jest-timeout-ci' into 'master'

Increase Jest timeout on CI to 5 seconds

Closes #62855, #61905, and #61235

See merge request gitlab-org/gitlab-ce!29278

2 files changed, 15 insertions, 3 deletions

diff --git a/spec/frontend/helpers/timeout.js b/spec/frontend/helpers/timeout.js
index e74598ae20a..702ef0be5aa 100644
--- a/spec/frontend/helpers/timeout.js
+++ b/spec/frontend/helpers/timeout.js
@@ -5,7 +5,13 @@ const IS_DEBUGGING = process.execArgv.join(' ').includes('--inspect-brk');
 let testTimeoutNS;
 
 export const setTestTimeout = newTimeoutMS => {
-  testTimeoutNS = newTimeoutMS * NS_PER_MS;
+  const newTimeoutNS = newTimeoutMS * NS_PER_MS;
+  // never accept a smaller timeout than the default
+  if (newTimeoutNS < testTimeoutNS) {
+    return;
+  }
+
+  testTimeoutNS = newTimeoutNS;
   jest.setTimeout(newTimeoutMS);
 };
 
@@ -13,7 +19,13 @@ export const setTestTimeout = newTimeoutMS => {
 // Useful for tests with jQuery, which is very slow in big DOMs.
 let temporaryTimeoutNS = null;
 export const setTestTimeoutOnce = newTimeoutMS => {
-  temporaryTimeoutNS = newTimeoutMS * NS_PER_MS;
+  const newTimeoutNS = newTimeoutMS * NS_PER_MS;
+  // never accept a smaller timeout than the default
+  if (newTimeoutNS < testTimeoutNS) {
+    return;
+  }
+
+  temporaryTimeoutNS = newTimeoutNS;
 };
 
 export const initializeTestTimeout = defaultTimeoutMS => {
diff --git a/spec/frontend/test_setup.js b/spec/frontend/test_setup.js
index c24f0bc4776..7e7cc1488b8 100644
--- a/spec/frontend/test_setup.js
+++ b/spec/frontend/test_setup.js
@@ -15,7 +15,7 @@ afterEach(() =>
   }),
 );
 
-initializeTestTimeout(500);
+initializeTestTimeout(process.env.CI ? 5000 : 500);
 
 // fail tests for unmocked requests
 beforeEach(done => {