Replace remaining references to `Note.create_cross_reference_note`

9 files changed, 16 insertions, 21 deletions

diff --git a/app/models/concerns/mentionable.rb b/app/models/concerns/mentionable.rb
index 10c39cb1ece..56849f28ff0 100644
--- a/app/models/concerns/mentionable.rb
+++ b/app/models/concerns/mentionable.rb
@@ -75,7 +75,7 @@ module Mentionable
     refs.reject! { |ref| without.include?(ref) }
 
     refs.each do |ref|
-      Note.create_cross_reference_note(ref, local_reference, a)
+      SystemNoteService.cross_reference(ref, local_reference, a)
     end
   end
 
diff --git a/app/models/note.rb b/app/models/note.rb
index 6a74d62b715..68b9d433ae0 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -63,11 +63,6 @@ class Note < ActiveRecord::Base
   after_update :set_references
 
   class << self
-    # TODO (rspeicher): Update usages
-    def create_cross_reference_note(*args)
-      SystemNoteService.cross_reference(*args)
-    end
-
     def discussions_from_notes(notes)
       discussion_ids = []
       discussions = []
diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb
index 68d3b915fc9..6135ae65007 100644
--- a/app/services/git_push_service.rb
+++ b/app/services/git_push_service.rb
@@ -105,7 +105,7 @@ class GitPushService
       author ||= commit_user(commit)
 
       refs.each do |r|
-        Note.create_cross_reference_note(r, commit, author)
+        SystemNoteService.cross_reference(r, commit, author)
       end
     end
   end
diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb
index 0ff37c41743..482c0444049 100644
--- a/app/services/notes/create_service.rb
+++ b/app/services/notes/create_service.rb
@@ -15,7 +15,7 @@ module Notes
           # Create a cross-reference note if this Note contains GFM that names an
           # issue, merge request, or commit.
           note.references.each do |mentioned|
-            Note.create_cross_reference_note(mentioned, note.noteable, note.author)
+            SystemNoteService.cross_reference(mentioned, note.noteable, note.author)
           end
 
           execute_hooks(note)
diff --git a/app/services/notes/update_service.rb b/app/services/notes/update_service.rb
index 45a0db761ec..b5611d46257 100644
--- a/app/services/notes/update_service.rb
+++ b/app/services/notes/update_service.rb
@@ -13,7 +13,7 @@ module Notes
           # Create a cross-reference note if this Note contains GFM that
           # names an issue, merge request, or commit.
           note.references.each do |mentioned|
-            Note.create_cross_reference_note(mentioned, note.noteable, note.author)
+            SystemNoteService.cross_reference(mentioned, note.noteable, note.author)
           end
         end
       end
diff --git a/spec/models/concerns/mentionable_spec.rb b/spec/models/concerns/mentionable_spec.rb
index 22237f2e9f2..f7f66987b5f 100644
--- a/spec/models/concerns/mentionable_spec.rb
+++ b/spec/models/concerns/mentionable_spec.rb
@@ -23,7 +23,7 @@ describe Issue, "Mentionable" do
     end
 
     it 'correctly removes already-mentioned Commits' do
-      expect(Note).not_to receive(:create_cross_reference_note)
+      expect(SystemNoteService).not_to receive(:cross_reference)
 
       issue.create_cross_references!(project, author, [commit2])
     end
diff --git a/spec/services/git_push_service_spec.rb b/spec/services/git_push_service_spec.rb
index 648b2afd7fb..dfbece18cdc 100644
--- a/spec/services/git_push_service_spec.rb
+++ b/spec/services/git_push_service_spec.rb
@@ -166,15 +166,15 @@ describe GitPushService do
     end
 
     it "creates a note if a pushed commit mentions an issue" do
-      expect(Note).to receive(:create_cross_reference_note).with(issue, commit, commit_author)
+      expect(SystemNoteService).to receive(:cross_reference).with(issue, commit, commit_author)
 
       service.execute(project, user, @oldrev, @newrev, @ref)
     end
 
     it "only creates a cross-reference note if one doesn't already exist" do
-      Note.create_cross_reference_note(issue, commit, user)
+      SystemNoteService.cross_reference(issue, commit, user)
 
-      expect(Note).not_to receive(:create_cross_reference_note).with(issue, commit, commit_author)
+      expect(SystemNoteService).not_to receive(:cross_reference).with(issue, commit, commit_author)
 
       service.execute(project, user, @oldrev, @newrev, @ref)
     end
@@ -184,7 +184,7 @@ describe GitPushService do
         author_name: 'unknown name',
         author_email: 'unknown@email.com'
       )
-      expect(Note).to receive(:create_cross_reference_note).with(issue, commit, user)
+      expect(SystemNoteService).to receive(:cross_reference).with(issue, commit, user)
 
       service.execute(project, user, @oldrev, @newrev, @ref)
     end
@@ -193,7 +193,7 @@ describe GitPushService do
       allow(project.repository).to receive(:commits_between).with(@blankrev, @newrev).and_return([])
       allow(project.repository).to receive(:commits_between).with("master", @newrev).and_return([commit])
 
-      expect(Note).to receive(:create_cross_reference_note).with(issue, commit, commit_author)
+      expect(SystemNoteService).to receive(:cross_reference).with(issue, commit, commit_author)
 
       service.execute(project, user, @blankrev, @newrev, 'refs/heads/other')
     end
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index 62a99d15952..253e5823499 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -58,7 +58,7 @@ describe NotificationService do
         end
 
         it 'filters out "mentioned in" notes' do
-          mentioned_note = Note.create_cross_reference_note(mentioned_issue, issue, issue.author)
+          mentioned_note = SystemNoteService.cross_reference(mentioned_issue, issue, issue.author)
 
           expect(Notify).not_to receive(:note_issue_email)
           notification.new_note(mentioned_note)
@@ -130,7 +130,7 @@ describe NotificationService do
         end
 
         it 'filters out "mentioned in" notes' do
-          mentioned_note = Note.create_cross_reference_note(mentioned_issue, issue, issue.author)
+          mentioned_note = SystemNoteService.cross_reference(mentioned_issue, issue, issue.author)
 
           expect(Notify).not_to receive(:note_issue_email)
           notification.new_note(mentioned_note)
diff --git a/spec/support/mentionable_shared_examples.rb b/spec/support/mentionable_shared_examples.rb
index d29c8a55c82..a2a0b6905f9 100644
--- a/spec/support/mentionable_shared_examples.rb
+++ b/spec/support/mentionable_shared_examples.rb
@@ -80,7 +80,7 @@ shared_examples 'a mentionable' do
                          ext_issue, ext_mr, ext_commit]
 
     mentioned_objects.each do |referenced|
-      expect(Note).to receive(:create_cross_reference_note).
+      expect(SystemNoteService).to receive(:cross_reference).
         with(referenced, subject.local_reference, author)
     end
 
@@ -88,7 +88,7 @@ shared_examples 'a mentionable' do
   end
 
   it 'detects existing cross-references' do
-    Note.create_cross_reference_note(mentioned_issue, subject.local_reference, author)
+    SystemNoteService.cross_reference(mentioned_issue, subject.local_reference, author)
 
     expect(subject).to have_mentioned(mentioned_issue)
     expect(subject).not_to have_mentioned(mentioned_mr)
@@ -132,13 +132,13 @@ shared_examples 'an editable mentionable' do
     # These three objects were already referenced, and should not receive new
     # notes
     [mentioned_issue, mentioned_commit, ext_issue].each do |oldref|
-      expect(Note).not_to receive(:create_cross_reference_note).
+      expect(SystemNoteService).not_to receive(:cross_reference).
         with(oldref, any_args)
     end
 
     # These two issues are new and should receive reference notes
     new_issues.each do |newref|
-      expect(Note).to receive(:create_cross_reference_note).
+      expect(SystemNoteService).to receive(:cross_reference).
         with(newref, subject.local_reference, author)
     end