Add latest changes from gitlab-org/gitlab@master

14 files changed, 35 insertions, 20 deletions

diff --git a/rubocop/cop/gitlab/duplicate_spec_location.rb b/rubocop/cop/gitlab/duplicate_spec_location.rb
index ece3b9313d9..f8c19caf351 100644
--- a/rubocop/cop/gitlab/duplicate_spec_location.rb
+++ b/rubocop/cop/gitlab/duplicate_spec_location.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'rubocop/rspec/top_level_describe'
+require 'rubocop/cop/rspec/base'
+require 'rubocop/cop/rspec/mixin/top_level_group'
 
 module RuboCop
   module Cop
@@ -19,17 +20,17 @@ module RuboCop
       #  # good, spec for EE only code
       #  ee/spec/controllers/my_spec.rb      # describe MyClass
       #
-      class DuplicateSpecLocation < RuboCop::Cop::Cop
-        include RuboCop::RSpec::TopLevelDescribe
+      class DuplicateSpecLocation < RuboCop::Cop::RSpec::Base
+        include RuboCop::Cop::RSpec::TopLevelGroup
 
         MSG = 'Duplicate spec location in `%<path>s`.'
 
-        def on_top_level_describe(node, _args)
-          path = file_path_for_node(node).sub(%r{\A#{rails_root}/}, '')
+        def on_top_level_group(node)
+          path = file_path_for_node(node.send_node).sub(%r{\A#{rails_root}/}, '')
           duplicate_path = find_duplicate_path(path)
 
           if duplicate_path && File.exist?(File.join(rails_root, duplicate_path))
-            add_offense(node, message: format(MSG, path: duplicate_path))
+            add_offense(node.send_node, message: format(MSG, path: duplicate_path))
           end
         end
 
diff --git a/rubocop/cop/rspec/any_instance_of.rb b/rubocop/cop/rspec/any_instance_of.rb
index e1cacfebfd3..7016a76ec93 100644
--- a/rubocop/cop/rspec/any_instance_of.rb
+++ b/rubocop/cop/rspec/any_instance_of.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'rubocop-rspec'
+
 module RuboCop
   module Cop
     module RSpec
diff --git a/rubocop/cop/rspec/be_success_matcher.rb b/rubocop/cop/rspec/be_success_matcher.rb
index 5a011845075..1ed55762965 100644
--- a/rubocop/cop/rspec/be_success_matcher.rb
+++ b/rubocop/cop/rspec/be_success_matcher.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'rubocop-rspec'
+
 module RuboCop
   module Cop
     module RSpec
diff --git a/rubocop/cop/rspec/env_assignment.rb b/rubocop/cop/rspec/env_assignment.rb
index add7897c624..6994f3f0969 100644
--- a/rubocop/cop/rspec/env_assignment.rb
+++ b/rubocop/cop/rspec/env_assignment.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'rubocop-rspec'
+
 module RuboCop
   module Cop
     module RSpec
diff --git a/rubocop/cop/rspec/expect_gitlab_tracking.rb b/rubocop/cop/rspec/expect_gitlab_tracking.rb
index 4f92980baa4..13fc7eace71 100644
--- a/rubocop/cop/rspec/expect_gitlab_tracking.rb
+++ b/rubocop/cop/rspec/expect_gitlab_tracking.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'rack/utils'
+require 'rubocop-rspec'
 
 module RuboCop
   module Cop
diff --git a/rubocop/cop/rspec/factories_in_migration_specs.rb b/rubocop/cop/rspec/factories_in_migration_specs.rb
index 6dde3d4524c..7dce1264b0e 100644
--- a/rubocop/cop/rspec/factories_in_migration_specs.rb
+++ b/rubocop/cop/rspec/factories_in_migration_specs.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'rubocop-rspec'
+
 module RuboCop
   module Cop
     module RSpec
diff --git a/rubocop/cop/rspec/factory_bot/inline_association.rb b/rubocop/cop/rspec/factory_bot/inline_association.rb
index ccc6364fb73..8d7c73b99a0 100644
--- a/rubocop/cop/rspec/factory_bot/inline_association.rb
+++ b/rubocop/cop/rspec/factory_bot/inline_association.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'rubocop-rspec'
+
 module RuboCop
   module Cop
     module RSpec
diff --git a/rubocop/cop/rspec/have_gitlab_http_status.rb b/rubocop/cop/rspec/have_gitlab_http_status.rb
index 86ece72b4f5..29577598ba7 100644
--- a/rubocop/cop/rspec/have_gitlab_http_status.rb
+++ b/rubocop/cop/rspec/have_gitlab_http_status.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rack/utils'
+require 'rubocop-rspec'
 
 module RuboCop
   module Cop
diff --git a/rubocop/cop/rspec/httparty_basic_auth.rb b/rubocop/cop/rspec/httparty_basic_auth.rb
index 1e0f7ae7af0..d188002673f 100644
--- a/rubocop/cop/rspec/httparty_basic_auth.rb
+++ b/rubocop/cop/rspec/httparty_basic_auth.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'rubocop-rspec'
+
 module RuboCop
   module Cop
     module RSpec
diff --git a/rubocop/cop/rspec/modify_sidekiq_middleware.rb b/rubocop/cop/rspec/modify_sidekiq_middleware.rb
index 78e3ba223b0..2e27288933f 100644
--- a/rubocop/cop/rspec/modify_sidekiq_middleware.rb
+++ b/rubocop/cop/rspec/modify_sidekiq_middleware.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'rubocop-rspec'
+
 module RuboCop
   module Cop
     module RSpec
diff --git a/rubocop/cop/rspec/timecop_freeze.rb b/rubocop/cop/rspec/timecop_freeze.rb
index 70e37ecfa55..b13f5050040 100644
--- a/rubocop/cop/rspec/timecop_freeze.rb
+++ b/rubocop/cop/rspec/timecop_freeze.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'rubocop-rspec'
+
 module RuboCop
   module Cop
     module RSpec
diff --git a/rubocop/cop/rspec/timecop_travel.rb b/rubocop/cop/rspec/timecop_travel.rb
index 586567fa0cd..03f978be349 100644
--- a/rubocop/cop/rspec/timecop_travel.rb
+++ b/rubocop/cop/rspec/timecop_travel.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'rubocop-rspec'
+
 module RuboCop
   module Cop
     module RSpec
diff --git a/rubocop/cop/rspec/top_level_describe_path.rb b/rubocop/cop/rspec/top_level_describe_path.rb
index 3cc1ee8df90..ee1a0bcc4b6 100644
--- a/rubocop/cop/rspec/top_level_describe_path.rb
+++ b/rubocop/cop/rspec/top_level_describe_path.rb
@@ -1,21 +1,20 @@
 # frozen_string_literal: true
 
-require 'rubocop/rspec/top_level_describe'
+require 'rubocop/cop/rspec/base'
+require 'rubocop/cop/rspec/mixin/top_level_group'
 
 module RuboCop
   module Cop
     module RSpec
-      class TopLevelDescribePath < RuboCop::Cop::Cop
-        include RuboCop::RSpec::TopLevelDescribe
+      class TopLevelDescribePath < RuboCop::Cop::RSpec::Base
+        include RuboCop::Cop::RSpec::TopLevelGroup
 
         MESSAGE = 'A file with a top-level `describe` must end in _spec.rb.'
-        SHARED_EXAMPLES = %i[shared_examples shared_examples_for].freeze
 
-        def on_top_level_describe(node, args)
+        def on_top_level_example_group(node)
           return if acceptable_file_path?(processed_source.buffer.name)
-          return if shared_example?(node)
 
-          add_offense(node, message: MESSAGE)
+          add_offense(node.send_node, message: MESSAGE)
         end
 
         private
@@ -23,12 +22,6 @@ module RuboCop
         def acceptable_file_path?(path)
           File.fnmatch?('*_spec.rb', path) || File.fnmatch?('*/frontend/fixtures/*', path) || File.fnmatch?('*/docs_screenshots/*_docs.rb', path)
         end
-
-        def shared_example?(node)
-          node.ancestors.any? do |node|
-            node.respond_to?(:method_name) && SHARED_EXAMPLES.include?(node.method_name)
-          end
-        end
       end
     end
   end
diff --git a/rubocop/cop/rspec/web_mock_enable.rb b/rubocop/cop/rspec/web_mock_enable.rb
index 0bef16a16b0..395375e5fc1 100644
--- a/rubocop/cop/rspec/web_mock_enable.rb
+++ b/rubocop/cop/rspec/web_mock_enable.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'rubocop-rspec'
+
 module RuboCop
   module Cop
     module RSpec