summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper Maes <jaspermaes.jm@gmail.com>2018-06-20 19:36:15 +0200
committerJasper Maes <jaspermaes.jm@gmail.com>2018-06-20 20:02:05 +0200
commit2c15890edcf6b292e52e6fcbf6d2d1a7ef0aabe0 (patch)
tree5a6db12c9468734a37861e6c199bcdd3c03ab927
parentabc6be62a06349f395da0b33e814512ef15c06fb (diff)
downloadgitlab-ce-2c15890edcf6b292e52e6fcbf6d2d1a7ef0aabe0.tar.gz
Rails 5 fix Capybara::ElementNotFound: Unable to find visible css #modal-revert-commit and expected: "/bar" got: "/foo"
-rw-r--r--changelogs/unreleased/rails5-fix-48140.yml6
-rw-r--r--spec/features/profiles/account_spec.rb2
-rw-r--r--spec/features/projects/merge_requests/user_reverts_merge_request_spec.rb2
3 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/rails5-fix-48140.yml b/changelogs/unreleased/rails5-fix-48140.yml
new file mode 100644
index 00000000000..a6992803e5a
--- /dev/null
+++ b/changelogs/unreleased/rails5-fix-48140.yml
@@ -0,0 +1,6 @@
+---
+title: 'Rails 5 fix Capybara::ElementNotFound: Unable to find visible css #modal-revert-commit
+ and expected: "/bar" got: "/foo"'
+merge_request: 20044
+author: Jasper Maes
+type: fixed
diff --git a/spec/features/profiles/account_spec.rb b/spec/features/profiles/account_spec.rb
index 215b658eb7b..95947d2f111 100644
--- a/spec/features/profiles/account_spec.rb
+++ b/spec/features/profiles/account_spec.rb
@@ -67,4 +67,6 @@ def update_username(new_username)
page.within('.modal') do
find('.js-modal-primary-action').click
end
+
+ wait_for_requests
end
diff --git a/spec/features/projects/merge_requests/user_reverts_merge_request_spec.rb b/spec/features/projects/merge_requests/user_reverts_merge_request_spec.rb
index f3e97bc9eb2..67b6aefb2d8 100644
--- a/spec/features/projects/merge_requests/user_reverts_merge_request_spec.rb
+++ b/spec/features/projects/merge_requests/user_reverts_merge_request_spec.rb
@@ -13,6 +13,8 @@ describe 'User reverts a merge request', :js do
click_button('Merge')
+ wait_for_requests
+
visit(merge_request_path(merge_request))
end