diff options
author | Rémy Coutable <remy@rymai.me> | 2018-06-21 08:53:48 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-06-21 08:53:48 +0000 |
commit | f163ad59f9f8e8daa0c396f57d45165507e03c6b (patch) | |
tree | 23a3253c8c80974b6340ae641c81c1679e110c60 | |
parent | 904cbe0132a1caf0dbb7efb8bdc70398d1d82289 (diff) | |
parent | 2c15890edcf6b292e52e6fcbf6d2d1a7ef0aabe0 (diff) | |
download | gitlab-ce-f163ad59f9f8e8daa0c396f57d45165507e03c6b.tar.gz |
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
-rw-r--r-- | changelogs/unreleased/rails5-fix-48140.yml | 6 | ||||
-rw-r--r-- | spec/features/profiles/account_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/projects/merge_requests/user_reverts_merge_request_spec.rb | 2 |
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 |