summaryrefslogtreecommitdiff
path: root/spec/javascripts/test_bundle.js
diff options
context:
space:
mode:
authorSimon Knox <psimyn@gmail.com>2019-06-05 06:11:56 +1000
committerSimon Knox <psimyn@gmail.com>2019-06-05 06:11:56 +1000
commit443f87a7ed996017bc577f14fda586792e2216cf (patch)
tree5c2ce3dfb1f0dfa7c8552462e0a2dfb23adcd31a /spec/javascripts/test_bundle.js
parent6f4ed5149d32e1b199a594db08a69366b2a85217 (diff)
parent632427bcc24403be21df5afe8e6bae9cf41c8bc7 (diff)
downloadgitlab-ce-58516-dashboard-endpoint-fe.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 58516-dashboard-endpoint-fe58516-dashboard-endpoint-fe
Diffstat (limited to 'spec/javascripts/test_bundle.js')
-rw-r--r--spec/javascripts/test_bundle.js2
1 files changed, 1 insertions, 1 deletions
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();
});