From 5bf47f14b962b0e676e399dddc238d7bf764304d Mon Sep 17 00:00:00 2001
From: theoretick <me@lucascharles.me>
Date: Thu, 7 Apr 2016 15:49:35 -0700
Subject: Do not include award emojis in issue view comment_count

Fixes Issue #14431
---
 spec/features/issues_spec.rb                  | 16 ++++++++++++++--
 spec/features/notes_on_merge_requests_spec.rb | 25 +++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)

(limited to 'spec')

diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb
index 79000666ccc..1ce0024e93c 100644
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -45,7 +45,7 @@ describe 'Issues', feature: true do
              project: project)
     end
 
-    it 'allows user to select unasigned', js: true do
+    it 'allows user to select unassigned', js: true do
       visit edit_namespace_project_issue_path(project.namespace, project, issue)
 
       expect(page).to have_content "Assignee #{@user.name}"
@@ -64,6 +64,18 @@ describe 'Issues', feature: true do
     end
   end
 
+  describe 'Issue info' do
+    it 'excludes award_emoji from comment count' do
+      issue = create(:issue, author: @user, assignee: @user, project: project, title: 'foobar')
+      create(:upvote_note, noteable: issue)
+
+      visit namespace_project_issues_path(project.namespace, project, assignee_id: @user.id)
+
+      expect(page).to have_content 'foobar'
+      expect(page.all('.issue-no-comments').first.text).to eq "0"
+    end
+  end
+
   describe 'Filter issue' do
     before do
       ['foobar', 'barbaz', 'gitlab'].each do |title|
@@ -187,7 +199,7 @@ describe 'Issues', feature: true do
   describe 'update assignee from issue#show' do
     let(:issue) { create(:issue, project: project, author: @user, assignee: @user) }
 
-    context 'by autorized user' do
+    context 'by authorized user' do
 
       it 'allows user to select unassigned', js: true do
         visit namespace_project_issue_path(project.namespace, project, issue)
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
-- 
cgit v1.2.1