From dae000466d43eb17c885833e3f31b5bbed0c0c0c Mon Sep 17 00:00:00 2001 From: Phil Pirozhkov Date: Fri, 24 Jun 2022 21:55:28 +0300 Subject: [PATCH] Pass range as a positional arg As introduced in https://github.com/rubocop/rubocop/pull/10748 --- lib/rubocop/cop/rspec/empty_hook.rb | 6 ++---- lib/rubocop/cop/rspec/focus.rb | 6 ++---- lib/rubocop/cop/rspec/yield.rb | 2 +- rubocop-rspec.gemspec | 2 +- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/lib/rubocop/cop/rspec/empty_hook.rb b/lib/rubocop/cop/rspec/empty_hook.rb index 580e985e0..820c1c532 100644 --- a/lib/rubocop/cop/rspec/empty_hook.rb +++ b/lib/rubocop/cop/rspec/empty_hook.rb @@ -36,11 +36,9 @@ class EmptyHook < Base def on_block(node) empty_hook?(node) do |hook| add_offense(hook) do |corrector| - range = range_with_surrounding_space( - range: node.loc.expression, - side: :left + corrector.remove( + range_with_surrounding_space(node.loc.expression, side: :left) ) - corrector.remove(range) end end end diff --git a/lib/rubocop/cop/rspec/focus.rb b/lib/rubocop/cop/rspec/focus.rb index bc41fe444..2ecaeba07 100644 --- a/lib/rubocop/cop/rspec/focus.rb +++ b/lib/rubocop/cop/rspec/focus.rb @@ -69,10 +69,8 @@ def focus_metadata(node, &block) end def with_surrounding(focus) - range_with_space = range_with_surrounding_space( - range: focus.loc.expression, - side: :left - ) + range_with_space = + range_with_surrounding_space(focus.loc.expression, side: :left) range_with_surrounding_comma(range_with_space, :left) end diff --git a/lib/rubocop/cop/rspec/yield.rb b/lib/rubocop/cop/rspec/yield.rb index 7eb099ca9..6a9d2e209 100644 --- a/lib/rubocop/cop/rspec/yield.rb +++ b/lib/rubocop/cop/rspec/yield.rb @@ -44,7 +44,7 @@ def on_block(node) def autocorrect(corrector, node, range) corrector.replace( - range_with_surrounding_space(range: range, side: :left), + range_with_surrounding_space(range, side: :left), generate_replacement(node.body) ) end diff --git a/rubocop-rspec.gemspec b/rubocop-rspec.gemspec index 174819130..ad4c0ec56 100644 --- a/rubocop-rspec.gemspec +++ b/rubocop-rspec.gemspec @@ -37,7 +37,7 @@ Gem::Specification.new do |spec| 'rubygems_mfa_required' => 'true' } - spec.add_runtime_dependency 'rubocop', '~> 1.19' + spec.add_runtime_dependency 'rubocop', '~> 1.31' spec.add_development_dependency 'rack' spec.add_development_dependency 'rake'