1 files changed, 41 insertions, 42 deletions
diff --git a/spec/services/notes/create_service_spec.rb b/spec/services/notes/create_service_spec.rb
index b0cc3ce5f5a..152c6d20daa 100644
--- a/spec/services/notes/create_service_spec.rb
+++ b/spec/services/notes/create_service_spec.rb
@@ -15,39 +15,45 @@ describe Notes::CreateService, services: true do
 
     context "valid params" do
       it 'returns a valid note' do
-        note = Notes::CreateService.new(project, user, opts).execute
+        note = described_class.new(project, user, opts).execute
 
         expect(note).to be_valid
       end
 
       it 'returns a persisted note' do
-        note = Notes::CreateService.new(project, user, opts).execute
+        note = described_class.new(project, user, opts).execute
 
         expect(note).to be_persisted
       end
 
       it 'note has valid content' do
-        note = Notes::CreateService.new(project, user, opts).execute
+        note = described_class.new(project, user, opts).execute
 
         expect(note.note).to eq(opts[:note])
       end
 
+      it 'note belongs to the correct project' do
+        note = described_class.new(project, user, opts).execute
+
+        expect(note.project).to eq(project)
+      end
+
       it 'TodoService#new_note is called' do
-        note = build(:note)
-        allow(project).to receive_message_chain(:notes, :new).with(opts) { note }
+        note = build(:note, project: project)
+        allow(Note).to receive(:new).with(opts) { note }
 
         expect_any_instance_of(TodoService).to receive(:new_note).with(note, user)
 
-        Notes::CreateService.new(project, user, opts).execute
+        described_class.new(project, user, opts).execute
       end
 
       it 'enqueues NewNoteWorker' do
-        note = build(:note, id: 999)
-        allow(project).to receive_message_chain(:notes, :new).with(opts) { note }
+        note = build(:note, id: 999, project: project)
+        allow(Note).to receive(:new).with(opts) { note }
 
         expect(NewNoteWorker).to receive(:perform_async).with(note.id)
 
-        Notes::CreateService.new(project, user, opts).execute
+        described_class.new(project, user, opts).execute
       end
     end
 
@@ -75,47 +81,40 @@ describe Notes::CreateService, services: true do
         end
       end
     end
-  end
 
-  describe "award emoji" do
-    before do
-      project.team << [user, :master]
-    end
+    describe 'personal snippet note' do
+      subject { described_class.new(nil, user, params).execute }
 
-    it "creates an award emoji" do
-      opts = {
-        note: ':smile: ',
-        noteable_type: 'Issue',
-        noteable_id: issue.id
-      }
-      note = Notes::CreateService.new(project, user, opts).execute
+      let(:snippet) { create(:personal_snippet) }
+      let(:params) do
+        { note: 'comment', noteable_type: 'Snippet', noteable_id: snippet.id }
+      end
 
-      expect(note).to be_valid
-      expect(note.name).to eq('smile')
-    end
+      it 'returns a valid note' do
+        expect(subject).to be_valid
+      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
+      it 'returns a persisted note' do
+        expect(subject).to be_persisted
+      end
 
-      expect(note).to be_valid
-      expect(note.note).to eq(opts[:note])
+      it 'note has valid content' do
+        expect(subject.note).to eq(params[:note])
+      end
     end
 
-    it "normalizes the emoji name" do
-      opts = {
-        note: ':+1:',
-        noteable_type: 'Issue',
-        noteable_id: issue.id
-      }
-
-      expect_any_instance_of(TodoService).to receive(:new_award_emoji).with(issue, user)
+    describe 'note with emoji only' do
+      it 'creates regular note' do
+        opts = {
+          note: ':smile: ',
+          noteable_type: 'Issue',
+          noteable_id: issue.id
+        }
+        note = described_class.new(project, user, opts).execute
 
-      Notes::CreateService.new(project, user, opts).execute
+        expect(note).to be_valid
+        expect(note.note).to eq(':smile:')
+      end
     end
   end
 end