rspec-mocks 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c8e75bed0a7161714dd94c0b57f20dc5ba9a66e
-  data.tar.gz: 81b87208da7820952c059230b059f95607755fcc
+  metadata.gz: b1bc4975e669df2055273dea6d7d5408f8fdb7c8
+  data.tar.gz: 1c8ed12a97b2da9679629fd7e5d13cf9653fae8f
 SHA512:
-  metadata.gz: 8092e85f567a248612be5fab6b6c37ecaed74f152ac43f90e0b8ee35fb417a559da2c31de5fe0b7e0679ff6879531ba8298fab92e07eacf57fa16e0d2de71483
-  data.tar.gz: 211a7d27ea79fe0e443f18c99bf9574ad1549e721a12091e93e76711a7333d43891e0a882e4750414e1d04a10c082776e21902089e6929c060833583be8489a5
+  metadata.gz: e50b72cd647cca2f11399a0449a552bcfba4573239a61182a5820443695f29bcba5a332083ffbcb42e56b0a45dcb103c26a85aff9acfe81f2f49710c8b8486b1
+  data.tar.gz: 229af01a4b572a4eded313234f40d650f674f7ceb0b162210d7187a58861fd3c971d1bca5423185733f188ae8454c7053dde5009dc899010a84a00a6f3b43807

data/Changelog.md

@@ -1,4 +1,16 @@
-### 3.0.1 /2014-06-07
+### 3.0.2 / 2014-06-19
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.0.1...v3.0.2)
+
+Bug Fixes:
+
+* Fix edge case that triggered "can't add a new key into hash during
+  iteration" during mock verification. (Sam Phippen, Myron Marston, #711)
+* Fix verifying doubles so that when they accidentally leak into another
+  example, they provide the same clear error message that normal doubles
+  do. (Myron Marston, #718)
+* Make `ordered` work with exact receive counts. (Sam Phippen, #713)
+
+### 3.0.1 / 2014-06-07
 [Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.0.0...v3.0.1)
 
 Bug Fixes:
@@ -215,6 +227,18 @@ Bug Fixes:
   returns `nil` or `''` so that you still get a useful message.
   (Nick DeLuca)
 
+### 2.99.1 / 2014-06-12
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.99.0...v2.99.1)
+
+Bug Fixes:
+
+* Fix bug that caused errors at the end of each example
+  when a `double.as_null_object` had been frozen. (Yuji Nakayama, #698)
+
+Deprecations:
+
+* Deprecate freezing a test double. (Yuji Nakayama, #698)
+
 ### 2.99.0 / 2014-06-01
 [Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.99.0.rc1...v2.99.0)
 

data/lib/rspec/mocks/configuration.rb

@@ -22,7 +22,7 @@ module RSpec
       # @example
       #
       #   RSpec.configure do |rspec|
-      #     rspec.mock_with :rspc do |mocks|
+      #     rspec.mock_with :rspec do |mocks|
       #       mocks.yield_receiver_to_any_instance_implementation_blocks = false
       #     end
       #   end

data/lib/rspec/mocks/message_expectation.rb

@@ -59,6 +59,7 @@ module RSpec
         @argument_list_matcher = ArgumentListMatcher::MATCH_ALL
         @order_group = expectation_ordering
         @order_group.register(self) unless type == :stub
+        @expectation_type = type
         @ordered = false
         @at_least = @at_most = @exactly = nil
         @args_to_yield = []
@@ -438,10 +439,20 @@ module RSpec
       #   expect(api).to receive(:finish).ordered
       def ordered(&block)
         self.inner_implementation_action = block
+        additional_expected_calls.times do
+          @order_group.register(self)
+        end
         @ordered = true
         self
       end
 
+      # @private
+      def additional_expected_calls
+        return 0 if @expectation_type == :stub || !@exactly
+        @expected_received_count - 1
+      end
+
+
       # @private
       def ordered?
         @ordered

data/lib/rspec/mocks/space.rb

@@ -65,7 +65,7 @@ module RSpec
       end
 
       def verify_all
-        proxies.each_value { |proxy| proxy.verify }
+        proxies.values.each { |proxy| proxy.verify }
         any_instance_recorders.each_value { |recorder| recorder.verify }
       end
 
@@ -148,7 +148,7 @@ module RSpec
       def proxy_not_found_for(id, object)
         proxies[id] = case object
           when NilClass   then ProxyForNil.new(@expectation_ordering)
-          when TestDouble then object.__build_mock_proxy(@expectation_ordering)
+          when TestDouble then object.__build_mock_proxy_unless_expired(@expectation_ordering)
           when Class
             if RSpec::Mocks.configuration.verify_partial_doubles?
               VerifyingPartialClassDoubleProxy.new(self, object, @expectation_ordering)

data/lib/rspec/mocks/test_double.rb

@@ -53,8 +53,8 @@ module RSpec
       end
 
       # @private
-      def __build_mock_proxy(order_group)
-        __raise_expired_error or TestDoubleProxy.new(self, order_group, @name)
+      def __build_mock_proxy_unless_expired(order_group)
+        __raise_expired_error or __build_mock_proxy(order_group)
       end
 
       # @private
@@ -111,6 +111,10 @@ module RSpec
         ::RSpec::Mocks.space.proxy_for(self)
       end
 
+      def __build_mock_proxy(order_group)
+        TestDoubleProxy.new(self, order_group, @name)
+      end
+
       def __raise_expired_error
         return false unless @__expired
         ErrorGenerator.new(self, @name).raise_expired_test_double_error

data/lib/rspec/mocks/verifying_double.rb

@@ -88,6 +88,13 @@ module RSpec
       include TestDouble
       include VerifyingDouble
 
+      def as_stubbed_const(options = {})
+        ConstantMutator.stub(@doubled_module.const_to_replace, self, options)
+        self
+      end
+
+    private
+
       def initialize(doubled_module, *args)
         @doubled_module = doubled_module
         super(doubled_module.description, *args)
@@ -99,11 +106,6 @@ module RSpec
           ObjectMethodReference
         )
       end
-
-      def as_stubbed_const(options = {})
-        ConstantMutator.stub(@doubled_module.const_to_replace, self, options)
-        self
-      end
     end
 
     # Similar to an InstanceVerifyingDouble, except that it verifies against

data/lib/rspec/mocks/verifying_proxy.rb

@@ -54,7 +54,7 @@ module RSpec
     # isolation.
     #
     # @private
-    class VerifyingProxy < Proxy
+    class VerifyingProxy < TestDoubleProxy
       include VerifyingProxyMethods
 
       def initialize(object, order_group, name, doubled_module, method_reference_class)

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.0.1'
+      STRING = '3.0.2'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-mocks
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Steven Baker
@@ -33,7 +33,7 @@ cert_chain:
   1yHC1AcSYpvi2dAbOiHT5iQF+krm4wse8KctXgTNnjMsHEoGKulJS2/sZl90jcCz
   muA=
   -----END CERTIFICATE-----
-date: 2014-06-07 00:00:00.000000000 Z
+date: 2014-06-20 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.0.1
+summary: rspec-mocks-3.0.2
 test_files: []
 has_rdoc: