diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-05-29 08:25:27 +0000 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-05-29 08:25:27 +0000 |
commit | 4a9387242dbbfee9e9ddc7b46eb69ad6a2f4ba2c (patch) | |
tree | 20af125f1d8e6c0159e20e00d260f0f768260b9e /spec | |
parent | cd4eb5acae7256fbdc5728ed9ee918c260dc4844 (diff) | |
parent | ede97703ea306b0bcb2672703e635692da70b194 (diff) | |
download | gitlab-ce-4a9387242dbbfee9e9ddc7b46eb69ad6a2f4ba2c.tar.gz |
Merge branch 'revert-karma-timeout' into 'master'
Increase karma global timeout
See merge request gitlab-org/gitlab-ce!28850
Diffstat (limited to '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(); }); |