summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper Maes <jaspermaes.jm@gmail.com>2018-07-19 09:43:27 +0200
committerJasper Maes <jaspermaes.jm@gmail.com>2018-07-19 10:07:38 +0200
commit76abd6d3a154785a2f22f6eb681c03e1372cc1a6 (patch)
tree2bdf356fd492e10c37633ca9f3d67859368b0ca6
parent98eccfc44c597ba14939659ca3b9150197129961 (diff)
downloadgitlab-ce-76abd6d3a154785a2f22f6eb681c03e1372cc1a6.tar.gz
Rails5 fix user sees revert modal spec
-rw-r--r--changelogs/unreleased/rails5-fix-revert-modal-spec.yml5
-rw-r--r--spec/features/user_sees_revert_modal_spec.rb3
2 files changed, 8 insertions, 0 deletions
diff --git a/changelogs/unreleased/rails5-fix-revert-modal-spec.yml b/changelogs/unreleased/rails5-fix-revert-modal-spec.yml
new file mode 100644
index 00000000000..0637e503ca9
--- /dev/null
+++ 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
diff --git a/spec/features/user_sees_revert_modal_spec.rb b/spec/features/user_sees_revert_modal_spec.rb
index 11a9e470f76..3b48ea4786d 100644
--- 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