summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper Maes <jaspermaes.jm@gmail.com>2018-07-31 22:22:34 +0200
committerJasper Maes <jaspermaes.jm@gmail.com>2018-08-01 07:04:34 +0200
commitf6e6d374d927e31f99ac3a0b324ed6f14ecff542 (patch)
tree225e8f25e47a58332894bb6216de7a2c29e71ef2
parent1a95603510accdcdb233fa00f101da119eb1fa5c (diff)
downloadgitlab-ce-f6e6d374d927e31f99ac3a0b324ed6f14ecff542.tar.gz
Rails5: fix flaky spec
-rw-r--r--changelogs/unreleased/rails5-fix-flaky-spec-user-uses-shortcuts.yml5
-rw-r--r--spec/features/projects/user_uses_shortcuts_spec.rb2
2 files changed, 7 insertions, 0 deletions
diff --git a/changelogs/unreleased/rails5-fix-flaky-spec-user-uses-shortcuts.yml b/changelogs/unreleased/rails5-fix-flaky-spec-user-uses-shortcuts.yml
new file mode 100644
index 00000000000..5f2504c604d
--- /dev/null
+++ b/changelogs/unreleased/rails5-fix-flaky-spec-user-uses-shortcuts.yml
@@ -0,0 +1,5 @@
+---
+title: 'Rails5: fix flaky spec'
+merge_request: 20953
+author: Jasper Maes
+type: fixed
diff --git a/spec/features/projects/user_uses_shortcuts_spec.rb b/spec/features/projects/user_uses_shortcuts_spec.rb
index df9ee69aadb..64f9a4fcd39 100644
--- a/spec/features/projects/user_uses_shortcuts_spec.rb
+++ b/spec/features/projects/user_uses_shortcuts_spec.rb
@@ -9,6 +9,8 @@ describe 'User uses shortcuts', :js do
sign_in(user)
visit(project_path(project))
+
+ wait_for_requests
end
context 'when navigating to the Project pages' do