rubocop-rspec 1.17.0 → 1.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 920ff6aef932dcc189cf4a9b36a4da113414e514
-  data.tar.gz: 924b473a982bea7b74862f9d38c7adebd54b0d15
+  metadata.gz: 173b96ec8e65798ba9231c7d57413056381b680a
+  data.tar.gz: 5b8b0010efd6c40c21d9febaf0017de0b46da612
 SHA512:
-  metadata.gz: 95f9ed3893655f17e5d78fbe03decd86deb93fab86db2599f2848795c035eeea9e4347df6b3700f3cc6e31599bd76e37ab4ab57477a9c17b9cf462c479bafb9a
-  data.tar.gz: ad2e034857001d8fd654008c96446fb48641dde3787a2ace21709005c2c185f8fa2a370a11e7dca03d42ccb428f1d110de574eaf286bf17447f92b8bc08dd2c5
+  metadata.gz: d2c56f9cb57a365fb7dabcd9fd5d1f59d0f687947bc9a79ac85eae78beaff37d649e4bdcb980ef3771b21c083ebef7192de09510a8c5cf5f24f60f1288a8fcca
+  data.tar.gz: 0e0b35c09f62bf77e0d9777a9ae87ab15b43c7c380b34956ae799fb4a91169352c0a932c8f548bb7f15064238fd9c562ad1b41ecd9d995b33f17d205562451f3

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Master (Unreleased)
 
+## 1.17.1 (2017-09-20)
+
+* Improved `RSpec/ReturnFromStub` to handle string interpolation, hashes and do..end blocks. ([@Darhazer][])
+* Fixed compatibility with JRuby. ([@zverok][])
+
 ## 1.17.0 (2017-09-14)
 
 * Add `RSpec/Capybara` namespace including the first cop for feature specs: `Capybara/FeatureMethods`. ([@rspeicher][])
@@ -242,3 +247,4 @@
 [@jonatas]: https://github.com/jonatas
 [@pocke]: https://github.com/pocke
 [@bmorrall]: https:/github.com/bmorrall
+[@zverok]: https:/github.com/zverok

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

@@ -5,10 +5,11 @@ module RuboCop
     # Clone of the the normal RuboCop::Cop::Cop class so we can rewrite
     # the inherited method without breaking functionality
     class WorkaroundCop
-      # Remove the cop inherited method to be a noop. Our RSpec::Cop
+      # Remove the Cop.inherited method to be a noop. Our RSpec::Cop
       # class will invoke the inherited hook instead
       class << self
-        remove_method :inherited
+        undef inherited
+        def inherited(*) end
       end
 
       # Special case `Module#<` so that the rspec support rubocop exports

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

@@ -39,43 +39,38 @@ module RuboCop
         MSG_AND_RETURN = 'Use `and_return` for static values.'.freeze
         MSG_BLOCK = 'Use block for static values.'.freeze
 
-        def_node_matcher :receive_with_block, <<-PATTERN
-          (block
-            (send nil :receive ...)
-            (args)
-            $(...)
-          )
-        PATTERN
-
         def_node_matcher :and_return_value, <<-PATTERN
             (send
               (send nil :receive (...)) :and_return $(...)
             )
         PATTERN
 
-        def on_block(node)
-          return unless style == :and_return
-          receive_with_block(node) do |args|
-            add_offense(node, :expression, MSG_AND_RETURN) unless dynamic?(args)
+        def on_send(node)
+          if style == :block
+            check_and_return_call(node)
+          elsif node.method_name == :receive
+            check_block_body(node)
           end
         end
 
-        def on_send(node)
-          return unless style == :block
+        private
 
+        def check_and_return_call(node)
           and_return_value(node) do |args|
             add_offense(node, :expression, MSG_BLOCK) unless dynamic?(args)
           end
         end
 
-        private
+        def check_block_body(node)
+          block = node.each_ancestor(:block).first
+          return unless block
 
-        def dynamic?(node)
-          if node.array_type?
-            return node.each_child_node.any? { |child| dynamic?(child) }
-          end
+          _receiver, _args, body = *block
+          add_offense(node, :expression, MSG_AND_RETURN) unless dynamic?(body)
+        end
 
-          !node.literal?
+        def dynamic?(node)
+          !node.recursive_literal?
         end
       end
     end

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.17.0'.freeze
+      STRING = '1.17.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,16 @@ 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
+
+    it 'finds hash with only static values returned from block' do
+      expect_offense(<<-RUBY)
+        it do
+          allow(Foo).to receive(:bar) { {a: 42, b: 43} }
+                        ^^^^^^^^^^^^^ Use `and_return` for static values.
         end
       RUBY
     end
@@ -52,6 +61,51 @@ RSpec.describe RuboCop::Cop::RSpec::ReturnFromStub, :config do
         end
       RUBY
     end
+
+    it 'ignores hash with dynamic values returned from block' do
+      expect_no_offenses(<<-RUBY)
+        it do
+          allow(Foo).to receive(:bar) { {a: 42, b: baz} }
+        end
+      RUBY
+    end
+
+    it 'ignores block returning string with interpolation' do
+      expect_no_offenses(<<-RUBY)
+        it do
+          bar = 42
+          allow(Foo).to receive(:bar) { "You called \#{bar}" }
+        end
+      RUBY
+    end
+
+    it 'finds concatenated strings with no variables' do
+      expect_offense(<<-RUBY)
+        it do
+          allow(Foo).to receive(:bar) do
+                        ^^^^^^^^^^^^^ Use `and_return` for static values.
+            "You called" \
+            "me"
+          end
+        end
+      RUBY
+    end
+
+    it 'ignores stubs without return value' do
+      expect_no_offenses(<<-RUBY)
+        it do
+          allow(Foo).to receive(:bar)
+        end
+      RUBY
+    end
+
+    it 'handles stubs in a method' do
+      expect_no_offenses(<<-RUBY)
+        def stub_foo
+          allow(Foo).to receive(:bar)
+        end
+      RUBY
+    end
   end
 
   context 'with EnforcedStyle `block`' do
@@ -74,6 +128,15 @@ RSpec.describe RuboCop::Cop::RSpec::ReturnFromStub, :config do
       RUBY
     end
 
+    it 'ignores string with interpolation returned from method' do
+      expect_no_offenses(<<-RUBY)
+        it do
+          bar = 42
+          allow(Foo).to receive(:bar).and_return("You called \#{bar}")
+        end
+      RUBY
+    end
+
     it 'ignores multiple values being returned from method' do
       expect_no_offenses(<<-RUBY)
         it do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rspec
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.17.1
 platform: ruby
 authors:
 - John Backus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-14 00:00:00.000000000 Z
+date: 2017-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop