Utilize RuboCop's Include/Exclude config

Stop checking the file location programmatically.

9 files changed, 5 insertions, 66 deletions

diff --git a/rubocop/cop/gitlab/httparty.rb b/rubocop/cop/gitlab/httparty.rb
index 215f18b6993..8acebff624d 100644
--- a/rubocop/cop/gitlab/httparty.rb
+++ b/rubocop/cop/gitlab/httparty.rb
@@ -1,11 +1,9 @@
-require_relative '../../spec_helpers'
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
     module Gitlab
       class HTTParty < RuboCop::Cop::Cop
-        include SpecHelpers
-
         MSG_SEND = <<~EOL.freeze
           Avoid calling `HTTParty` directly. Instead, use the Gitlab::HTTP
           wrapper. To allow request to localhost or the private network set
@@ -27,8 +25,6 @@ module RuboCop
         PATTERN
 
         def on_send(node)
-          return if in_spec?(node)
-
           add_offense(node, location: :expression, message: MSG_SEND) if httparty_node?(node)
           add_offense(node, location: :expression, message: MSG_INCLUDE) if includes_httparty?(node)
         end
diff --git a/rubocop/cop/gitlab/union.rb b/rubocop/cop/gitlab/union.rb
index 09541d8af3b..c44c847657b 100644
--- a/rubocop/cop/gitlab/union.rb
+++ b/rubocop/cop/gitlab/union.rb
@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require_relative '../../spec_helpers'
 
 module RuboCop
   module Cop
@@ -7,8 +6,6 @@ module RuboCop
       # Cop that disallows the use of `Gitlab::SQL::Union`, in favour of using
       # the `FromUnion` module.
       class Union < RuboCop::Cop::Cop
-        include SpecHelpers
-
         MSG = 'Use the `FromUnion` concern, instead of using `Gitlab::SQL::Union` directly'
 
         def_node_matcher :raw_union?, <<~PATTERN
@@ -17,7 +14,6 @@ module RuboCop
 
         def on_send(node)
           return unless raw_union?(node)
-          return if in_spec?(node)
 
           add_offense(node, location: :expression)
         end
diff --git a/rubocop/cop/graphql/authorize_types.rb b/rubocop/cop/graphql/authorize_types.rb
index 93fe80c3edf..cd8bdbaee59 100644
--- a/rubocop/cop/graphql/authorize_types.rb
+++ b/rubocop/cop/graphql/authorize_types.rb
@@ -1,13 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../../spec_helpers'
-
 module RuboCop
   module Cop
     module Graphql
       class AuthorizeTypes < RuboCop::Cop::Cop
-        include SpecHelpers
-
         MSG = 'Add an `authorize :ability` call to the type: '\
               'https://docs.gitlab.com/ee/development/api_graphql_styleguide.html#type-authorization'
 
@@ -32,8 +28,6 @@ module RuboCop
         private
 
         def in_type?(node)
-          return if in_spec?(node)
-
           path = node.location.expression.source_buffer.name
 
           path.include?(TYPES_DIR)
diff --git a/rubocop/cop/include_action_view_context.rb b/rubocop/cop/include_action_view_context.rb
index 14662a33e95..52c84a711c9 100644
--- a/rubocop/cop/include_action_view_context.rb
+++ b/rubocop/cop/include_action_view_context.rb
@@ -1,13 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../spec_helpers'
-
 module RuboCop
   module Cop
     # Cop that makes sure workers include `::Gitlab::ActionViewOutput::Context`, not `ActionView::Context`.
     class IncludeActionViewContext < RuboCop::Cop::Cop
-      include SpecHelpers
-
       MSG = 'Include `::Gitlab::ActionViewOutput::Context`, not `ActionView::Context`, for Rails 5.'.freeze
 
       def_node_matcher :includes_action_view_context?, <<~PATTERN
@@ -15,7 +11,6 @@ module RuboCop
       PATTERN
 
       def on_send(node)
-        return if in_spec?(node)
         return unless includes_action_view_context?(node)
 
         add_offense(node.arguments.first, location: :expression)
diff --git a/rubocop/cop/include_sidekiq_worker.rb b/rubocop/cop/include_sidekiq_worker.rb
index 8da4a147219..e69bc018add 100644
--- a/rubocop/cop/include_sidekiq_worker.rb
+++ b/rubocop/cop/include_sidekiq_worker.rb
@@ -1,11 +1,9 @@
-require_relative '../spec_helpers'
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
     # Cop that makes sure workers include `ApplicationWorker`, not `Sidekiq::Worker`.
     class IncludeSidekiqWorker < RuboCop::Cop::Cop
-      include SpecHelpers
-
       MSG = 'Include `ApplicationWorker`, not `Sidekiq::Worker`.'.freeze
 
       def_node_matcher :includes_sidekiq_worker?, <<~PATTERN
@@ -13,7 +11,6 @@ module RuboCop
       PATTERN
 
       def on_send(node)
-        return if in_spec?(node)
         return unless includes_sidekiq_worker?(node)
 
         add_offense(node.arguments.first, location: :expression)
diff --git a/rubocop/cop/rspec/env_assignment.rb b/rubocop/cop/rspec/env_assignment.rb
index 8b61fa8e264..73e108c2232 100644
--- a/rubocop/cop/rspec/env_assignment.rb
+++ b/rubocop/cop/rspec/env_assignment.rb
@@ -1,4 +1,4 @@
-require_relative '../../spec_helpers'
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -17,8 +17,6 @@ module RuboCop
       #     stub_env('FOO', 'bar')
       #   end
       class EnvAssignment < RuboCop::Cop::Cop
-        include SpecHelpers
-
         MESSAGE = "Don't assign to ENV, use `stub_env` instead.".freeze
 
         def_node_search :env_assignment?, <<~PATTERN
@@ -28,7 +26,6 @@ module RuboCop
         # Following is what node.children looks like on a match
         # [s(:const, nil, :ENV), :[]=, s(:str, "key"), s(:str, "value")]
         def on_send(node)
-          return unless in_spec?(node)
           return unless env_assignment?(node)
 
           add_offense(node, location: :expression, message: MESSAGE)
diff --git a/rubocop/cop/rspec/factories_in_migration_specs.rb b/rubocop/cop/rspec/factories_in_migration_specs.rb
index 0c5aa838a2c..65c7638a0f4 100644
--- a/rubocop/cop/rspec/factories_in_migration_specs.rb
+++ b/rubocop/cop/rspec/factories_in_migration_specs.rb
@@ -1,4 +1,4 @@
-require_relative '../../spec_helpers'
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
@@ -14,8 +14,6 @@ module RuboCop
       #   let(:users) { table(:users) }
       #   let(:user) { users.create!(name: 'User 1', username: 'user1') }
       class FactoriesInMigrationSpecs < RuboCop::Cop::Cop
-        include SpecHelpers
-
         MESSAGE = "Don't use FactoryBot.%s in migration specs, use `table` instead.".freeze
         FORBIDDEN_METHODS = %i[build build_list create create_list].freeze
 
@@ -27,7 +25,6 @@ module RuboCop
         # - Without FactoryBot namespace: [nil, :build, s(:sym, :user)]
         # - With FactoryBot namespace: [s(:const, nil, :FactoryBot), :build, s(:sym, :user)]
         def on_send(node)
-          return unless in_migration_spec?(node)
           return unless forbidden_factory_usage?(node)
 
           method = node.children[1]
diff --git a/rubocop/cop/sidekiq_options_queue.rb b/rubocop/cop/sidekiq_options_queue.rb
index 253d2958866..499c712175e 100644
--- a/rubocop/cop/sidekiq_options_queue.rb
+++ b/rubocop/cop/sidekiq_options_queue.rb
@@ -1,11 +1,9 @@
-require_relative '../spec_helpers'
+# frozen_string_literal: true
 
 module RuboCop
   module Cop
     # Cop that prevents manually setting a queue in Sidekiq workers.
     class SidekiqOptionsQueue < RuboCop::Cop::Cop
-      include SpecHelpers
-
       MSG = 'Do not manually set a queue; `ApplicationWorker` sets one automatically.'.freeze
 
       def_node_matcher :sidekiq_options?, <<~PATTERN
@@ -13,7 +11,6 @@ module RuboCop
       PATTERN
 
       def on_send(node)
-        return if in_spec?(node)
         return unless sidekiq_options?(node)
 
         node.arguments.first.each_node(:pair) do |pair|
diff --git a/rubocop/spec_helpers.rb b/rubocop/spec_helpers.rb
deleted file mode 100644
index ecd77c4351d..00000000000
--- a/rubocop/spec_helpers.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-module RuboCop
-  module SpecHelpers
-    SPEC_HELPERS = %w[fast_spec_helper.rb rails_helper.rb spec_helper.rb].freeze
-    MIGRATION_SPEC_DIRECTORIES = ['spec/migrations', 'spec/lib/gitlab/background_migration'].freeze
-
-    # Returns true if the given node originated from the spec directory.
-    def in_spec?(node)
-      path = node.location.expression.source_buffer.name
-      pwd = RuboCop::PathUtil.pwd
-
-      !SPEC_HELPERS.include?(File.basename(path)) &&
-        path.start_with?(File.join(pwd, 'spec'), File.join(pwd, 'ee', 'spec'))
-    end
-
-    def migration_directories
-      @migration_directories ||= MIGRATION_SPEC_DIRECTORIES.map do |dir|
-        pwd = RuboCop::PathUtil.pwd
-        [File.join(pwd, dir), File.join(pwd, 'ee', dir)]
-      end.flatten
-    end
-
-    # Returns true if the given node originated from a migration spec.
-    def in_migration_spec?(node)
-      path = node.location.expression.source_buffer.name
-
-      in_spec?(node) &&
-        path.start_with?(*migration_directories)
-    end
-  end
-end