diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2018-08-07 14:46:08 +0300 |
---|---|---|
committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-08-07 14:46:08 +0300 |
commit | f996f7e006b206ad6505dd1edd740fa142dbcb21 (patch) | |
tree | e007f73a4be43f047eb9393639d4bf5bce48eb26 /spec/features | |
parent | cbbcd903647e3bbaf7b0999bbe59ad0219693d6e (diff) | |
parent | f851bb80977de233fdd6ceb9f3f795bb6ef30414 (diff) |
Merge branch '49854-recover-mr-regression-fixes-safe' into 'master'
Resolve "Recover reverted fixes to Merge Request refactor regressions"
Closes #49242, #49343, #48876, #48877, #48817, #48602, and #49843
See merge request gitlab-org/gitlab-ce!20968
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 |