diff --git a/lib/rubocop/cop/rspec/hook_argument.rb b/lib/rubocop/cop/rspec/hook_argument.rb index b5601239b..f62ba0301 100644 --- a/lib/rubocop/cop/rspec/hook_argument.rb +++ b/lib/rubocop/cop/rspec/hook_argument.rb @@ -93,10 +93,8 @@ def check_implicit(method_send) style_detected(:implicit) return if implicit_style? - add_offense( - method_send.loc.selector, - message: format(EXPLICIT_MSG, scope: style) - ) do |corrector| + msg = explicit_message(nil) + add_offense(method_send.loc.selector, message: msg) do |corrector| scope = "(#{style.inspect})" corrector.replace(argument_range(method_send), scope) end diff --git a/lib/rubocop/cop/rspec/implicit_expect.rb b/lib/rubocop/cop/rspec/implicit_expect.rb index e6bc1b016..d691df2a9 100644 --- a/lib/rubocop/cop/rspec/implicit_expect.rb +++ b/lib/rubocop/cop/rspec/implicit_expect.rb @@ -55,10 +55,8 @@ def on_send(node) # rubocop:disable Metrics/MethodLength else opposite_style_detected - add_offense( - source_range, - message: offense_message(expectation_source) - ) do |corrector| + msg = offense_message(expectation_source) + add_offense(source_range, message: msg) do |corrector| replacement = replacement_source(expectation_source) corrector.replace(source_range, replacement) end diff --git a/lib/rubocop/cop/rspec/return_from_stub.rb b/lib/rubocop/cop/rspec/return_from_stub.rb index 994f22af1..6484232ed 100644 --- a/lib/rubocop/cop/rspec/return_from_stub.rb +++ b/lib/rubocop/cop/rspec/return_from_stub.rb @@ -65,11 +65,8 @@ def on_block(node) def check_and_return_call(node) and_return_value(node) do |and_return, args| unless dynamic?(args) - add_offense( - and_return.loc.selector, - message: MSG_BLOCK - ) do |corrector| - AndReturnCallCorrector.new(and_return).call(corrector) + add_offense(and_return.loc.selector, message: MSG_BLOCK) do |corr| + AndReturnCallCorrector.new(and_return).call(corr) end end end @@ -78,10 +75,7 @@ def check_and_return_call(node) def check_block_body(block) body = block.body unless dynamic?(body) # rubocop:disable Style/GuardClause - add_offense( - block.loc.begin, - message: MSG_AND_RETURN - ) do |corrector| + add_offense(block.loc.begin, message: MSG_AND_RETURN) do |corrector| BlockBodyCorrector.new(block).call(corrector) end end