summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-04-11 14:31:54 +0000
committerPhil Hughes <me@iamphill.com>2019-04-11 14:31:54 +0000
commit7ae49f3c6c2560cec05f63af94c0f1e0f2df818a (patch)
tree9f3bd6dcd97cf59f40b24aca925cbcfa04ad4299
parent225ddd146d3a575401c7592417d486e7e5833996 (diff)
parent4722b852e3cb1b2018aec8e06cc9994406e7a57c (diff)
downloadgitlab-ce-7ae49f3c6c2560cec05f63af94c0f1e0f2df818a.tar.gz
Merge branch '60398-increase-timeouts-clusters-bundle' into 'master'
Increase clusters bundle specs timeout Closes #60398 See merge request gitlab-org/gitlab-ce!27269
-rw-r--r--spec/frontend/clusters/clusters_bundle_spec.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/frontend/clusters/clusters_bundle_spec.js b/spec/frontend/clusters/clusters_bundle_spec.js
index eea7bd87257..33a35069004 100644
--- a/spec/frontend/clusters/clusters_bundle_spec.js
+++ b/spec/frontend/clusters/clusters_bundle_spec.js
@@ -12,7 +12,7 @@ import { setTestTimeout } from 'helpers/timeout';
import $ from 'jquery';
describe('Clusters', () => {
- setTestTimeout(500);
+ setTestTimeout(1000);
let cluster;
let mock;