diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-07-19 10:50:50 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-07-19 10:50:50 +0000 |
| commit | ae3cdf93a11837cc1544debcec21e13d42666b5d (patch) | |
| tree | 01e67b8f5ceba6f42ed3b323726576b19a6dabb5 | |
| parent | 517f33705d78c4c329fe106707967df2e05220c5 (diff) | |
| parent | 76abd6d3a154785a2f22f6eb681c03e1372cc1a6 (diff) | |
| download | gitlab-ce-ae3cdf93a11837cc1544debcec21e13d42666b5d.tar.gz | |
Merge branch 'rails5-fix-revert-modal-spec' into 'master'
Rails5 fix user sees revert modal spec
See merge request gitlab-org/gitlab-ce!20706
| -rw-r--r-- | changelogs/unreleased/rails5-fix-revert-modal-spec.yml | 5 | ||||
| -rw-r--r-- | spec/features/user_sees_revert_modal_spec.rb | 3 |
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 |