summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2019-05-28 11:06:37 +0000
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2019-05-28 11:06:37 +0000
commitfe0907970732d90b6bbb880e1a2ad3c5b7cd2d38 (patch)
treed88d2a9ee9adf43934ea51f80969ea1e358e5bea
parent62e74d85883244172830be6945402e30ec927a4d (diff)
parentd480fc51922e0a43da963493c80770f5c37a69dc (diff)
downloadgitlab-ce-fe0907970732d90b6bbb880e1a2ad3c5b7cd2d38.tar.gz
Merge branch 'increase-note-karma-spec-timeout' into 'master'
Increase timeout of flaky specs Closes #62399 See merge request gitlab-org/gitlab-ce!28820
-rw-r--r--spec/javascripts/notes/components/note_app_spec.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/javascripts/notes/components/note_app_spec.js b/spec/javascripts/notes/components/note_app_spec.js
index ef876dc2941..f04af04f852 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);
});
});