Merge branch 'rails5-fix-revert-modal-spec' into 'master'

Rails5 fix user sees revert modal spec See merge request gitlab-org/gitlab-ce!20706
2018-07-19 10:50:50 +00:00 · 2018-07-19 10:50:50 +00:00 · ae3cdf93a1
parent 517f33705d 76abd6d3a1
commit ae3cdf93a1
2 changed files with 8 additions and 0 deletions
--- a/changelogs/unreleased/rails5-fix-revert-modal-spec.yml
+++ b/changelogs/unreleased/rails5-fix-revert-modal-spec.yml
@ -0,0 +1,5 @@
+---
+title: Rails5 fix user sees revert modal spec
+merge_request: 20706
+author: Jasper Maes
+type: fixed
--- a/spec/features/user_sees_revert_modal_spec.rb
+++ b/spec/features/user_sees_revert_modal_spec.rb
@ -9,6 +9,9 @@ describe 'Merge request > User sees revert modal', :js do
    sign_in(user)
    visit(project_merge_request_path(project, merge_request))
    click_button('Merge')
+
+    wait_for_requests
+
    visit(merge_request_path(merge_request))
    click_link('Revert')
  end