diff --git a/app/services/spam_check_service.rb b/app/services/concerns/spam_check_methods.rb similarity index 96% rename from app/services/spam_check_service.rb rename to app/services/concerns/spam_check_methods.rb index 51d300d4f1d870420ba9b46e7ef5e4fd98e76530..a0945857f8961daa5b2dd3690090daf6462d99cc 100644 --- a/app/services/spam_check_service.rb +++ b/app/services/concerns/spam_check_methods.rb @@ -1,14 +1,14 @@ # 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) diff --git a/app/services/create_snippet_service.rb b/app/services/create_snippet_service.rb index eacea7d94c7f577e9e8a9f56bb1bcc1dfd5a0eb3..56c175ebdb1d99b97c606785611360e53cde1957 100644 --- a/app/services/create_snippet_service.rb +++ b/app/services/create_snippet_service.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class CreateSnippetService < BaseService - include SpamCheckService + include SpamCheckMethods def execute filter_spam_check_params diff --git a/app/services/issues/create_service.rb b/app/services/issues/create_service.rb index 8d1df0d87a7136effec81143d59c0b13a024ce4e..e8879d4df66ecff7ae8a43d32f767db5039db385 100644 --- a/app/services/issues/create_service.rb +++ b/app/services/issues/create_service.rb @@ -2,7 +2,7 @@ module Issues class CreateService < Issues::BaseService - include SpamCheckService + include SpamCheckMethods include ResolveDiscussions def execute diff --git a/app/services/issues/update_service.rb b/app/services/issues/update_service.rb index b98a4d2567f4849d62079e3a5b390f32ae87ad45..68d1657d881ee67825863725cdb700045dd32bca 100644 --- a/app/services/issues/update_service.rb +++ b/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) diff --git a/app/services/update_snippet_service.rb b/app/services/update_snippet_service.rb index ac7f8e9b1f5feb36a4d6403373f98220d832e225..d365e4e7b2bc13e67bab326f6eac16d486acf464 100644 --- a/app/services/update_snippet_service.rb +++ b/app/services/update_snippet_service.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class UpdateSnippetService < BaseService - include SpamCheckService + include SpamCheckMethods attr_accessor :snippet diff --git a/spec/services/spam_service_spec.rb b/spec/services/spam_service_spec.rb index 76f775836125dce68fc0272b376a8a57857de185..094684296b81c4ef73a49a0118e82cdf176efc12 100644 --- a/spec/services/spam_service_spec.rb +++ b/spec/services/spam_service_spec.rb @@ -45,7 +45,7 @@ def check_spam(issue, request, recaptcha_verified) 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