Merge remote-tracking branch 'origin/master' into rename-ci-commit

1 files changed, 4 insertions, 7 deletions

diff --git a/spec/helpers/issues_helper_spec.rb b/spec/helpers/issues_helper_spec.rb
index bffe2c18b6f..eae61a54dfc 100644
--- a/spec/helpers/issues_helper_spec.rb
+++ b/spec/helpers/issues_helper_spec.rb
@@ -163,18 +163,15 @@ describe IssuesHelper do
     it { is_expected.to eq("!1, !2, or !3") }
   end
 
-  describe "note_active_class" do
-    before do
-      @note = create :note
-      @note1 = create :note
-    end
+  describe '#award_active_class' do
+    let!(:upvote) { create(:award_emoji) }
 
     it "returns empty string for unauthenticated user" do
-      expect(note_active_class(Note.all, nil)).to eq("")
+      expect(award_active_class(AwardEmoji.all, nil)).to eq("")
     end
 
     it "returns active string for author" do
-      expect(note_active_class(Note.all, @note.author)).to eq("active")
+      expect(award_active_class(AwardEmoji.all, upvote.user)).to eq("active")
     end
   end