Merge branch 'cablett-spam-check-methods' into 'master'

Rename SpamCheckService

See merge request gitlab-org/gitlab!22596

app/services/spam_check_service.rb → app/services/concerns/spam_check_methods.rb

 # frozen_string_literal: true
 
-# SpamCheckService
+# SpamCheckMethods
 #
 # Provide helper methods for checking if a given spammable object has
 # potential spam data.
 #
 # Dependencies:
 # - params with :request
-#
-module SpamCheckService
+
+module SpamCheckMethods
   # rubocop:disable Gitlab/ModuleWithInstanceVariables
   def filter_spam_check_params
     @request            = params.delete(:request)

app/services/create_snippet_service.rb

 # frozen_string_literal: true
 
 class CreateSnippetService < BaseService
-  include SpamCheckService
+  include SpamCheckMethods
 
   def execute
     filter_spam_check_params

app/services/issues/create_service.rb

@@ -2,7 +2,7 @@
 
 module Issues
   class CreateService < Issues::BaseService
-    include SpamCheckService
+    include SpamCheckMethods
     include ResolveDiscussions
 
     def execute

app/services/issues/update_service.rb

@@ -2,7 +2,7 @@
 
 module Issues
   class UpdateService < Issues::BaseService
-    include SpamCheckService
+    include SpamCheckMethods
 
     def execute(issue)
       handle_move_between_ids(issue)

app/services/update_snippet_service.rb

 # frozen_string_literal: true
 
 class UpdateSnippetService < BaseService
-  include SpamCheckService
+  include SpamCheckMethods
 
   attr_accessor :snippet
 

spec/services/spam_service_spec.rb

@@ -45,7 +45,7 @@ describe SpamService do
 
         context 'when indicated as spam by akismet' do
           shared_examples 'akismet spam' do
-            it 'doesnt check as spam when request is missing' do
+            it "doesn't check as spam when request is missing" do
               check_spam(issue, nil, false)
 
               expect(issue).not_to be_spam