diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2019-03-22 07:24:40 +0000 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-03-22 07:24:40 +0000 |
| commit | 5765c5989a23e6db0f54440bc9bbdb37f5eb3677 (patch) | |
| tree | 38a59ca10d57a17e707f093c7bdf3b51c410a3d6 | |
| parent | f6772ffb1a35adced2b8f70fb02de77985a363ef (diff) | |
| parent | fcf64da04b868fe10e6583eeafd8f015f6b3743e (diff) | |
| download | gitlab-ce-5765c5989a23e6db0f54440bc9bbdb37f5eb3677.tar.gz | |
Merge branch 'winh-jest-time' into 'master'
Mock and wait for timers in Jest
Closes #56056
See merge request gitlab-org/gitlab-ce!26433
| -rw-r--r-- | jest.config.js | 1 | ||||
| -rw-r--r-- | spec/frontend/test_setup.js | 5 |
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 |