Commit f163ad59 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'rails5-fix-48140' into 'master'

Rails 5 fix Capybara::ElementNotFound: Unable to find visible css #modal-revert-commit

Closes #48140 et #48139

See merge request gitlab-org/gitlab-ce!20044
parents 904cbe01 2c15890e
---
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
...@@ -67,4 +67,6 @@ def update_username(new_username) ...@@ -67,4 +67,6 @@ def update_username(new_username)
page.within('.modal') do page.within('.modal') do
find('.js-modal-primary-action').click find('.js-modal-primary-action').click
end end
wait_for_requests
end end
...@@ -13,6 +13,8 @@ describe 'User reverts a merge request', :js do ...@@ -13,6 +13,8 @@ describe 'User reverts a merge request', :js do
click_button('Merge') click_button('Merge')
wait_for_requests
visit(merge_request_path(merge_request)) visit(merge_request_path(merge_request))
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment