# HG changeset patch # User Takuya Noguchi <takninnovationresearch@gmail.com> # Date 1614485539 0 # Sun Feb 28 04:12:19 2021 +0000 # Node ID ad597b2d6b120f0b297b3082114953cd2a25756c # Parent 1cd965c175d9f7943bfaab81c4b82fa6548b5939 Remove vendored spec/support/rubocop_helper.rb Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com> diff --git a/spec/rubocop/cop/avoid_using_env_spec.rb b/spec/rubocop/cop/avoid_using_env_spec.rb --- a/spec/rubocop/cop/avoid_using_env_spec.rb +++ b/spec/rubocop/cop/avoid_using_env_spec.rb @@ -1,9 +1,12 @@ require 'spec_helper' +require 'rubocop/rspec/cop_helper' +require 'rubocop/rspec/expect_offense' + require_relative '../../../lib/rubocop/cop/avoid_using_env' -require_relative '../../support/rubocop_helper.rb' RSpec.describe Rubocop::Cop::AvoidUsingEnv do include CopHelper + include RuboCop::RSpec::ExpectOffense subject(:cop) { described_class.new } diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -20,7 +20,6 @@ config.run_all_when_everything_filtered = true config.include(GitlabSpec::Macros) - config.include ExpectOffense config.disable_monkey_patching! end diff --git a/spec/support/rubocop_helper.rb b/spec/support/rubocop_helper.rb deleted file mode 100644 --- a/spec/support/rubocop_helper.rb +++ /dev/null @@ -1,20 +0,0 @@ -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