Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

11 files changed, 32 insertions, 10 deletions

diff --git a/spec/rubocop/cop/rspec/any_instance_of_spec.rb b/spec/rubocop/cop/rspec/any_instance_of_spec.rb
index 971e28853a3..42bb7d196a1 100644
--- a/spec/rubocop/cop/rspec/any_instance_of_spec.rb
+++ b/spec/rubocop/cop/rspec/any_instance_of_spec.rb
@@ -4,7 +4,7 @@ require 'fast_spec_helper'
 
 require_relative '../../../../rubocop/cop/rspec/any_instance_of'
 
-RSpec.describe RuboCop::Cop::RSpec::AnyInstanceOf, type: :rubocop do
+RSpec.describe RuboCop::Cop::RSpec::AnyInstanceOf do
   include CopHelper
 
   subject(:cop) { described_class.new }
diff --git a/spec/rubocop/cop/rspec/be_success_matcher_spec.rb b/spec/rubocop/cop/rspec/be_success_matcher_spec.rb
index b14cf39cbde..d49507c89b1 100644
--- a/spec/rubocop/cop/rspec/be_success_matcher_spec.rb
+++ b/spec/rubocop/cop/rspec/be_success_matcher_spec.rb
@@ -4,7 +4,7 @@ require 'fast_spec_helper'
 require 'rubocop'
 require_relative '../../../../rubocop/cop/rspec/be_success_matcher'
 
-RSpec.describe RuboCop::Cop::RSpec::BeSuccessMatcher, type: :rubocop do
+RSpec.describe RuboCop::Cop::RSpec::BeSuccessMatcher do
   include CopHelper
 
   let(:source_file) { 'spec/foo_spec.rb' }
diff --git a/spec/rubocop/cop/rspec/env_assignment_spec.rb b/spec/rubocop/cop/rspec/env_assignment_spec.rb
index 72ad584dd6f..07afd30fc90 100644
--- a/spec/rubocop/cop/rspec/env_assignment_spec.rb
+++ b/spec/rubocop/cop/rspec/env_assignment_spec.rb
@@ -7,7 +7,7 @@ require 'rubocop/rspec/support'
 
 require_relative '../../../../rubocop/cop/rspec/env_assignment'
 
-RSpec.describe RuboCop::Cop::RSpec::EnvAssignment, type: :rubocop do
+RSpec.describe RuboCop::Cop::RSpec::EnvAssignment do
   include CopHelper
 
   offense_call_single_quotes_key = %(ENV['FOO'] = 'bar').freeze
diff --git a/spec/rubocop/cop/rspec/factories_in_migration_specs_spec.rb b/spec/rubocop/cop/rspec/factories_in_migration_specs_spec.rb
index 1bb93402a5b..fe9cea47a43 100644
--- a/spec/rubocop/cop/rspec/factories_in_migration_specs_spec.rb
+++ b/spec/rubocop/cop/rspec/factories_in_migration_specs_spec.rb
@@ -7,7 +7,7 @@ require 'rubocop/rspec/support'
 
 require_relative '../../../../rubocop/cop/rspec/factories_in_migration_specs'
 
-RSpec.describe RuboCop::Cop::RSpec::FactoriesInMigrationSpecs, type: :rubocop do
+RSpec.describe RuboCop::Cop::RSpec::FactoriesInMigrationSpecs do
   include CopHelper
 
   subject(:cop) { described_class.new }
diff --git a/spec/rubocop/cop/rspec/factory_bot/inline_association_spec.rb b/spec/rubocop/cop/rspec/factory_bot/inline_association_spec.rb
index 70dbe086127..33fdaaee3c7 100644
--- a/spec/rubocop/cop/rspec/factory_bot/inline_association_spec.rb
+++ b/spec/rubocop/cop/rspec/factory_bot/inline_association_spec.rb
@@ -6,7 +6,7 @@ require 'rubocop'
 
 require_relative '../../../../../rubocop/cop/rspec/factory_bot/inline_association'
 
-RSpec.describe RuboCop::Cop::RSpec::FactoryBot::InlineAssociation, type: :rubocop do
+RSpec.describe RuboCop::Cop::RSpec::FactoryBot::InlineAssociation do
   include CopHelper
 
   subject(:cop) { described_class.new }
diff --git a/spec/rubocop/cop/rspec/htt_party_basic_auth_spec.rb b/spec/rubocop/cop/rspec/htt_party_basic_auth_spec.rb
index 8c3703a488a..6e9e436602c 100644
--- a/spec/rubocop/cop/rspec/htt_party_basic_auth_spec.rb
+++ b/spec/rubocop/cop/rspec/htt_party_basic_auth_spec.rb
@@ -4,7 +4,7 @@ require 'fast_spec_helper'
 
 require_relative '../../../../rubocop/cop/rspec/httparty_basic_auth'
 
-RSpec.describe RuboCop::Cop::RSpec::HTTPartyBasicAuth, type: :rubocop do
+RSpec.describe RuboCop::Cop::RSpec::HTTPartyBasicAuth do
   include CopHelper
 
   subject(:cop) { described_class.new }
diff --git a/spec/rubocop/cop/rspec/modify_sidekiq_middleware_spec.rb b/spec/rubocop/cop/rspec/modify_sidekiq_middleware_spec.rb
index ca47bba4264..d9e3ca5741c 100644
--- a/spec/rubocop/cop/rspec/modify_sidekiq_middleware_spec.rb
+++ b/spec/rubocop/cop/rspec/modify_sidekiq_middleware_spec.rb
@@ -4,7 +4,7 @@ require 'fast_spec_helper'
 require 'rubocop'
 require_relative '../../../../rubocop/cop/rspec/modify_sidekiq_middleware'
 
-RSpec.describe RuboCop::Cop::RSpec::ModifySidekiqMiddleware, type: :rubocop do
+RSpec.describe RuboCop::Cop::RSpec::ModifySidekiqMiddleware do
   include CopHelper
 
   subject(:cop) { described_class.new }
diff --git a/spec/rubocop/cop/rspec/timecop_freeze_spec.rb b/spec/rubocop/cop/rspec/timecop_freeze_spec.rb
index 3809431a2fc..b1cf82492e4 100644
--- a/spec/rubocop/cop/rspec/timecop_freeze_spec.rb
+++ b/spec/rubocop/cop/rspec/timecop_freeze_spec.rb
@@ -7,7 +7,7 @@ require 'rubocop/rspec/support'
 
 require_relative '../../../../rubocop/cop/rspec/timecop_freeze'
 
-RSpec.describe RuboCop::Cop::RSpec::TimecopFreeze, type: :rubocop do
+RSpec.describe RuboCop::Cop::RSpec::TimecopFreeze do
   include CopHelper
 
   subject(:cop) { described_class.new }
diff --git a/spec/rubocop/cop/rspec/timecop_travel_spec.rb b/spec/rubocop/cop/rspec/timecop_travel_spec.rb
index 25a8127d40e..2ee8bfe9ad7 100644
--- a/spec/rubocop/cop/rspec/timecop_travel_spec.rb
+++ b/spec/rubocop/cop/rspec/timecop_travel_spec.rb
@@ -7,7 +7,7 @@ require 'rubocop/rspec/support'
 
 require_relative '../../../../rubocop/cop/rspec/timecop_travel'
 
-RSpec.describe RuboCop::Cop::RSpec::TimecopTravel, type: :rubocop do
+RSpec.describe RuboCop::Cop::RSpec::TimecopTravel do
   include CopHelper
 
   subject(:cop) { described_class.new }
diff --git a/spec/rubocop/cop/rspec/top_level_describe_path_spec.rb b/spec/rubocop/cop/rspec/top_level_describe_path_spec.rb
index 92a76bde243..4936936836d 100644
--- a/spec/rubocop/cop/rspec/top_level_describe_path_spec.rb
+++ b/spec/rubocop/cop/rspec/top_level_describe_path_spec.rb
@@ -4,7 +4,7 @@ require 'fast_spec_helper'
 require 'rubocop'
 require_relative '../../../../rubocop/cop/rspec/top_level_describe_path'
 
-RSpec.describe RuboCop::Cop::RSpec::TopLevelDescribePath, type: :rubocop do
+RSpec.describe RuboCop::Cop::RSpec::TopLevelDescribePath do
   include CopHelper
 
   subject(:cop) { described_class.new }
diff --git a/spec/rubocop/cop/rspec/web_mock_enable_spec.rb b/spec/rubocop/cop/rspec/web_mock_enable_spec.rb
new file mode 100644
index 00000000000..61a85064a61
--- /dev/null
+++ b/spec/rubocop/cop/rspec/web_mock_enable_spec.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'fast_spec_helper'
+
+require_relative '../../../../rubocop/cop/rspec/web_mock_enable'
+
+RSpec.describe RuboCop::Cop::RSpec::WebMockEnable do
+  subject(:cop) { described_class.new }
+
+  context 'when calling WebMock.disable_net_connect!' do
+    it 'registers an offence and autocorrects it' do
+      expect_offense(<<~RUBY)
+        WebMock.disable_net_connect!(allow_localhost: true)
+        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Use webmock_enable! instead of calling WebMock.disable_net_connect! directly.
+      RUBY
+
+      expect_correction(<<~RUBY)
+        webmock_enable!
+      RUBY
+    end
+  end
+end