rubocop-rspec 1.18.0 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fef3eb92e763b31bdcf1b4a1adc0557e603b63d6
-  data.tar.gz: 48a039a782f517efb9cd9b7ff84f30acce3b9644
+  metadata.gz: 98cb4ed6eefcee97bb8b5dea2093bb2cab7abc99
+  data.tar.gz: ce92dd968c520f5dbe633443262235b05f038cf1
 SHA512:
-  metadata.gz: 98638e435ef551ee81ee340767d6adf1de37bf36f3b848514cd244fbb6b7d8a43c2a30c049eb6454376e35d98f86f17e3bd2afbcc985ef424a73499c3b182ba6
-  data.tar.gz: a4024e740e9a5fc79189dfae61b2ba62e5b2ea649f78be9c3aa1b733c47b7bb9bed4a73744e4773f2cd402f8d99caae2e6c1d5e509d07cda2d789730d8783a18
+  metadata.gz: c89f710f27e3fe8695428c11866a4f853a1397a5adece3f89963d73521edd8ea102f29e625756390d99d27afe2f33d620b0da3e761e361800eac04bef3f450f2
+  data.tar.gz: 3464b491a898fa51fa8709fa632274b221f44529845bd291d892706bdc5e9fc99e1ea234fa54b331b6af1aa6544e57397c68add5cd4c96e37fd68b0f527d91d7

data/Rakefile

@@ -6,8 +6,8 @@ require 'bundler/gem_tasks'
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts 'Run `bundle install` to install missing gems'
+  warn e.message
+  warn 'Run `bundle install` to install missing gems'
   exit e.status_code
 end
 

data/lib/rubocop/cop/rspec/align_left_let_brace.rb

@@ -26,7 +26,7 @@ module RuboCop
 
         def investigate(_)
           token_aligner.offending_tokens.each do |let|
-            add_offense(let, :begin)
+            add_offense(let, location: :begin)
           end
         end
 

data/lib/rubocop/cop/rspec/align_right_let_brace.rb

@@ -26,7 +26,7 @@ module RuboCop
 
         def investigate(_)
           token_aligner.offending_tokens.each do |let|
-            add_offense(let, :end)
+            add_offense(let, location: :end)
           end
         end
 

data/lib/rubocop/cop/rspec/any_instance.rb

@@ -29,7 +29,11 @@ module RuboCop
 
         def on_send(node)
           disallowed_stub(node) do |method|
-            add_offense(node, :expression, format(MSG, method: method))
+            add_offense(
+              node,
+              location: :expression,
+              message: format(MSG, method: method)
+            )
           end
         end
       end

data/lib/rubocop/cop/rspec/around_block.rb

@@ -29,7 +29,7 @@ module RuboCop
                          'or `%<arg>s.run`.'.freeze
 
         def_node_matcher :hook, <<-PATTERN
-          (block {(send nil :around) (send nil :around sym)} (args $...) ...)
+          (block {(send nil? :around) (send nil? :around sym)} (args $...) ...)
         PATTERN
 
         def_node_search :find_arg_usage, <<-PATTERN
@@ -49,7 +49,7 @@ module RuboCop
         private
 
         def add_no_arg_offense(node)
-          add_offense(node, :expression, MSG_NO_ARG)
+          add_offense(node, location: :expression, message: MSG_NO_ARG)
         end
 
         def check_for_unused_proxy(block, proxy)
@@ -59,7 +59,11 @@ module RuboCop
             return if usage.include?(s(:lvar, name))
           end
 
-          add_offense(proxy, :expression, format(MSG_UNUSED_ARG, arg: name))
+          add_offense(
+            proxy,
+            location: :expression,
+            message: format(MSG_UNUSED_ARG, arg: name)
+          )
         end
       end
     end

data/lib/rubocop/cop/rspec/be_eql.rb

@@ -37,11 +37,13 @@ module RuboCop
         MSG = 'Prefer `be` over `eql`.'.freeze
 
         def_node_matcher :eql_type_with_identity, <<-PATTERN
-          (send _ :to $(send nil :eql {true false int float sym nil_type?}))
+          (send _ :to $(send nil? :eql {true false int float sym nil_type?}))
         PATTERN
 
         def on_send(node)
-          eql_type_with_identity(node) { |eql| add_offense(eql, :selector) }
+          eql_type_with_identity(node) do |eql|
+            add_offense(eql, location: :selector)
+          end
         end
 
         def autocorrect(node)

data/lib/rubocop/cop/rspec/before_after_all.rb

@@ -35,7 +35,11 @@ module RuboCop
 
         def on_send(node)
           before_or_after_all(node) do |hook|
-            add_offense(node, :expression, format(MSG, hook: hook.source))
+            add_offense(
+              node,
+              location: :expression,
+              message: format(MSG, hook: hook.source)
+            )
           end
         end
       end

data/lib/rubocop/cop/rspec/capybara/current_path_expectation.rb

@@ -27,12 +27,12 @@ module RuboCop
                 '`have_current_path` matcher on `page`'.freeze
 
           def_node_matcher :expectation_set_on_current_path, <<-PATTERN
-            (send nil :expect (send {(send nil :page) nil} :current_path))
+            (send nil? :expect (send {(send nil? :page) nil?} :current_path))
           PATTERN
 
           def on_send(node)
             expectation_set_on_current_path(node) do
-              add_offense(node, :selector)
+              add_offense(node, location: :selector)
             end
           end
         end

data/lib/rubocop/cop/rspec/capybara/feature_methods.rb

@@ -47,13 +47,17 @@ module RuboCop
 
           def_node_matcher :feature_method, <<-PATTERN
             (block
-              $(send {(const nil :RSpec) nil} ${#{MAP.keys.map(&:inspect).join(' ')}} ...)
+              $(send {(const nil? :RSpec) nil?} ${#{MAP.keys.map(&:inspect).join(' ')}} ...)
             ...)
           PATTERN
 
           def on_block(node)
             feature_method(node) do |send_node, match|
-              add_offense(send_node, :selector, format(MSG, MAP[match], match))
+              add_offense(
+                send_node,
+                location: :selector,
+                message: format(MSG, MAP[match], match)
+              )
             end
           end
 

data/lib/rubocop/cop/rspec/describe_class.rb

@@ -23,11 +23,11 @@ module RuboCop
               'the class or module being tested.'.freeze
 
         def_node_matcher :valid_describe?, <<-PATTERN
-          {(send {(const nil :RSpec) nil} :describe const ...) (send nil :describe)}
+          {(send {(const nil? :RSpec) nil?} :describe const ...) (send nil? :describe)}
         PATTERN
 
         def_node_matcher :describe_with_metadata, <<-PATTERN
-          (send {(const nil :RSpec) nil} :describe
+          (send {(const nil? :RSpec) nil?} :describe
             !const
             ...
             (hash $...))
@@ -40,7 +40,7 @@ module RuboCop
         PATTERN
 
         def_node_matcher :shared_group?, <<-PATTERN
-          (block (send {(const nil :RSpec) nil} #{SharedGroups::ALL.node_pattern_union} ...) ...)
+          (block (send {(const nil? :RSpec) nil?} #{SharedGroups::ALL.node_pattern_union} ...) ...)
         PATTERN
 
         def on_top_level_describe(node, args)
@@ -51,7 +51,7 @@ module RuboCop
             return if pairs.any?(&method(:rails_metadata?))
           end
 
-          add_offense(args.first, :expression)
+          add_offense(args.first, location: :expression)
         end
       end
     end

data/lib/rubocop/cop/rspec/describe_method.rb

@@ -29,7 +29,7 @@ module RuboCop
           return unless second_arg && second_arg.str_type?
           return if METHOD_STRING_MATCHER =~ one(second_arg.children)
 
-          add_offense(second_arg, :expression)
+          add_offense(second_arg, location: :expression)
         end
       end
     end

data/lib/rubocop/cop/rspec/describe_symbol.rb

@@ -21,11 +21,13 @@ module RuboCop
         MSG = 'Avoid describing symbols.'.freeze
 
         def_node_matcher :describe_symbol?, <<-PATTERN
-          (send {(const nil :RSpec) nil} :describe $sym ...)
+          (send {(const nil? :RSpec) nil?} :describe $sym ...)
         PATTERN
 
         def on_send(node)
-          describe_symbol?(node) { |match| add_offense(match, :expression) }
+          describe_symbol?(node) do |match|
+            add_offense(match, location: :expression)
+          end
         end
       end
     end

data/lib/rubocop/cop/rspec/described_class.rb

@@ -40,7 +40,7 @@ module RuboCop
         MSG             = 'Use `%s` instead of `%s`.'.freeze
 
         def_node_matcher :common_instance_exec_closure?, <<-PATTERN
-          (block (send (const nil {:Class :Module}) :new ...) ...)
+          (block (send (const nil? {:Class :Module}) :new ...) ...)
         PATTERN
 
         def_node_matcher :rspec_block?,
@@ -57,7 +57,11 @@ module RuboCop
           @described_class = described_class
 
           find_usage(body) do |match|
-            add_offense(match, :expression, message(match.const_name))
+            add_offense(
+              match,
+              location: :expression,
+              message: message(match.const_name)
+            )
           end
         end
 

data/lib/rubocop/cop/rspec/empty_example_group.rb

@@ -70,7 +70,7 @@ module RuboCop
         def on_block(node)
           return unless example_group?(node) && !contains_example?(node)
 
-          add_offense(node.children.first, :expression)
+          add_offense(node.children.first, location: :expression)
         end
 
         private

data/lib/rubocop/cop/rspec/empty_line_after_final_let.rb

@@ -23,20 +23,18 @@ module RuboCop
       class EmptyLineAfterFinalLet < Cop
         MSG = 'Add an empty line after the last `let` block.'.freeze
 
-        def_node_matcher :let?, '(block $(send nil {:let :let!} ...) args ...)'
+        def_node_matcher :let?, '(block $(send nil? {:let :let!} ...) args ...)'
 
         def on_block(node)
-          return unless let?(node) && !in_spec_block?(node)
+          return unless example_group_with_body?(node)
 
-          latest_let = node
-          node.parent.each_child_node do |sibling|
-            latest_let = sibling if let?(sibling)
-          end
+          latest_let = node.body.child_nodes.select { |child| let?(child) }.last
 
-          return if latest_let.equal?(node.parent.children.last)
+          return if latest_let.nil?
+          return if latest_let.equal?(node.body.children.last)
 
           no_new_line_after(latest_let) do
-            add_offense(latest_let, :expression)
+            add_offense(latest_let, location: :expression)
           end
         end
 
@@ -68,12 +66,6 @@ module RuboCop
 
           node.each_child_node { |child| heredoc_line(child, &block) }
         end
-
-        def in_spec_block?(node)
-          node.each_ancestor(:block).any? do |ancestor|
-            Examples::ALL.include?(ancestor.method_name)
-          end
-        end
       end
     end
   end

data/lib/rubocop/cop/rspec/empty_line_after_subject.rb

@@ -17,7 +17,7 @@ module RuboCop
       class EmptyLineAfterSubject < Cop
         MSG = 'Add empty line after `subject`.'.freeze
 
-        def_node_matcher :subject?, '(block $(send nil :subject ...) args ...)'
+        def_node_matcher :subject?, '(block $(send nil? :subject ...) args ...)'
 
         def on_block(node)
           return unless subject?(node) && !in_spec_block?(node)
@@ -27,7 +27,7 @@ module RuboCop
           next_line = processed_source[send_line]
           return if next_line.blank?
 
-          add_offense(node, :expression, MSG)
+          add_offense(node, location: :expression, message: MSG)
         end
 
         def autocorrect(node)

data/lib/rubocop/cop/rspec/example_length.rb

@@ -37,7 +37,7 @@ module RuboCop
 
           return unless length > max_length
 
-          add_offense(node, :expression, message(length))
+          add_offense(node, location: :expression, message: message(length))
         end
 
         private

data/lib/rubocop/cop/rspec/example_wording.rb

@@ -67,7 +67,7 @@ module RuboCop
               expr.end_pos - 1
             )
 
-          add_offense(docstring, docstring, message)
+          add_offense(docstring, location: docstring, message: message)
         end
 
         def replacement_text(range)

data/lib/rubocop/cop/rspec/expect_actual.rb

@@ -45,7 +45,7 @@ module RuboCop
 
         def on_send(node)
           expect_literal(node) do |argument|
-            add_offense(argument, :expression)
+            add_offense(argument, location: :expression)
           end
         end
 

data/lib/rubocop/cop/rspec/expect_in_hook.rb

@@ -25,7 +25,7 @@ module RuboCop
         HOOKS = Hooks::ALL.node_pattern_union.freeze
 
         def_node_matcher :hook, <<-PATTERN
-          (block (send _ $#{HOOKS} ...) _ $!nil)
+          (block (send _ $#{HOOKS} ...) _ $!nil?)
         PATTERN
 
         def_node_search :expect, <<-PATTERN
@@ -39,8 +39,8 @@ module RuboCop
           hook(node) do |hook_name, body|
             expect(body) do |expect|
               method = send_node(expect)
-              add_offense(method, :selector,
-                          message(method, hook_name))
+              add_offense(method, location: :selector,
+                                  message: message(method, hook_name))
             end
           end
         end

data/lib/rubocop/cop/rspec/expect_output.rb

@@ -27,7 +27,7 @@ module RuboCop
           name = variable_name[1..-1]
           return unless name.eql?('stdout') || name.eql?('stderr')
 
-          add_offense(node, :name, format(MSG, name: name))
+          add_offense(node, location: :name, message: format(MSG, name: name))
         end
 
         private

data/lib/rubocop/cop/rspec/factory_girl/dynamic_attribute_defined_statically.rb

@@ -31,18 +31,18 @@ module RuboCop
           MSG = 'Use a block to set a dynamic value to an attribute.'.freeze
 
           def_node_matcher :dynamic_defined_statically?, <<-PATTERN
-          (send nil _ (send ... ))
+          (send nil? _ (send ... ))
           PATTERN
 
           def_node_search :factory_attributes, <<-PATTERN
-          (block (send nil {:factory :trait} ...) _ { (begin $...) $(send ...) } )
+          (block (send nil? {:factory :trait} ...) _ { (begin $...) $(send ...) } )
           PATTERN
 
           def on_block(node)
             return if node.method_name == :trait
             factory_attributes(node).to_a.flatten.each do |attribute|
               if dynamic_defined_statically?(attribute)
-                add_offense(attribute, :expression)
+                add_offense(attribute, location: :expression)
               end
             end
           end

data/lib/rubocop/cop/rspec/file_path.rb

@@ -57,7 +57,7 @@ module RuboCop
 
           return if filename_ends_with?(glob)
 
-          add_offense(node, :expression, format(MSG, glob))
+          add_offense(node, location: :expression, message: format(MSG, glob))
         end
 
         private

data/lib/rubocop/cop/rspec/focus.rb

@@ -36,15 +36,15 @@ module RuboCop
         FOCUS_TRUE   = s(:pair, FOCUS_SYMBOL, s(:true))
 
         def_node_matcher :metadata, <<-PATTERN
-          {(send nil #{FOCUSABLE_SELECTORS} ... (hash $...))
-           (send nil #{FOCUSABLE_SELECTORS} $...)}
+          {(send nil? #{FOCUSABLE_SELECTORS} ... (hash $...))
+           (send nil? #{FOCUSABLE_SELECTORS} $...)}
         PATTERN
 
         def_node_matcher :focused_block?, focused.send_pattern
 
         def on_send(node)
           focus_metadata(node) do |focus|
-            add_offense(focus, :expression)
+            add_offense(focus, location: :expression)
           end
         end
 

data/lib/rubocop/cop/rspec/hook_argument.rb

@@ -77,7 +77,11 @@ module RuboCop
             return check_implicit(method_send) unless scope_name
 
             style_detected(scope_name)
-            add_offense(method_send, :expression, explicit_message(scope_name))
+            add_offense(
+              method_send,
+              location: :expression,
+              message: explicit_message(scope_name)
+            )
           end
         end
 
@@ -95,7 +99,11 @@ module RuboCop
           style_detected(:implicit)
           return if implicit_style?
 
-          add_offense(method_send, :selector, format(EXPLICIT_MSG, style))
+          add_offense(
+            method_send,
+            location: :selector,
+            message: format(EXPLICIT_MSG, style)
+          )
         end
 
         def explicit_message(scope)

data/lib/rubocop/cop/rspec/implicit_expect.rb

@@ -31,8 +31,8 @@ module RuboCop
 
         def_node_matcher :implicit_expect, <<-PATTERN
           {
-            (send nil ${:should :should_not} ...)
-            (send (send nil $:is_expected) {:to :to_not :not_to} ...)
+            (send nil? ${:should :should_not} ...)
+            (send (send nil? $:is_expected) {:to :to_not :not_to} ...)
           }
         PATTERN
 
@@ -44,7 +44,7 @@ module RuboCop
 
         ENFORCED_REPLACEMENTS = alternatives.merge(alternatives.invert).freeze
 
-        def on_send(node)
+        def on_send(node) # rubocop:disable Metrics/MethodLength
           return unless (source_range = offending_expect(node))
 
           expectation_source = source_range.source
@@ -54,7 +54,11 @@ module RuboCop
           else
             opposite_style_detected
 
-            add_offense(node, source_range, offense_message(expectation_source))
+            add_offense(
+              node,
+              location: source_range,
+              message: offense_message(expectation_source)
+            )
           end
         end
 

data/lib/rubocop/cop/rspec/instance_spy.rb

@@ -24,20 +24,20 @@ module RuboCop
 
         EXAMPLES = Examples::ALL.node_pattern_union.freeze
 
-        def_node_matcher :example?, "(block $(send nil #{EXAMPLES}) ...)"
+        def_node_matcher :example?, "(block $(send nil? #{EXAMPLES}) ...)"
 
         def_node_search :null_double, <<-PATTERN
           (lvasgn $_
             (send
-              $(send nil :instance_double
+              $(send nil? :instance_double
                 ...) :as_null_object))
         PATTERN
 
         def_node_search :have_received_usage, <<-PATTERN
           (send
-            (send nil :expect
+            (send nil? :expect
             (lvar $_)) :to
-            (send nil :have_received
+            (send nil? :have_received
             ...)
           ...)
         PATTERN
@@ -47,7 +47,7 @@ module RuboCop
 
           null_double(node) do |var, receiver|
             have_received_usage(node) do |expected|
-              add_offense(receiver, :expression) if expected == var
+              add_offense(receiver, location: :expression) if expected == var
             end
           end
         end

data/lib/rubocop/cop/rspec/instance_variable.rb

@@ -63,7 +63,7 @@ module RuboCop
           ivar_usage(node) do |ivar, name|
             return if assignment_only? && !ivar_assigned?(node, name)
 
-            add_offense(ivar, :expression)
+            add_offense(ivar, location: :expression)
           end
         end
 

data/lib/rubocop/cop/rspec/invalid_predicate_matcher.rb

@@ -17,12 +17,12 @@ module RuboCop
         MSG = 'Omit `?` from `%<matcher>s`.'.freeze
 
         def_node_matcher :invalid_predicate_matcher?, <<-PATTERN
-          (send (send nil :expect ...) {:to :not_to :to_not} $(send nil #predicate?))
+          (send (send nil? :expect ...) {:to :not_to :to_not} $(send nil? #predicate?))
         PATTERN
 
         def on_send(node)
           invalid_predicate_matcher?(node) do |predicate|
-            add_offense(predicate, :expression)
+            add_offense(predicate, location: :expression)
           end
         end
 

data/lib/rubocop/cop/rspec/it_behaves_like.rb

@@ -28,7 +28,7 @@ module RuboCop
 
         def on_send(node)
           example_inclusion_offense(node, alternative_style) do
-            add_offense(node, :expression)
+            add_offense(node, location: :expression)
           end
         end
 

data/lib/rubocop/cop/rspec/iterated_expectation.rb

@@ -26,13 +26,13 @@ module RuboCop
         PATTERN
 
         def_node_matcher :expectation?, <<-PATTERN
-          (send (send nil :expect (lvar %)) :to ...)
+          (send (send nil? :expect (lvar %)) :to ...)
         PATTERN
 
         def on_block(node)
           each?(node) do |arg, body|
             if single_expectation?(body, arg) || only_expectations?(body, arg)
-              add_offense(node.children.first, :expression)
+              add_offense(node.children.first, location: :expression)
             end
           end
         end

data/lib/rubocop/cop/rspec/leading_subject.rb

@@ -29,7 +29,7 @@ module RuboCop
       class LeadingSubject < Cop
         MSG = 'Declare `subject` above any other `let` declarations.'.freeze
 
-        def_node_matcher :subject?, '(block $(send nil :subject ...) args ...)'
+        def_node_matcher :subject?, '(block $(send nil? :subject ...) args ...)'
 
         def on_block(node)
           return unless subject?(node) && !in_spec_block?(node)
@@ -37,7 +37,7 @@ module RuboCop
           node.parent.each_child_node do |sibling|
             break if sibling.equal?(node)
 
-            break add_offense(node, :expression) if let?(sibling)
+            break add_offense(node, location: :expression) if let?(sibling)
           end
         end
 

data/lib/rubocop/cop/rspec/let_before_examples.rb

@@ -33,7 +33,7 @@ module RuboCop
       class LetBeforeExamples < Cop
         MSG = 'Move `let` before the examples in the group.'.freeze
 
-        def_node_matcher :let?, '(block (send nil {:let :let!} ...) ...)'
+        def_node_matcher :let?, '(block (send nil? {:let :let!} ...) ...)'
         def_node_matcher :example_or_group?, <<-PATTERN
           {
             #{(Examples::ALL + ExampleGroups::ALL).block_pattern}
@@ -58,7 +58,7 @@ module RuboCop
 
           node.each_child_node do |child|
             if let?(child)
-              add_offense(child, :expression) if example_found
+              add_offense(child, location: :expression) if example_found
             elsif example_or_group?(child)
               example_found = true
             end

data/lib/rubocop/cop/rspec/let_setup.rb

@@ -30,15 +30,17 @@ module RuboCop
 
         MSG = 'Do not use `let!` for test setup.'.freeze
 
-        def_node_search :let_bang, '(block $(send nil :let! (sym $_)) args ...)'
+        def_node_search :let_bang, <<-PATTERN
+          (block $(send nil? :let! (sym $_)) args ...)
+        PATTERN
 
-        def_node_search :method_called?, '(send nil %)'
+        def_node_search :method_called?, '(send nil? %)'
 
         def on_block(node)
           return unless example_group?(node)
 
           unused_let_bang(node) do |let|
-            add_offense(let, :expression)
+            add_offense(let, location: :expression)
           end
         end
 

data/lib/rubocop/cop/rspec/message_chain.rb

@@ -17,7 +17,7 @@ module RuboCop
         def_node_matcher :message_chain, Matchers::MESSAGE_CHAIN.send_pattern
 
         def on_send(node)
-          message_chain(node) { add_offense(node, :selector) }
+          message_chain(node) { add_offense(node, location: :selector) }
         end
 
         def message(node)

data/lib/rubocop/cop/rspec/message_expectation.rb

@@ -32,16 +32,16 @@ module RuboCop
         SUPPORTED_STYLES = %w[allow expect].freeze
 
         def_node_matcher :message_expectation, <<-PATTERN
-          (send $(send nil {:expect :allow} ...) :to #receive_message?)
+          (send $(send nil? {:expect :allow} ...) :to #receive_message?)
         PATTERN
 
-        def_node_search :receive_message?, '(send nil :receive ...)'
+        def_node_search :receive_message?, '(send nil? :receive ...)'
 
         def on_send(node)
           message_expectation(node) do |match|
             return correct_style_detected if preferred_style?(match)
 
-            add_offense(match, :selector, MSG % style) do
+            add_offense(match, location: :selector, message: MSG % style) do
               opposite_style_detected
             end
           end

data/lib/rubocop/cop/rspec/message_spies.rb

@@ -37,20 +37,22 @@ module RuboCop
         SUPPORTED_STYLES = %w[have_received receive].freeze
 
         def_node_matcher :message_expectation, %(
-          (send (send nil :expect $_) {:to :to_not :not_to} ...)
+          (send (send nil? :expect $_) {:to :to_not :not_to} ...)
         )
 
         def_node_search :receive_message, %(
-          $(send nil {:receive :have_received} ...)
+          $(send nil? {:receive :have_received} ...)
         )
 
         def on_send(node)
           receive_message_matcher(node) do |receiver, message_matcher|
             return correct_style_detected if preferred_style?(message_matcher)
 
-            add_offense(message_matcher, :selector, error_message(receiver)) do
-              opposite_style_detected
-            end
+            add_offense(
+              message_matcher,
+              location: :selector,
+              message: error_message(receiver)
+            ) { opposite_style_detected }
           end
         end
 

data/lib/rubocop/cop/rspec/multiple_describes.rb

@@ -32,7 +32,7 @@ module RuboCop
           return if single_top_level_describe?
           return unless top_level_nodes.first.equal?(node)
 
-          add_offense(node, :expression)
+          add_offense(node, location: :expression)
         end
       end
     end

data/lib/rubocop/cop/rspec/multiple_expectations.rb

@@ -99,8 +99,12 @@ module RuboCop
 
           add_offense(
             method,
-            :expression,
-            format(MSG, total: expectation_count, max: max_expectations)
+            location: :expression,
+            message: format(
+              MSG,
+              total: expectation_count,
+              max: max_expectations
+            )
           )
         end
 

data/lib/rubocop/cop/rspec/multiple_subjects.rb

@@ -37,7 +37,7 @@ module RuboCop
         MSG = 'Do not set more than one subject per example group'.freeze
 
         def_node_matcher :named_subject?, <<-PATTERN
-          (block (send nil :subject $sym) args ...)
+          (block (send nil? :subject $sym) args ...)
         PATTERN
 
         def on_block(node)
@@ -46,7 +46,7 @@ module RuboCop
           subjects = RuboCop::RSpec::ExampleGroup.new(node).subjects
 
           subjects[0...-1].each do |subject|
-            add_offense(subject, :expression)
+            add_offense(subject, location: :expression)
           end
         end
 

data/lib/rubocop/cop/rspec/named_subject.rb

@@ -48,13 +48,13 @@ module RuboCop
           }
         PATTERN
 
-        def_node_matcher :unnamed_subject, '$(send nil :subject)'
+        def_node_matcher :unnamed_subject, '$(send nil? :subject)'
 
         def on_block(node)
           return unless rspec_block?(node)
 
           subject_usage(node) do |subject_node|
-            add_offense(subject_node, :selector)
+            add_offense(subject_node, location: :selector)
           end
         end
 

data/lib/rubocop/cop/rspec/nested_groups.rb

@@ -99,7 +99,11 @@ module RuboCop
 
         def on_top_level_describe(node, _)
           find_nested_contexts(node.parent) do |context, nesting|
-            add_offense(context.children.first, :expression, message(nesting))
+            add_offense(
+              context.children.first,
+              location: :expression,
+              message: message(nesting)
+            )
           end
         end
 

data/lib/rubocop/cop/rspec/not_to_not.rb

@@ -22,7 +22,7 @@ module RuboCop
 
         def on_send(node)
           not_to_not_offense(node, alternative_style) do
-            add_offense(node, :expression)
+            add_offense(node, location: :expression)
           end
         end
 

data/lib/rubocop/cop/rspec/overwriting_setup.rb

@@ -25,7 +25,7 @@ module RuboCop
         MSG = '`%<name>s` is already defined.'.freeze
 
         def_node_matcher :setup?, <<-PATTERN
-          (block (send nil {:let :let! :subject} (sym $_)) ...)
+          (block (send nil? {:let :let! :subject} (sym $_)) ...)
         PATTERN
 
         def on_block(node)
@@ -34,7 +34,11 @@ module RuboCop
           _describe, _args, body = *node
 
           find_duplicates(body) do |duplicate, name|
-            add_offense(duplicate, :expression, format(MSG, name: name))
+            add_offense(
+              duplicate,
+              location: :expression,
+              message: format(MSG, name: name)
+            )
           end
         end
 

data/lib/rubocop/cop/rspec/predicate_matcher.rb

@@ -12,25 +12,29 @@ module RuboCop
 
         def check_inflected(node)
           predicate_in_actual?(node) do |predicate|
-            add_offense(node, node.loc.expression, message_inflected(predicate))
+            add_offense(
+              node,
+              location: :expression,
+              message: message_inflected(predicate)
+            )
           end
         end
 
         def_node_matcher :predicate_in_actual?, <<-PATTERN
           (send
-            (send nil :expect {
-              (block $(send !nil #predicate? ...) ...)
-              $(send !nil #predicate? ...)})
+            (send nil? :expect {
+              (block $(send !nil? #predicate? ...) ...)
+              $(send !nil? #predicate? ...)})
             ${:to :not_to :to_not}
             $#boolean_matcher?)
         PATTERN
 
         def_node_matcher :be_bool?, <<-PATTERN
-          (send nil {:be :eq :eql :equal} {true false})
+          (send nil? {:be :eq :eql :equal} {true false})
         PATTERN
 
         def_node_matcher :be_boolthy?, <<-PATTERN
-          (send nil {:be_truthy :be_falsey :be_falsy :a_truthy_value :a_falsey_value :a_falsy_value})
+          (send nil? {:be_truthy :be_falsey :be_falsy :a_truthy_value :a_falsey_value :a_falsy_value})
         PATTERN
 
         def boolean_matcher?(node)
@@ -130,33 +134,41 @@ module RuboCop
 
         private
 
-        def check_explicit(node)
+        def check_explicit(node) # rubocop:disable Metrics/MethodLength
           predicate_matcher_block?(node) do |_actual, matcher|
-            add_offense(node, :expression, message_explicit(matcher))
+            add_offense(
+              node,
+              location: :expression,
+              message: message_explicit(matcher)
+            )
             ignore_node(node.children.first)
             return
           end
 
           return if part_of_ignored_node?(node)
           predicate_matcher?(node) do |_actual, matcher|
-            add_offense(node, :expression, message_explicit(matcher))
+            add_offense(
+              node,
+              location: :expression,
+              message: message_explicit(matcher)
+            )
           end
         end
 
         def_node_matcher :predicate_matcher?, <<-PATTERN
           (send
-            (send nil :expect $!nil)
+            (send nil? :expect $!nil?)
             {:to :not_to :to_not}
-            {$(send nil #predicate_matcher_name? ...)
-              (block $(send nil #predicate_matcher_name? ...) ...)})
+            {$(send nil? #predicate_matcher_name? ...)
+              (block $(send nil? #predicate_matcher_name? ...) ...)})
         PATTERN
 
         def_node_matcher :predicate_matcher_block?, <<-PATTERN
           (block
             (send
-              (send nil :expect $!nil)
+              (send nil? :expect $!nil?)
               {:to :not_to :to_not}
-              $(send nil #predicate_matcher_name?))
+              $(send nil? #predicate_matcher_name?))
             ...)
         PATTERN
 

data/lib/rubocop/cop/rspec/repeated_description.rb

@@ -34,7 +34,7 @@ module RuboCop
           return unless example_group?(node)
 
           repeated_descriptions(node).each do |repeated_description|
-            add_offense(repeated_description, :expression)
+            add_offense(repeated_description, location: :expression)
           end
         end
 

data/lib/rubocop/cop/rspec/repeated_example.rb

@@ -20,7 +20,7 @@ module RuboCop
           return unless example_group?(node)
 
           repeated_examples(node).each do |repeated_example|
-            add_offense(repeated_example, :expression)
+            add_offense(repeated_example, location: :expression)
           end
         end
 

data/lib/rubocop/cop/rspec/return_from_stub.rb

@@ -11,7 +11,7 @@ module RuboCop
       #
       # This cop can be configured using the `EnforcedStyle` option
       #
-      # @example `EncorcedStyle: block`
+      # @example `EnforcedStyle: block`
       #   # bad
       #   allow(Foo).to receive(:bar).and_return("baz")
       #   expect(Foo).to receive(:bar).and_return("baz")
@@ -22,7 +22,7 @@ module RuboCop
       #   # also good as the returned value is dynamic
       #   allow(Foo).to receive(:bar).and_return(bar.baz)
       #
-      # @example `EncorcedStyle: and_return`
+      # @example `EnforcedStyle: and_return`
       #   # bad
       #   allow(Foo).to receive(:bar) { "baz" }
       #   expect(Foo).to receive(:bar) { "baz" }
@@ -41,7 +41,7 @@ module RuboCop
 
         def_node_matcher :and_return_value, <<-PATTERN
             (send
-              (send nil :receive (...)) :and_return $(...)
+              (send nil? :receive (...)) :and_return $(...)
             )
         PATTERN
 
@@ -57,7 +57,13 @@ module RuboCop
 
         def check_and_return_call(node)
           and_return_value(node) do |args|
-            add_offense(node, :expression, MSG_BLOCK) unless dynamic?(args)
+            unless dynamic?(args)
+              add_offense(
+                node,
+                location: :expression,
+                message: MSG_BLOCK
+              )
+            end
           end
         end
 
@@ -66,7 +72,13 @@ module RuboCop
           return unless block
 
           _receiver, _args, body = *block
-          add_offense(node, :expression, MSG_AND_RETURN) unless dynamic?(body)
+          unless dynamic?(body) # rubocop:disable Style/GuardClause
+            add_offense(
+              node,
+              location: :expression,
+              message: MSG_AND_RETURN
+            )
+          end
         end
 
         def dynamic?(node)

data/lib/rubocop/cop/rspec/scattered_let.rb

@@ -29,7 +29,7 @@ module RuboCop
       class ScatteredLet < Cop
         MSG = 'Group all let/let! blocks in the example group together.'.freeze
 
-        def_node_matcher :let?, '(block (send nil {:let :let!} ...) ...)'
+        def_node_matcher :let?, '(block (send nil? {:let :let!} ...) ...)'
 
         def on_block(node)
           return unless example_group_with_body?(node)
@@ -45,7 +45,7 @@ module RuboCop
 
           node.each_child_node do |child|
             if let?(child)
-              add_offense(child, :expression) if mix_found
+              add_offense(child, location: :expression) if mix_found
               let_found = true
             elsif let_found
               mix_found = true

data/lib/rubocop/cop/rspec/scattered_setup.rb

@@ -29,7 +29,7 @@ module RuboCop
           return unless example_group?(node)
 
           analyzable_hooks(node).each do |repeated_hook|
-            add_offense(repeated_hook, :expression)
+            add_offense(repeated_hook, location: :expression)
           end
         end
 

data/lib/rubocop/cop/rspec/shared_context.rb

@@ -99,7 +99,11 @@ module RuboCop
         end
 
         def add_shared_item_offense(node, message)
-          add_offense(node.children.first, :expression, message)
+          add_offense(
+            node.children.first,
+            location: :expression,
+            message: message
+          )
         end
       end
     end

data/lib/rubocop/cop/rspec/single_argument_message_chain.rb

@@ -30,7 +30,7 @@ module RuboCop
 
             return if arg.hash_type? && !single_key_hash?(arg)
 
-            add_offense(node, :selector)
+            add_offense(node, location: :selector)
           end
         end
 

data/lib/rubocop/cop/rspec/subject_stub.rb

@@ -40,8 +40,8 @@ module RuboCop
         #   @yield [Symbol] subject name
         def_node_matcher :subject, <<-PATTERN
           {
-            (block (send nil :subject (sym $_)) args ...)
-            (block (send nil $:subject) args ...)
+            (block (send nil? :subject (sym $_)) args ...)
+            (block (send nil? $:subject) args ...)
           }
         PATTERN
 
@@ -57,17 +57,19 @@ module RuboCop
         #     expect(foo).to receive(:bar).with(1).and_return(2)
         def_node_matcher :message_expectation?, <<-PATTERN
           {
-            (send nil :allow (send nil %))
-            (send (send nil :expect (send nil %)) :to #receive_message?)
+            (send nil? :allow (send nil? %))
+            (send (send nil? :expect (send nil? %)) :to #receive_message?)
           }
         PATTERN
 
-        def_node_search :receive_message?, '(send nil :receive ...)'
+        def_node_search :receive_message?, '(send nil? :receive ...)'
 
         def on_block(node)
           return unless example_group?(node)
 
-          find_subject_stub(node) { |stub| add_offense(stub, :expression) }
+          find_subject_stub(node) do |stub|
+            add_offense(stub, location: :expression)
+          end
         end
 
         private

data/lib/rubocop/cop/rspec/verified_doubles.rb

@@ -21,14 +21,14 @@ module RuboCop
         MSG = 'Prefer using verifying doubles over normal doubles.'.freeze
 
         def_node_matcher :unverified_double, <<-PATTERN
-          {(send nil {:double :spy} $_ ...) }
+          {(send nil? {:double :spy} $_ ...) }
         PATTERN
 
         def on_send(node)
           unverified_double(node) do |name|
             return if name.sym_type? && cop_config['IgnoreSymbolicNames']
 
-            add_offense(node, :expression)
+            add_offense(node, location: :expression)
           end
         end
       end

data/lib/rubocop/cop/rspec/void_expect.rb

@@ -16,7 +16,7 @@ module RuboCop
               'Chain the methods or remove it.'.freeze
 
         def_node_matcher :expect?, <<-PATTERN
-          (send nil :expect ...)
+          (send nil? :expect ...)
         PATTERN
 
         def_node_matcher :expect_block?, <<-PATTERN
@@ -37,7 +37,7 @@ module RuboCop
 
         def check_expect(node)
           return unless void?(node)
-          add_offense(node, :expression)
+          add_offense(node, location: :expression)
         end
 
         def void?(expect)

data/lib/rubocop/rspec/example_group.rb

@@ -18,7 +18,7 @@ module RuboCop
       #
       #   Detect if node is `before`, `after`, `around`
       def_node_matcher :hook, <<-PATTERN
-        (block {$(send nil #{Hooks::ALL.node_pattern_union} ...)} ...)
+        (block {$(send nil? #{Hooks::ALL.node_pattern_union} ...)} ...)
       PATTERN
 
       def_node_matcher :subject, Subject::ALL.block_pattern

data/lib/rubocop/rspec/language/node_pattern.rb

@@ -10,7 +10,7 @@ module RuboCop
         def_node_matcher :example_group?, ExampleGroups::ALL.block_pattern
 
         def_node_matcher :example_group_with_body?, <<-PATTERN
-          (block #{ExampleGroups::ALL.send_pattern} args [!nil])
+          (block #{ExampleGroups::ALL.send_pattern} args [!nil?])
         PATTERN
 
         def_node_matcher :example?, Examples::ALL.block_pattern

data/lib/rubocop/rspec/version.rb

@@ -4,7 +4,7 @@ module RuboCop
   module RSpec
     # Version information for the RSpec RuboCop plugin.
     module Version
-      STRING = '1.18.0'.freeze
+      STRING = '1.19.0'.freeze
     end
   end
 end

data/rubocop-rspec.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.test_files = spec.files.grep(%r{^spec/})
   spec.extra_rdoc_files = ['MIT-LICENSE.md', 'README.md']
 
-  spec.add_runtime_dependency 'rubocop', '>= 0.50.0'
+  spec.add_runtime_dependency 'rubocop', '>= 0.51.0'
 
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '>= 3.4'

data/spec/rubocop/cop/rspec/cop_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe RuboCop::Cop::RSpec::Cop do
       end
 
       def on_send(node)
-        add_offense(node, :expression, 'I flag everything')
+        add_offense(node, location: :expression, message: 'I flag everything')
       end
     end
     RuboCop::RSpec::FakeCop

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rspec
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 1.19.0
 platform: ruby
 authors:
 - John Backus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-29 00:00:00.000000000 Z
+date: 2017-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: 0.51.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: 0.51.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement