diff options
author | theoretick <me@lucascharles.me> | 2016-04-07 15:49:35 -0700 |
---|---|---|
committer | theoretick <me@lucascharles.me> | 2016-04-14 11:20:55 -0700 |
commit | 5bf47f14b962b0e676e399dddc238d7bf764304d (patch) | |
tree | 58ddd787b6ab4f7642737c3e4a59c894f030fc2f /spec/features/notes_on_merge_requests_spec.rb | |
parent | 9cd5e0fc48c408f96a06c0a2b81bc70dfea9d98d (diff) | |
download | gitlab-ce-5bf47f14b962b0e676e399dddc238d7bf764304d.tar.gz |
Do not include award emojis in issue view comment_count
Fixes Issue #14431
Diffstat (limited to 'spec/features/notes_on_merge_requests_spec.rb')
-rw-r--r-- | spec/features/notes_on_merge_requests_spec.rb | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb index 5f855ccc701..389812ff7e1 100644 --- a/spec/features/notes_on_merge_requests_spec.rb +++ b/spec/features/notes_on_merge_requests_spec.rb @@ -4,6 +4,20 @@ describe 'Comments', feature: true do include RepoHelpers include WaitForAjax + describe 'On merge requests page', feature: true do + it 'excludes award_emoji from comment count' do + merge_request = create(:merge_request) + project = merge_request.source_project + create(:upvote_note, noteable: merge_request, project: project) + + login_as :admin + visit namespace_project_merge_requests_path(project.namespace, project) + + expect(merge_request.mr_and_commit_notes.count).to eq 1 + expect(page.all('.merge-request-no-comments').first.text).to eq "0" + end + end + describe 'On a merge request', js: true, feature: true do let!(:merge_request) { create(:merge_request) } let!(:project) { merge_request.source_project } @@ -129,6 +143,17 @@ describe 'Comments', feature: true do end end end + + describe 'comment info' do + it 'excludes award_emoji from comment count' do + create(:upvote_note, noteable: merge_request, project: project) + + visit namespace_project_merge_request_path(project.namespace, project, merge_request) + + expect(merge_request.mr_and_commit_notes.count).to eq 2 + expect(find('.notes-tab span.badge').text).to eq "1" + end + end end describe 'On a merge request diff', js: true, feature: true do |