Add specs

4 files changed, 41 insertions, 9 deletions

diff --git a/spec/services/issues/build_service_spec.rb b/spec/services/issues/build_service_spec.rb
index d166b9783ad..6fa8806d270 100644
--- a/spec/services/issues/build_service_spec.rb
+++ b/spec/services/issues/build_service_spec.rb
@@ -11,7 +11,7 @@ describe Issues::BuildService, services: true do
   context 'for a single discussion' do
     describe '#execute' do
       let(:merge_request) { create(:merge_request, title: "Hello world", source_project: project) }
-      let(:discussion) { Discussion.new([create(:diff_note_on_merge_request, project: project, noteable: merge_request, note: "Almost done")]) }
+      let(:discussion) { create(:diff_note_on_merge_request, project: project, noteable: merge_request, note: "Almost done").to_discussion }
       let(:service) { described_class.new(project, user, merge_request_to_resolve_discussions_of: merge_request.iid, discussion_to_resolve: discussion.id) }
 
       it 'references the noteable title in the issue title' do
@@ -47,7 +47,7 @@ describe Issues::BuildService, services: true do
       let(:service) { described_class.new(project, user, merge_request_to_resolve_discussions_of: merge_request.iid) }
 
       it 'mentions the author of the note' do
-        discussion = Discussion.new([create(:diff_note_on_merge_request, author: create(:user, username: 'author'))])
+        discussion = create(:diff_note_on_merge_request, author: create(:user, username: 'author')).to_discussion
         expect(service.item_for_discussion(discussion)).to include('@author')
       end
 
@@ -60,7 +60,7 @@ describe Issues::BuildService, services: true do
         note_result = "    > This is a string\n"\
                       "    > > with a blockquote\n"\
                       "    > > > That has a quote\n"
-        discussion = Discussion.new([create(:diff_note_on_merge_request, note: note_text)])
+        discussion = create(:diff_note_on_merge_request, note: note_text).to_discussion
         expect(service.item_for_discussion(discussion)).to include(note_result)
       end
     end
diff --git a/spec/services/issues/resolve_discussions_spec.rb b/spec/services/issues/resolve_discussions_spec.rb
index 3a72f92383c..4a4929daefc 100644
--- a/spec/services/issues/resolve_discussions_spec.rb
+++ b/spec/services/issues/resolve_discussions_spec.rb
@@ -18,7 +18,7 @@ describe DummyService, services: true do
   end
 
   describe "for resolving discussions" do
-    let(:discussion) { Discussion.new([create(:diff_note_on_merge_request, project: project, note: "Almost done")]) }
+    let(:discussion) { create(:diff_note_on_merge_request, project: project, note: "Almost done").to_discussion }
     let(:merge_request) { discussion.noteable }
     let(:other_merge_request) { create(:merge_request, source_project: project, source_branch: "other") }
 
diff --git a/spec/services/notes/build_service_spec.rb b/spec/services/notes/build_service_spec.rb
index 065f6eeeacb..464b24cb447 100644
--- a/spec/services/notes/build_service_spec.rb
+++ b/spec/services/notes/build_service_spec.rb
@@ -1,5 +1,40 @@
 require 'spec_helper'
 
-describe Notes::CreateService, services: true do
-  # TODO: Test
+describe Notes::BuildService, services: true do
+  let(:note) { create(:discussion_note_on_issue) }
+  let(:project) { note.project }
+  let(:author) { note.author }
+
+  describe '#execute' do
+    context 'when in_reply_to_discussion_id is specified' do
+      context 'when a note with that original discussion ID exists' do
+        it 'sets the note up to be in reply to that note' do
+          new_note = described_class.new(project, author, note: 'Test', in_reply_to_discussion_id: note.original_discussion_id).execute
+          expect(new_note).to be_valid
+          expect(new_note.in_reply_to?(note)).to be_truthy
+        end
+      end
+
+      context 'when a note with that discussion ID exists' do
+        it 'sets the note up to be in reply to that note' do
+          new_note = described_class.new(project, author, note: 'Test', in_reply_to_discussion_id: note.discussion_id).execute
+          expect(new_note).to be_valid
+          expect(new_note.in_reply_to?(note)).to be_truthy
+        end
+      end
+
+      context 'when no note with that discussion ID exists' do
+        it 'sets an error' do
+          new_note = described_class.new(project, author, note: 'Test', in_reply_to_discussion_id: 'foo').execute
+          expect(new_note.errors[:base]).to include('Discussion to reply to cannot be found')
+        end
+      end
+    end
+
+    it 'builds a note without saving it' do
+      new_note = described_class.new(project, author, noteable_type: note.noteable_type, noteable_id: note.noteable_id, note: 'Test').execute
+      expect(new_note).to be_valid
+      expect(new_note).not_to be_persisted
+    end
+  end
 end
diff --git a/spec/services/notes/create_service_spec.rb b/spec/services/notes/create_service_spec.rb
index b406afeb34d..152c6d20daa 100644
--- a/spec/services/notes/create_service_spec.rb
+++ b/spec/services/notes/create_service_spec.rb
@@ -13,9 +13,6 @@ describe Notes::CreateService, services: true do
       project.team << [user, :master]
     end
 
-    # TODO: Test in_reply_to_discussion_id
-    # TODO: Test new_discussion
-
     context "valid params" do
       it 'returns a valid note' do
         note = described_class.new(project, user, opts).execute