diff options
author | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-05-29 11:38:00 +0800 |
---|---|---|
committer | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-05-29 13:01:15 +0800 |
commit | ede97703ea306b0bcb2672703e635692da70b194 (patch) | |
tree | c1e7aecada8144ceee97b8b3dd32236bbc60bf29 | |
parent | 54dbaba577ad28645e71080698abee55fd2797ab (diff) | |
download | gitlab-ce-ede97703ea306b0bcb2672703e635692da70b194.tar.gz |
Increase global karma timeoutrevert-karma-timeout
Revert useless timeout added in karma spec
-rw-r--r-- | spec/javascripts/notes/components/note_app_spec.js | 4 | ||||
-rw-r--r-- | spec/javascripts/test_bundle.js | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/javascripts/notes/components/note_app_spec.js b/spec/javascripts/notes/components/note_app_spec.js index f04af04f852..ef876dc2941 100644 --- a/spec/javascripts/notes/components/note_app_spec.js +++ b/spec/javascripts/notes/components/note_app_spec.js @@ -195,7 +195,7 @@ describe('note_app', () => { setTimeout(() => { done(); }); - }, 2000); + }); }); describe('discussion note', () => { @@ -230,7 +230,7 @@ describe('note_app', () => { setTimeout(() => { done(); }); - }, 2000); + }); }); }); diff --git a/spec/javascripts/test_bundle.js b/spec/javascripts/test_bundle.js index 87ef0885d8c..8c80a425581 100644 --- a/spec/javascripts/test_bundle.js +++ b/spec/javascripts/test_bundle.js @@ -111,7 +111,7 @@ let longRunningTestTimeoutHandle; beforeEach(done => { longRunningTestTimeoutHandle = setTimeout(() => { done.fail('Test is running too long!'); - }, 2000); + }, 4000); done(); }); |