diff options
author | André Luís <aluis@gitlab.com> | 2018-07-31 03:50:53 +0300 |
---|---|---|
committer | André Luís <aluis@gitlab.com> | 2018-08-01 15:45:15 +0300 |
commit | 8693aa139dcdc5d4ed8939d12b360731f5f9dab8 (patch) | |
tree | a95be3bd3baf011bb43f73879d3c2545619fedd2 /spec/features/merge_request | |
parent | 113f9f337c678129e811fcdfb418ba011ac1eb2b (diff) |
Revert "Merge branch '48817-fix-mr-changes-discussion-navigation' into 'master'"
This reverts commit ced005f330419ec81657e852c5cb9124fdb29fbb, reversing
changes made to 9b01b293ce5ddbaeedaf014cdc804af2c5e86416.
Diffstat (limited to 'spec/features/merge_request')
-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 |