diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-15 18:10:08 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-15 18:10:08 +0300 |
commit | 06c127aa72cff78235426341081837cff0b6f78b (patch) | |
tree | 614c9d9e029adcac31f290d4f953fe8b02aaf0f1 /app/assets/javascripts/lib | |
parent | 33212c8ff1f99cdb896e8fc6f6450882287e0de5 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/lib')
-rw-r--r-- | app/assets/javascripts/lib/utils/poll.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/lib/utils/poll.js b/app/assets/javascripts/lib/utils/poll.js index 7f0c65868c2..e8583fa951b 100644 --- a/app/assets/javascripts/lib/utils/poll.js +++ b/app/assets/javascripts/lib/utils/poll.js @@ -88,7 +88,11 @@ export default class Poll { } makeDelayedRequest(delay = 0) { - this.timeoutID = setTimeout(() => this.makeRequest(), delay); + // So we don't make our specs artificially slower + this.timeoutID = setTimeout( + () => this.makeRequest(), + process.env.NODE_ENV !== 'test' ? delay : 1, + ); } makeRequest() { |