diff options
author | Winnie Hellmann <winnie@gitlab.com> | 2019-03-25 21:32:48 +0100 |
---|---|---|
committer | Winnie Hellmann <winnie@gitlab.com> | 2019-03-29 11:53:17 +0100 |
commit | 0e9c092d003fb9febcbaf9fd33ddbbb40ed3191d (patch) | |
tree | 75d3f4404018691098bc5634f6508413ad89f95e /spec/frontend/test_setup.js | |
parent | 0b68b17c3bf5d93fe942eed2ef0d16b6824f5499 (diff) | |
download | gitlab-ce-0e9c092d003fb9febcbaf9fd33ddbbb40ed3191d.tar.gz |
Fail correct test for Promisewinh-rejected-jest-promises
Diffstat (limited to 'spec/frontend/test_setup.js')
-rw-r--r-- | spec/frontend/test_setup.js | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/spec/frontend/test_setup.js b/spec/frontend/test_setup.js index 00d7873ab2b..d13e8a1908c 100644 --- a/spec/frontend/test_setup.js +++ b/spec/frontend/test_setup.js @@ -5,10 +5,13 @@ import { initializeTestTimeout } from './helpers/timeout'; process.on('unhandledRejection', global.promiseRejectionHandler); -// wait for pending setTimeout()s -afterEach(() => { - jest.runAllTimers(); -}); +afterEach(() => + // give Promises a bit more time so they fail the right test + new Promise(setImmediate).then(() => { + // wait for pending setTimeout()s + jest.runAllTimers(); + }), +); initializeTestTimeout(300); |