Merge branch 'sh-fix-broken-note-award-emoji' into 'master'

Fix broken award emoji for comments

Closes #23506

See merge request !6967

app/helpers/award_emoji_helper.rb

@@ -4,7 +4,7 @@ module AwardEmojiHelper
 
     if awardable.is_a?(Note)
       # We render a list of notes very frequently and calling the specific method is a lot faster than the generic one (6.5x)
-      toggle_award_emoji_namespace_project_note_url(namespace_id: @project.namespace_id, project_id: @project.id, id: awardable.id)
+      toggle_award_emoji_namespace_project_note_url(namespace_id: @project.namespace, project_id: @project, id: awardable.id)
     else
       url_for([:toggle_award_emoji, @project.namespace.becomes(Namespace), @project, awardable])
     end

spec/features/issues/award_emoji_spec.rb

 require 'rails_helper'
 
 describe 'Awards Emoji', feature: true do
+  include WaitForAjax
+
   let!(:project)   { create(:project) }
   let!(:user)      { create(:user) }
 
@@ -16,20 +18,22 @@ describe 'Awards Emoji', feature: true do
              project: project)
     end
 
+    let!(:note) {  create(:note_on_issue, noteable: issue, project: issue.project, note: "Hello world") }
+
     before do
       visit namespace_project_issue_path(project.namespace, project, issue)
     end
 
     it 'increments the thumbsdown emoji', js: true do
       find('[data-emoji="thumbsdown"]').click
-      sleep 2
+      wait_for_ajax
       expect(thumbsdown_emoji).to have_text("1")
     end
 
     context 'click the thumbsup emoji' do
       it 'increments the thumbsup emoji', js: true do
         find('[data-emoji="thumbsup"]').click
-        sleep 2
+        wait_for_ajax
         expect(thumbsup_emoji).to have_text("1")
       end
 
@@ -41,7 +45,7 @@ describe 'Awards Emoji', feature: true do
     context 'click the thumbsdown emoji' do
       it 'increments the thumbsdown emoji', js: true do
         find('[data-emoji="thumbsdown"]').click
-        sleep 2
+        wait_for_ajax
         expect(thumbsdown_emoji).to have_text("1")
       end
 
@@ -49,13 +53,45 @@ describe 'Awards Emoji', feature: true do
         expect(thumbsup_emoji).to have_text("0")
       end
     end
+
+    it 'toggles the smiley emoji on a note', js: true do
+      toggle_smiley_emoji(true)
+
+      within('.note-awards') do
+        expect(find(emoji_counter)).to have_text("1")
+      end
+
+      toggle_smiley_emoji(false)
+
+      within('.note-awards') do
+        expect(page).not_to have_selector(emoji_counter)
+      end
+    end
   end
 
   def thumbsup_emoji
-    page.all('span.js-counter').first
+    page.all(emoji_counter).first
   end
 
   def thumbsdown_emoji
-    page.all('span.js-counter').last
+    page.all(emoji_counter).last
+  end
+
+  def emoji_counter
+    'span.js-counter'
+  end
+
+  def toggle_smiley_emoji(status)
+    within('.note') do
+      find('.note-emoji-button').click
+    end
+
+    unless status
+      first('[data-emoji="smiley"]').click
+    else
+      find('[data-emoji="smiley"]').click
+    end
+
+    wait_for_ajax
   end
 end