summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--jest.config.js1
-rw-r--r--spec/frontend/test_setup.js5
2 files changed, 6 insertions, 0 deletions
diff --git a/jest.config.js b/jest.config.js
index efbf2e602c1..1f6e04390ae 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -36,4 +36,5 @@ module.exports = {
'^.+\\.vue$': 'vue-jest',
},
transformIgnorePatterns: ['node_modules/(?!(@gitlab/ui)/)'],
+ timers: 'fake',
};
diff --git a/spec/frontend/test_setup.js b/spec/frontend/test_setup.js
index 8c36d8ff49f..006fc60ef57 100644
--- a/spec/frontend/test_setup.js
+++ b/spec/frontend/test_setup.js
@@ -3,6 +3,11 @@ import Translate from '~/vue_shared/translate';
import axios from '~/lib/utils/axios_utils';
import { initializeTestTimeout } from './helpers/timeout';
+// wait for pending setTimeout()s
+afterEach(() => {
+ jest.runAllTimers();
+});
+
initializeTestTimeout(300);
// fail tests for unmocked requests