rspec-mocks 3.1.2 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 392038fa8cfca9fe1c25e2285b52744941fe41d9
-  data.tar.gz: 3287a586cb0ea0b1b658df9e5ec8174973a0f420
+  metadata.gz: 8967bb910d6e9e42450e14ac9ce3fd37b078ba5e
+  data.tar.gz: e05cfe6e3b29c252f091de7f562e3b2424a14a1c
 SHA512:
-  metadata.gz: b41e95654ea7db54ca337f9a1f2854b62c22a994f738cd4cacb0da48b2eee29385e69b53f64dfb6206d55905ca64a0c4cc964ddad4455c0a64e8202d694822c7
-  data.tar.gz: 35964167001dc473f49efc12569e2df467c28ac050cdc5e7c2abdf1c452bd82faa2cd5d0835ebc29dd93400dfc3ca94731170fd5d3c358dd4ab7022c031b6dd7
+  metadata.gz: 72a62c1548028c0517d412fdd5b62bd8047135a6a25696f180df864b9cc4e0332be07f29290888fe1375afa7de822e404f36d6111e83ab739dee57cbf5676c17
+  data.tar.gz: 496c5678781c6c5f14a3d929521f3e57698a28bf25766efd67eb5d918f93c108467228636275fbedbf71a34b56d28acb001ce47a6bd215cf74bb28e465b28b39

data/Changelog.md

@@ -1,3 +1,17 @@
+### 3.1.3 / 2014-10-08
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.1.2...v3.1.3)
+
+Bug Fixes:
+
+* Correct received messages count when used with `have_received` matcher.
+  (Jon Rowe, #793)
+* Provide a clear error message when you use `allow_any_instance_of(...)` or
+  `expect_any_instance_of(...)` with the `have_received` matcher (they are
+  not intended to be used together and previously caused an odd internal
+  failure in rspec-mocks). (Jon Rowe, #799).
+* Fix verified double `with` verification so that it applies to method
+  stubs. (Myron Marston, #790)
+
 ### 3.1.2 / 2014-09-26
 [Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.1.1...v3.1.2)
 

data/README.md

@@ -41,6 +41,9 @@ rspec-mocks supports 3 forms for declaring method stubs:
 ```ruby
 allow(book).to receive(:title) { "The RSpec Book" }
 allow(book).to receive(:title).and_return("The RSpec Book")
+allow(book).to receive_messages(
+    :title => "The RSpec Book", 
+    :subtitle => "Behaviour-Driven Development with RSpec, Cucumber, and Friends")
 ```
 
 You can also use this shortcut, which creates a test double and declares a

data/lib/rspec/mocks/matchers/have_received.rb

@@ -55,13 +55,25 @@ module RSpec
         end
 
         def setup_allowance(_subject, &_block)
-          raise RSpec::Mocks::MockExpectationError,
-                "Using allow(...) with the `have_received` matcher is not " \
-                "supported as it would have no effect."
+          disallow("allow", " as it would have no effect")
+        end
+
+        def setup_any_instance_allowance(_subject, &_block)
+          disallow("allow_any_instance_of")
+        end
+
+        def setup_any_instance_expectation(_subject, &_block)
+          disallow("expect_any_instance_of")
         end
 
       private
 
+        def disallow(type, reason="")
+          raise RSpec::Mocks::MockExpectationError,
+                "Using #{type}(...) with the `have_received` " \
+                "matcher is not supported#{reason}."
+        end
+
         def expect
           @expectation ||= begin
             expectation = mock_proxy.build_expectation(@method_name)

data/lib/rspec/mocks/message_expectation.rb

@@ -228,14 +228,19 @@ module RSpec
         @message == message && @argument_list_matcher.args_match?(*args)
       end
 
+      # @private
+      def safe_invoke(parent_stub, *args, &block)
+        invoke_incrementing_actual_calls_by(1, false, parent_stub, *args, &block)
+      end
+
       # @private
       def invoke(parent_stub, *args, &block)
-        invoke_incrementing_actual_calls_by(1, parent_stub, *args, &block)
+        invoke_incrementing_actual_calls_by(1, true, parent_stub, *args, &block)
       end
 
       # @private
       def invoke_without_incrementing_received_count(parent_stub, *args, &block)
-        invoke_incrementing_actual_calls_by(0, parent_stub, *args, &block)
+        invoke_incrementing_actual_calls_by(0, true, parent_stub, *args, &block)
       end
 
       # @private
@@ -504,10 +509,10 @@ module RSpec
 
     private
 
-      def invoke_incrementing_actual_calls_by(increment, parent_stub, *args, &block)
+      def invoke_incrementing_actual_calls_by(increment, allowed_to_fail, parent_stub, *args, &block)
         args.unshift(orig_object) if yield_receiver_to_implementation_block?
 
-        if negative? || ((@exactly || @at_most) && (@actual_received_count == @expected_received_count))
+        if negative? || (allowed_to_fail && (@exactly || @at_most) && (@actual_received_count == @expected_received_count))
           @actual_received_count += increment
           @failed_fast = true
           # args are the args we actually received, @argument_list_matcher is the

data/lib/rspec/mocks/proxy.rb

@@ -91,7 +91,7 @@ module RSpec
         @messages_received.each do |(actual_method_name, args, _)|
           next unless expectation.matches?(actual_method_name, *args)
 
-          expectation.invoke(nil)
+          expectation.safe_invoke(nil)
           block.call(*args) if block
         end
       end

data/lib/rspec/mocks/verifying_proxy.rb

@@ -121,6 +121,11 @@ module RSpec
         super(*args, &block).tap { |x| x.method_reference = @method_reference }
       end
 
+      def add_stub(*args, &block)
+        # explict params necessary for 1.8.7 see #626
+        super(*args, &block).tap { |x| x.method_reference = @method_reference }
+      end
+
       def proxy_method_invoked(obj, *args, &block)
         validate_arguments!(args)
         super

data/lib/rspec/mocks/version.rb

@@ -3,7 +3,7 @@ module RSpec
     # Version information for RSpec mocks.
     module Version
       # Version of RSpec mocks currently in use in SemVer format.
-      STRING = '3.1.2'
+      STRING = '3.1.3'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-mocks
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.3
 platform: ruby
 authors:
 - Steven Baker
@@ -33,7 +33,7 @@ cert_chain:
   1yHC1AcSYpvi2dAbOiHT5iQF+krm4wse8KctXgTNnjMsHEoGKulJS2/sZl90jcCz
   muA=
   -----END CERTIFICATE-----
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support
@@ -179,6 +179,6 @@ rubyforge_project: rspec
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: rspec-mocks-3.1.2
+summary: rspec-mocks-3.1.3
 test_files: []
 has_rdoc: