Merge branch 'use_upstream_expect_offense' into 'master'

[RUN AS-IF-FOSS] Use upstream ExpectOffense module

See merge request gitlab-org/gitlab!34608

spec/rubocop/cop/gitlab/duplicate_spec_location_spec.rb

@@ -2,12 +2,10 @@
 
 require 'fast_spec_helper'
 require 'rubocop'
-require 'rubocop/rspec/support'
 
 require_relative '../../../../rubocop/cop/gitlab/duplicate_spec_location'
 
-describe RuboCop::Cop::Gitlab::DuplicateSpecLocation do
-  include RuboCop::RSpec::ExpectOffense
+describe RuboCop::Cop::Gitlab::DuplicateSpecLocation, type: :rubocop do
   include CopHelper
 
   subject(:cop) { described_class.new }

spec/rubocop/cop/graphql/authorize_types_spec.rb

@@ -2,11 +2,10 @@
 
 require 'fast_spec_helper'
 require 'rubocop'
-require 'rubocop/rspec/support'
+
 require_relative '../../../../rubocop/cop/graphql/authorize_types'
 
-describe RuboCop::Cop::Graphql::AuthorizeTypes do
-  include RuboCop::RSpec::ExpectOffense
+describe RuboCop::Cop::Graphql::AuthorizeTypes, type: :rubocop do
   include CopHelper
 
   subject(:cop) { described_class.new }

spec/rubocop/cop/graphql/descriptions_spec.rb

@@ -2,11 +2,9 @@
 
 require 'fast_spec_helper'
 require 'rubocop'
-require 'rubocop/rspec/support'
 require_relative '../../../../rubocop/cop/graphql/descriptions'
 
-describe RuboCop::Cop::Graphql::Descriptions do
-  include RuboCop::RSpec::ExpectOffense
+describe RuboCop::Cop::Graphql::Descriptions, type: :rubocop do
   include CopHelper
 
   subject(:cop) { described_class.new }

spec/rubocop/cop/migration/add_column_with_default_spec.rb

 # frozen_string_literal: true
 
-require 'spec_helper'
-
+require 'fast_spec_helper'
 require 'rubocop'
-require 'rubocop/rspec/support'
-
 require_relative '../../../../rubocop/cop/migration/add_column_with_default'
 
-describe RuboCop::Cop::Migration::AddColumnWithDefault do
+describe RuboCop::Cop::Migration::AddColumnWithDefault, type: :rubocop do
   include CopHelper
 
   let(:cop) { described_class.new }

spec/rubocop/cop/migration/add_columns_to_wide_tables_spec.rb

 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'fast_spec_helper'
 require 'rubocop'
-
 require_relative '../../../../rubocop/cop/migration/add_columns_to_wide_tables'
 
-describe RuboCop::Cop::Migration::AddColumnsToWideTables do
+describe RuboCop::Cop::Migration::AddColumnsToWideTables, type: :rubocop do
   include CopHelper
 
   let(:cop) { described_class.new }

spec/rubocop/cop/migration/add_concurrent_foreign_key_spec.rb

 # frozen_string_literal: true
 
-require 'spec_helper'
-
+require 'fast_spec_helper'
 require 'rubocop'
-require 'rubocop/rspec/support'
-
 require_relative '../../../../rubocop/cop/migration/add_concurrent_foreign_key'
 
-describe RuboCop::Cop::Migration::AddConcurrentForeignKey do
+describe RuboCop::Cop::Migration::AddConcurrentForeignKey, type: :rubocop do
   include CopHelper
 
   let(:cop) { described_class.new }

spec/rubocop/cop/migration/add_concurrent_index_spec.rb

 # frozen_string_literal: true
 
-require 'spec_helper'
-
+require 'fast_spec_helper'
 require 'rubocop'
-require 'rubocop/rspec/support'
-
 require_relative '../../../../rubocop/cop/migration/add_concurrent_index'
 
-describe RuboCop::Cop::Migration::AddConcurrentIndex do
+describe RuboCop::Cop::Migration::AddConcurrentIndex, type: :rubocop do
   include CopHelper
 
   subject(:cop) { described_class.new }

spec/rubocop/cop/migration/add_index_spec.rb

 # frozen_string_literal: true
 
-require 'spec_helper'
-
+require 'fast_spec_helper'
 require 'rubocop'
-require 'rubocop/rspec/support'
-
 require_relative '../../../../rubocop/cop/migration/add_index'
 
-describe RuboCop::Cop::Migration::AddIndex do
+describe RuboCop::Cop::Migration::AddIndex, type: :rubocop do
   include CopHelper
 
   subject(:cop) { described_class.new }

spec/rubocop/cop/migration/add_limit_to_text_columns_spec.rb

 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'fast_spec_helper'
 require 'rubocop'
-require 'rubocop/rspec/support'
-
 require_relative '../../../../rubocop/cop/migration/add_limit_to_text_columns'
 
-describe RuboCop::Cop::Migration::AddLimitToTextColumns do
+describe RuboCop::Cop::Migration::AddLimitToTextColumns, type: :rubocop do
   include CopHelper
 
   subject(:cop) { described_class.new }

spec/rubocop/cop/migration/add_reference_spec.rb

 # frozen_string_literal: true
 
-require 'spec_helper'
-
+require 'fast_spec_helper'
 require 'rubocop'
-require 'rubocop/rspec/support'
-
 require_relative '../../../../rubocop/cop/migration/add_reference'
 
-describe RuboCop::Cop::Migration::AddReference do
+describe RuboCop::Cop::Migration::AddReference, type: :rubocop do
   include CopHelper
 
   let(:cop) { described_class.new }

spec/rubocop/cop/migration/add_timestamps_spec.rb

 # frozen_string_literal: true
 
-require 'spec_helper'
-
+require 'fast_spec_helper'
 require 'rubocop'
-require 'rubocop/rspec/support'
-
 require_relative '../../../../rubocop/cop/migration/add_timestamps'
 
-describe RuboCop::Cop::Migration::AddTimestamps do
+describe RuboCop::Cop::Migration::AddTimestamps, type: :rubocop do
   include CopHelper
 
   subject(:cop) { described_class.new }

spec/rubocop/cop/migration/datetime_spec.rb

 # frozen_string_literal: true
 
-require 'spec_helper'
-
+require 'fast_spec_helper'
 require 'rubocop'
-require 'rubocop/rspec/support'
-
 require_relative '../../../../rubocop/cop/migration/datetime'
 
-describe RuboCop::Cop::Migration::Datetime do
+describe RuboCop::Cop::Migration::Datetime, type: :rubocop do
   include CopHelper
 
   subject(:cop) { described_class.new }

spec/rubocop/cop/migration/hash_index_spec.rb

 # frozen_string_literal: true
 
-require 'spec_helper'
-
+require 'fast_spec_helper'
 require 'rubocop'
-require 'rubocop/rspec/support'
-
 require_relative '../../../../rubocop/cop/migration/hash_index'
 
-describe RuboCop::Cop::Migration::HashIndex do
+describe RuboCop::Cop::Migration::HashIndex, type: :rubocop do
   include CopHelper
 
   subject(:cop) { described_class.new }

spec/rubocop/cop/migration/prevent_strings_spec.rb

 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'fast_spec_helper'
 require 'rubocop'
-require 'rubocop/rspec/support'
-
 require_relative '../../../../rubocop/cop/migration/prevent_strings'
 
-describe RuboCop::Cop::Migration::PreventStrings do
+describe RuboCop::Cop::Migration::PreventStrings, type: :rubocop do
   include CopHelper
 
   subject(:cop) { described_class.new }

spec/rubocop/cop/migration/remove_column_spec.rb

 # frozen_string_literal: true
 
-require 'spec_helper'
-
+require 'fast_spec_helper'
 require 'rubocop'
-require 'rubocop/rspec/support'
-
 require_relative '../../../../rubocop/cop/migration/remove_column'
 
-describe RuboCop::Cop::Migration::RemoveColumn do
+describe RuboCop::Cop::Migration::RemoveColumn, type: :rubocop do
   include CopHelper
 
   subject(:cop) { described_class.new }

spec/rubocop/cop/migration/remove_concurrent_index_spec.rb

 # frozen_string_literal: true
 
-require 'spec_helper'
-
+require 'fast_spec_helper'
 require 'rubocop'
-require 'rubocop/rspec/support'
-
 require_relative '../../../../rubocop/cop/migration/remove_concurrent_index'
 
-describe RuboCop::Cop::Migration::RemoveConcurrentIndex do
+describe RuboCop::Cop::Migration::RemoveConcurrentIndex, type: :rubocop do
   include CopHelper
 
   subject(:cop) { described_class.new }

spec/rubocop/cop/migration/remove_index_spec.rb

 # frozen_string_literal: true
 
-require 'spec_helper'
-
+require 'fast_spec_helper'
 require 'rubocop'
-require 'rubocop/rspec/support'
-
 require_relative '../../../../rubocop/cop/migration/remove_index'
 
-describe RuboCop::Cop::Migration::RemoveIndex do
+describe RuboCop::Cop::Migration::RemoveIndex, type: :rubocop do
   include CopHelper
 
   subject(:cop) { described_class.new }

spec/rubocop/cop/migration/safer_boolean_column_spec.rb

 # frozen_string_literal: true
 
-require 'spec_helper'
-
+require 'fast_spec_helper'
 require 'rubocop'
-require 'rubocop/rspec/support'
-
 require_relative '../../../../rubocop/cop/migration/safer_boolean_column'
 
-describe RuboCop::Cop::Migration::SaferBooleanColumn do
+describe RuboCop::Cop::Migration::SaferBooleanColumn, type: :rubocop do
   include CopHelper
 
   subject(:cop) { described_class.new }

spec/rubocop/cop/migration/timestamps_spec.rb

 # frozen_string_literal: true
 
-require 'spec_helper'
-
+require 'fast_spec_helper'
 require 'rubocop'
-require 'rubocop/rspec/support'
-
 require_relative '../../../../rubocop/cop/migration/timestamps'
 
-describe RuboCop::Cop::Migration::Timestamps do
+describe RuboCop::Cop::Migration::Timestamps, type: :rubocop do
   include CopHelper
 
   subject(:cop) { described_class.new }

spec/rubocop/cop/migration/with_lock_retries_disallowed_method_spec.rb

 # frozen_string_literal: true
 
-require 'spec_helper'
-
+require 'fast_spec_helper'
 require 'rubocop'
-require 'rubocop/rspec/support'
-
 require_relative '../../../../rubocop/cop/migration/with_lock_retries_disallowed_method'
 
-describe RuboCop::Cop::Migration::WithLockRetriesDisallowedMethod do
+describe RuboCop::Cop::Migration::WithLockRetriesDisallowedMethod, type: :rubocop do
   include CopHelper
 
   subject(:cop) { described_class.new }

spec/rubocop/cop/migration/with_lock_retries_with_change_spec.rb

 # frozen_string_literal: true
 
-require 'spec_helper'
-
+require 'fast_spec_helper'
 require 'rubocop'
-require 'rubocop/rspec/support'
-
 require_relative '../../../../rubocop/cop/migration/with_lock_retries_with_change'
 
-describe RuboCop::Cop::Migration::WithLockRetriesWithChange do
+describe RuboCop::Cop::Migration::WithLockRetriesWithChange, type: :rubocop do
   include CopHelper
 
   subject(:cop) { described_class.new }

spec/rubocop/cop/performance/ar_count_each_spec.rb

 # frozen_string_literal: true
 
 require 'fast_spec_helper'
+require 'rubocop'
 require_relative '../../../../rubocop/cop/performance/ar_count_each.rb'
 
 describe RuboCop::Cop::Performance::ARCountEach, type: :rubocop do
   include CopHelper
-  include ExpectOffense
 
   subject(:cop) { described_class.new }
 

spec/rubocop/cop/performance/ar_exists_and_present_blank_spec.rb

 # frozen_string_literal: true
 
 require 'fast_spec_helper'
+require 'rubocop'
 require_relative '../../../../rubocop/cop/performance/ar_exists_and_present_blank.rb'
 
 describe RuboCop::Cop::Performance::ARExistsAndPresentBlank, type: :rubocop do
   include CopHelper
-  include ExpectOffense
 
   subject(:cop) { described_class.new }
 

spec/rubocop/cop/performance/readlines_each_spec.rb

 # frozen_string_literal: true
 
 require 'fast_spec_helper'
+require 'rubocop'
 require_relative '../../../../rubocop/cop/performance/readlines_each'
 
 describe RuboCop::Cop::Performance::ReadlinesEach, type: :rubocop do
   include CopHelper
-  include ExpectOffense
 
   subject(:cop) { described_class.new }
 

spec/rubocop/cop/rspec/modify_sidekiq_middleware_spec.rb

@@ -6,7 +6,6 @@ require_relative '../../../../rubocop/cop/rspec/modify_sidekiq_middleware'
 
 describe RuboCop::Cop::RSpec::ModifySidekiqMiddleware, type: :rubocop do
   include CopHelper
-  include ExpectOffense
 
   subject(:cop) { described_class.new }
 

spec/rubocop/cop/rspec/top_level_describe_path_spec.rb

 # frozen_string_literal: true
 
 require 'fast_spec_helper'
-
 require 'rubocop'
-require 'rubocop/rspec/support'
-
 require_relative '../../../../rubocop/cop/rspec/top_level_describe_path'
 
-describe RuboCop::Cop::RSpec::TopLevelDescribePath do
-  include RuboCop::RSpec::ExpectOffense
+describe RuboCop::Cop::RSpec::TopLevelDescribePath, type: :rubocop do
   include CopHelper
 
   subject(:cop) { described_class.new }

spec/rubocop/cop/scalability/bulk_perform_with_context_spec.rb

@@ -6,7 +6,6 @@ require_relative '../../../../rubocop/cop/scalability/bulk_perform_with_context'
 
 describe RuboCop::Cop::Scalability::BulkPerformWithContext, type: :rubocop do
   include CopHelper
-  include ExpectOffense
 
   subject(:cop) { described_class.new }
 

spec/rubocop/cop/scalability/cron_worker_context_spec.rb

@@ -6,7 +6,6 @@ require_relative '../../../../rubocop/cop/scalability/cron_worker_context'
 
 describe RuboCop::Cop::Scalability::CronWorkerContext, type: :rubocop do
   include CopHelper
-  include ExpectOffense
 
   subject(:cop) { described_class.new }
 

spec/rubocop/cop/scalability/file_uploads_spec.rb

@@ -6,7 +6,6 @@ require_relative '../../../../rubocop/cop/scalability/file_uploads'
 
 describe RuboCop::Cop::Scalability::FileUploads, type: :rubocop do
   include CopHelper
-  include ExpectOffense
 
   subject(:cop) { described_class.new }
 

spec/rubocop/cop/scalability/idempotent_worker_spec.rb

@@ -6,7 +6,6 @@ require_relative '../../../../rubocop/cop/scalability/idempotent_worker'
 
 describe RuboCop::Cop::Scalability::IdempotentWorker, type: :rubocop do
   include CopHelper
-  include ExpectOffense
 
   subject(:cop) { described_class.new }
 

spec/spec_helper.rb

@@ -103,7 +103,6 @@ RSpec.configure do |config|
   config.include ActiveJob::TestHelper
   config.include ActiveSupport::Testing::TimeHelpers
   config.include CycleAnalyticsHelpers
-  config.include ExpectOffense
   config.include FactoryBot::Syntax::Methods
   config.include FixtureHelpers
   config.include NonExistingRecordsHelpers

spec/support/helpers/expect_offense.rb

-# frozen_string_literal: true
-
-require 'rubocop/rspec/support'
-
-# https://github.com/backus/rubocop-rspec/blob/master/spec/support/expect_offense.rb
-# rubocop-rspec gem extension of RuboCop's ExpectOffense module.
-#
-# This mixin is the same as rubocop's ExpectOffense except the default
-# filename ends with `_spec.rb`
-module ExpectOffense
-  include RuboCop::RSpec::ExpectOffense
-
-  DEFAULT_FILENAME = 'example_spec.rb'.freeze
-
-  def expect_offense(source, filename = DEFAULT_FILENAME)
-    super
-  end
-
-  def expect_no_offenses(source, filename = DEFAULT_FILENAME)
-    super
-  end
-end

spec/support/rspec.rb

@@ -4,7 +4,7 @@ require_relative "helpers/stub_configuration"
 require_relative "helpers/stub_metrics"
 require_relative "helpers/stub_object_storage"
 require_relative "helpers/stub_env"
-require_relative "helpers/expect_offense"
+require 'rubocop/rspec/support'
 
 RSpec.configure do |config|
   config.mock_with :rspec
@@ -15,5 +15,5 @@ RSpec.configure do |config|
   config.include StubObjectStorage
   config.include StubENV
 
-  config.include ExpectOffense, type: :rubocop
+  config.include RuboCop::RSpec::ExpectOffense, type: :rubocop
 end