diff options
author | André Luís <aluis@gitlab.com> | 2018-08-01 05:21:14 +0300 |
---|---|---|
committer | André Luís <aluis@gitlab.com> | 2018-08-01 17:26:57 +0300 |
commit | 296f489d85255e7795cf6ac3d98dab1622ad5069 (patch) | |
tree | 304b65808c7cdb8cec576cce82224c4eeae62718 /spec/features | |
parent | 8047b00fb6b315bdeb86525cc05b447a8defcb54 (diff) |
Reapply "Merge branch '48817-fix-mr-changes-discussion-navigation' into 'master'"
This reverts commit e0fe97ca4a506405af8e85368f2c69cda637e192.
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, 3 insertions, 2 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 bf4d5396df9..2d268ecab58 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,8 +342,9 @@ describe 'Merge request > User resolves diff notes and discussions', :js do end end - it 'shows jump to next discussion button' do - expect(page.all('.discussion-reply-holder', count: 2)).to all(have_selector('.discussion-next-btn')) + 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) end it 'displays next discussion even if hidden' do |