summaryrefslogtreecommitdiff
path: root/spec/features
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2019-07-19 17:43:03 +0000
committerFatih Acet <acetfatih@gmail.com>2019-07-19 17:43:03 +0000
commitfbfba6f1b433512b91c6244746ff064f2d790e3f (patch)
tree1200cdb8144a234d8b9ba90b0d209cf2e0b06b3f /spec/features
parentb8dc4c0e410252a9268ec175277c1cfe986bff4d (diff)
parent1810feae966e0074b7156148eb40587766a7ec32 (diff)
downloadgitlab-ce-fbfba6f1b433512b91c6244746ff064f2d790e3f.tar.gz
Merge branch '64160-fix-duplicate-buttons' into 'master'
Remove duplicate buttons Closes #64160 See merge request gitlab-org/gitlab-ce!30757
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb6
1 files changed, 3 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 10fe60cb075..3e72b2ce71f 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
@@ -362,14 +362,14 @@ describe 'Merge request > User resolves diff notes and threads', :js do
end
end
- it 'shows jump to next thread button except on last thread' do
+ it 'shows jump to next discussion button on all discussions' do
wait_for_requests
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(2)
- expect(all_discussion_replies.last.all('.discussion-next-btn').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)
end
it 'displays next thread even if hidden' do