diff options
author | Natalia Tepluhina <ntepluhina@gitlab.com> | 2019-07-03 08:26:57 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-07-03 08:26:57 +0000 |
commit | d4151b14c2986db173a7a1a4d293b86bfcdaae3a (patch) | |
tree | f3bb3b6829671ddeb17dd4f373b3e358187df7b8 /spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb | |
parent | fd547ee4c618ab8d93ba07121e7bc6bf2924a1b3 (diff) | |
download | gitlab-ce-d4151b14c2986db173a7a1a4d293b86bfcdaae3a.tar.gz |
Rebased and squashed commits
- all commits squashed to make danger review happy
Diffstat (limited to 'spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb')
-rw-r--r-- | spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb | 4 |
1 files changed, 2 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 260eec7a9ed..f3de4bb596f 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 @@ -368,8 +368,8 @@ describe 'Merge request > User resolves diff notes and discussions', :js do all_discussion_replies = page.all('.discussion-reply-holder') expect(all_discussion_replies.count).to eq(2) - expect(all_discussion_replies.first.all('.discussion-next-btn').count).to eq(1) - expect(all_discussion_replies.last.all('.discussion-next-btn').count).to eq(1) + expect(all_discussion_replies.first.all('.discussion-next-btn').count).to eq(2) + expect(all_discussion_replies.last.all('.discussion-next-btn').count).to eq(2) end it 'displays next discussion even if hidden' do |