diff --git a/spec/helpers/issues_helper_spec.rb b/spec/helpers/issues_helper_spec.rb
index 78a6b631eb2..1f2c4ee77b5 100644
--- a/spec/helpers/issues_helper_spec.rb
+++ b/spec/helpers/issues_helper_spec.rb
@@ -127,4 +127,30 @@ describe IssuesHelper do
     it { is_expected.to eq("!1, !2, or !3") }
   end
 
+  describe "#url_to_emoji" do
+    it "returns url" do
+      expect(url_to_emoji("smile")).to include("emoji/1F604.png")
+    end
+  end
+
+  describe "#emoji_list" do
+    it "returns url" do
+      expect(emoji_list).to be_kind_of(Array)
+    end
+  end
+
+  describe "#note_active_class" do
+    before do
+      @note = create :note
+      @note1 = create :note
+    end
+
+    it "returns empty string for unauthenticated user" do
+      expect(note_active_class(Note.all, nil)).to eq("")
+    end
+
+    it "returns active string for author" do
+      expect(note_active_class(Note.all, @note.author)).to eq("active")
+    end
+  end
 end
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index 6e37dae07d0..86b6c27a182 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -129,4 +129,17 @@ describe Note do
 
     it { expect(Note.search('wow')).to include(note) }
   end
+
+  describe :grouped_awards do
+    before do
+      create :note, note: "smile"
+      create :note, note: "smile"
+    end
+
+    it "returns grouped array of notes" do
+      grouped_array = Note.grouped_awards
+      expect(Note.grouped_awards.first.first).to eq("smile")
+      expect(Note.grouped_awards.first.last).to match_array(Note.all)
+    end
+  end
 end
diff --git a/spec/services/notes/create_service_spec.rb b/spec/services/notes/create_service_spec.rb
index f2ea0805b2f..066461f5a12 100644
--- a/spec/services/notes/create_service_spec.rb
+++ b/spec/services/notes/create_service_spec.rb
@@ -24,4 +24,38 @@ describe Notes::CreateService do
       it { expect(@note.note).to eq('Awesome comment') }
     end
   end
+
+  describe "award emoji" do
+      before do
+        project.team << [user, :master]
+      end
+
+      it "creates emoji note" do
+        opts = {
+          note: ':smile: ',
+          noteable_type: 'Issue',
+          noteable_id: issue.id
+        }
+
+        @note = Notes::CreateService.new(project, user, opts).execute
+
+        expect(@note).to be_valid
+        expect(@note.note).to eq('smile')
+        expect(@note.is_award).to be_truthy
+      end
+
+      it "creates regular note if emoji name is invalid" do
+        opts = {
+          note: ':smile: moretext: ',
+          noteable_type: 'Issue',
+          noteable_id: issue.id
+        }
+
+        @note = Notes::CreateService.new(project, user, opts).execute
+
+        expect(@note).to be_valid
+        expect(@note.note).to eq(opts[:note])
+        expect(@note.is_award).to be_falsy
+      end
+  end
 end