rubocop-rspec 1.22.0 → 1.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63bb2b52f05acc607af023c9e7afa5375d5815cf026b73fda3dc10c8648806d2
-  data.tar.gz: c0bf3717a359f99ec9dd9519f5897c95dcc3e35f592baaad3dc037f1ae25c7d8
+  metadata.gz: ace522f3766b6db17eecaffa9d4a5b2efc6f4cf81a581211afed52fb7ed18a1a
+  data.tar.gz: d38f31b69bc99ff14ca490b0a7ad1a84284d1b30bc73d347ba01e8a90831198d
 SHA512:
-  metadata.gz: 4af0c95c0baf2a8dc469767c5455105276ea42f1c66ffadd09760e40eeecd0d362afcc7886b77931f0eafcc3a0785f0126ab4a3924ac4a07b1a8d94344c26d7a
-  data.tar.gz: 3712863da50c7d61207b76a92002432469e7021a87dcc1a4af1a8779581fc6a7b8beb9fc2e2017b8a45adace69f3e7a5dc6f9e9e2d47ca067c84df576cb8919d
+  metadata.gz: 8efef00f7046db8b8bf54d8585e43e999a570204aaa5b645a5b73271d84bedd7d9694ac2de40af45b457c4f5f3469a04219cb3d140d4cb6b001cb316751969f4
+  data.tar.gz: af58c7c3e41514372c3d88dbab4e4613256b0233075b7e71ee18af6158aa14d0828c7ff0eb2f4327d75fbb74e465bd1ae57378073f5d4e23817d3ef7665b7edc

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Master (Unreleased)
 
+## 1.22.1 (2018-01-17)
+
+* Fix false positives in `RSpec/ReturnFromStub`. ([@Darhazer][])
+
 ## 1.22.0 (2018-01-10)
 
 * Updates `describe_class` to account for RSpecs `:system` wrapper of rails system tests. ([@EliseFitz15][])

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

@@ -39,18 +39,23 @@ module RuboCop
         MSG_AND_RETURN = 'Use `and_return` for static values.'.freeze
         MSG_BLOCK = 'Use block for static values.'.freeze
 
-        def_node_matcher :and_return_value, <<-PATTERN
-            (send
-              (send nil? :receive (...)) :and_return $(...)
-            )
+        def_node_search :contains_stub?, '(send nil? :receive (...))'
+        def_node_search :and_return_value, <<-PATTERN
+          $(send _ :and_return $(...))
         PATTERN
 
         def on_send(node)
-          if style == :block
-            check_and_return_call(node)
-          elsif node.method_name == :receive
-            check_block_body(node)
-          end
+          return unless contains_stub?(node)
+          return unless style == :block
+
+          check_and_return_call(node)
+        end
+
+        def on_block(node)
+          return unless contains_stub?(node)
+          return unless style == :and_return
+
+          check_block_body(node)
         end
 
         def autocorrect(node)
@@ -64,26 +69,23 @@ module RuboCop
         private
 
         def check_and_return_call(node)
-          and_return_value(node) do |args|
+          and_return_value(node) do |and_return, args|
             unless dynamic?(args)
               add_offense(
-                node,
-                location: :expression,
+                and_return,
+                location: :selector,
                 message: MSG_BLOCK
               )
             end
           end
         end
 
-        def check_block_body(node)
-          block = node.each_ancestor(:block).first
-          return unless block
-
-          _receiver, _args, body = *block
+        def check_block_body(block)
+          body = block.body
           unless body && dynamic?(body) # rubocop:disable Style/GuardClause
             add_offense(
-              node,
-              location: :expression,
+              block,
+              location: :begin,
               message: MSG_AND_RETURN
             )
           end
@@ -138,9 +140,9 @@ module RuboCop
 
         # :nodoc:
         class BlockBodyCorrector
-          def initialize(node)
-            @block = node.each_ancestor(:block).first
-            @node = node
+          def initialize(block)
+            @block = block
+            @node = block.parent
             @body = block.body || NULL_BLOCK_BODY
           end
 
@@ -148,7 +150,10 @@ module RuboCop
             # Heredoc autocorrection is not yet implemented.
             return if heredoc?
 
-            corrector.replace(range, ".and_return(#{body.source})")
+            corrector.replace(
+              block.loc.expression,
+              "#{block.send_node.source}.and_return(#{body.source})"
+            )
           end
 
           private

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.22.0'.freeze
+      STRING = '1.22.1'.freeze
     end
   end
 end

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

@@ -12,7 +12,7 @@ RSpec.describe RuboCop::Cop::RSpec::ReturnFromStub, :config do
       expect_offense(<<-RUBY)
         it do
           allow(Foo).to receive(:bar) { 42 }
-                        ^^^^^^^^^^^^^ Use `and_return` for static values.
+                                      ^ Use `and_return` for static values.
         end
       RUBY
     end
@@ -21,7 +21,7 @@ RSpec.describe RuboCop::Cop::RSpec::ReturnFromStub, :config do
       expect_offense(<<-RUBY)
         it do
           allow(Foo).to receive(:bar) {}
-                        ^^^^^^^^^^^^^ Use `and_return` for static values.
+                                      ^ Use `and_return` for static values.
         end
       RUBY
     end
@@ -30,7 +30,7 @@ RSpec.describe RuboCop::Cop::RSpec::ReturnFromStub, :config do
       expect_offense(<<-RUBY)
         it do
           allow(Foo).to receive(:bar) { [42, 43] }
-                        ^^^^^^^^^^^^^ Use `and_return` for static values.
+                                      ^ Use `and_return` for static values.
         end
       RUBY
     end
@@ -39,7 +39,16 @@ RSpec.describe RuboCop::Cop::RSpec::ReturnFromStub, :config do
       expect_offense(<<-RUBY)
         it do
           allow(Foo).to receive(:bar) { {a: 42, b: 43} }
-                        ^^^^^^^^^^^^^ Use `and_return` for static values.
+                                      ^ Use `and_return` for static values.
+        end
+      RUBY
+    end
+
+    it 'finds static values in a block when there are chained methods' do
+      expect_offense(<<-RUBY)
+        it do
+          allow(Question).to receive(:meaning).with(:universe) { 42 }
+                                                               ^ Use `and_return` for static values.
         end
       RUBY
     end
@@ -92,7 +101,7 @@ RSpec.describe RuboCop::Cop::RSpec::ReturnFromStub, :config do
       expect_offense(<<-RUBY)
         it do
           allow(Foo).to receive(:bar) do
-                        ^^^^^^^^^^^^^ Use `and_return` for static values.
+                                      ^^ Use `and_return` for static values.
             "You called" \
             "me"
           end
@@ -124,6 +133,10 @@ RSpec.describe RuboCop::Cop::RSpec::ReturnFromStub, :config do
                      'allow(Foo).to receive(:bar) { { foo: 42 } }',
                      'allow(Foo).to receive(:bar).and_return({ foo: 42 })'
 
+    include_examples 'autocorrect',
+                     'allow(Foo).to receive(:bar).with(1) { 42 }',
+                     'allow(Foo).to receive(:bar).with(1).and_return(42)'
+
     include_examples 'autocorrect',
                      'allow(Foo).to receive(:bar) {}',
                      'allow(Foo).to receive(:bar).and_return(nil)'
@@ -149,7 +162,16 @@ RSpec.describe RuboCop::Cop::RSpec::ReturnFromStub, :config do
       expect_offense(<<-RUBY)
         it do
           allow(Foo).to receive(:bar).and_return(42)
-                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Use block for static values.
+                                      ^^^^^^^^^^ Use block for static values.
+        end
+      RUBY
+    end
+
+    it 'finds static values returned from chained method' do
+      expect_offense(<<-RUBY)
+        it do
+          allow(Foo).to receive(:bar).with(1).and_return(42)
+                                              ^^^^^^^^^^ Use block for static values.
         end
       RUBY
     end
@@ -183,6 +205,10 @@ RSpec.describe RuboCop::Cop::RSpec::ReturnFromStub, :config do
                      'allow(Foo).to receive(:bar).and_return(42)',
                      'allow(Foo).to receive(:bar) { 42 }'
 
+    include_examples 'autocorrect',
+                     'allow(Foo).to receive(:bar).with(1).and_return(foo: 42)',
+                     'allow(Foo).to receive(:bar).with(1) { { foo: 42 } }'
+
     include_examples 'autocorrect',
                      'allow(Foo).to receive(:bar).and_return({ foo: 42 })',
                      'allow(Foo).to receive(:bar) { { foo: 42 } }'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rspec
 version: !ruby/object:Gem::Version
-  version: 1.22.0
+  version: 1.22.1
 platform: ruby
 authors:
 - John Backus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-10 00:00:00.000000000 Z
+date: 2018-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -272,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.2
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Code style checking for RSpec files