diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-08-01 16:42:23 +0300 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-08-01 16:42:23 +0300 |
commit | 47244ad5ea4e887ecb6dffa9f7b96846adbf4b6f (patch) | |
tree | 823af4478325945020f36411fa315ae345918faf /spec/features | |
parent | 5f742eb95a0080343167469ccabfeccd3630007d (diff) | |
parent | 09c1b008eb4b90c0a8becdf7ebb5723a8bd05468 (diff) |
Merge branch 'andr3-remove-mr-regressions-fixes-from-master' into 'master'
Remove fixes for MR refactor regressions from master
See merge request gitlab-org/gitlab-ce!20920
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb b/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb index 2d268ecab58..bf4d5396df9 100644 --- a/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb +++ b/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb @@ -342,9 +342,8 @@ describe 'Merge request > User resolves diff notes and discussions', :js do end end - it 'shows jump to next discussion button, apart from the last one' do - expect(page).to have_selector('.discussion-reply-holder', count: 2) - expect(page).to have_selector('.discussion-reply-holder .discussion-next-btn', count: 1) + it 'shows jump to next discussion button' do + expect(page.all('.discussion-reply-holder', count: 2)).to all(have_selector('.discussion-next-btn')) end it 'displays next discussion even if hidden' do |