rspec-mocks 2.99.0.beta2 → 2.99.0.rc1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b0603e74e956b37b8638b4c7c2bb0c4b9ffd87ab
+  data.tar.gz: 0a5d3fc77a83c1d7967f10cb623bbf6423b1764a
+SHA512:
+  metadata.gz: 1e89c42e14ca3118f667649a74a48c5e4afb24365e9e056f8de12458c3f13af049f6209363a3871979757cc0f67f6aed37b2426add030b28d84d6bfd9deaf022
+  data.tar.gz: 0cb781818c11a2c41f395efcc3b2b7bbdb5dba1730a3dd680c6501a2e473ce3b318d173056d8cdc18b49b487f888ed8aea7cc2eeced2596ad38f0b42b77f4009

data/Changelog.md

@@ -1,5 +1,14 @@
+### 2.99.0.rc1 / 2014-05-18
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.99.0.beta2...v2.99.0.rc1)
+
+Deprecations:
+
+* Deprecate `RSpec::Mocks::TestDouble.extend_onto`. (Myron Marston)
+* Deprecate `RSpec::Mocks::ConstantStubber`. (Jon Rowe)
+* Deprecate `Marshal.dump` monkey-patch without opt-in. (Xavier Shay)
+
 ### 2.99.0.beta2 / 2014-02-17
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.99.0.beta1...v2.99.0.beta2)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.99.0.beta1...v2.99.0.beta2)
 
 Deprecations:
 
@@ -14,7 +23,7 @@ Deprecations:
 * Deprecate `and_return { value }` and `and_return` without arguments. (Yuji Nakayama)
 
 ### 2.99.0.beta1 / 2013-11-07
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.14.4...v2.99.0.beta1)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.14.4...v2.99.0.beta1)
 
 Deprecations:
 
@@ -38,8 +47,16 @@ Enhancements:
 * Add a config option to yield the receiver to `any_instance` implementation
   blocks. (Sam Phippen)
 
+### 2.14.6 / 2014-02-20
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.14.5...v2.14.6)
+
+Bug Fixes:
+
+* Ensure `any_instance` method stubs and expectations are torn down regardless of
+  expectation failures. (Sam Phippen)
+
 ### 2.14.5 / 2014-02-01
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.14.4...v2.14.5)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.14.4...v2.14.5)
 
 Bug Fixes:
 
@@ -49,7 +66,7 @@ Bug Fixes:
   receives a block, too. (Myron Marston)
 
 ### 2.14.4 / 2013-10-15
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.14.3...v2.14.4)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.14.3...v2.14.4)
 
 Bug Fixes:
 
@@ -59,7 +76,7 @@ Bug Fixes:
   the usage of modifications (`and_return` etc) (Jon Rowe)
 
 ### 2.14.3 / 2013-08-08
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.14.2...v2.14.3)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.14.2...v2.14.3)
 
 Bug Fixes:
 
@@ -67,7 +84,7 @@ Bug Fixes:
   a prepended Module (Bradley Schaefer)
 
 ### 2.14.2 / 2013-07-30
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.14.1...v2.14.2)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.14.1...v2.14.2)
 
 Bug Fixes:
 
@@ -77,7 +94,7 @@ Bug Fixes:
   return a test double rather than stub a method (Myron Marston).
 
 ### 2.14.1 / 2013-07-07
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.14.0...v2.14.1)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.14.0...v2.14.1)
 
 Bug Fixes:
 
@@ -89,7 +106,7 @@ Bug Fixes:
   in 3.0. (Myron Marston)
 
 ### 2.14.0 / 2013-07-06
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.14.0.rc1...v2.14.0)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.14.0.rc1...v2.14.0)
 
 Enhancements:
 
@@ -113,7 +130,7 @@ Bug Fixes:
   similar preloading gems (Andy Lindeman).
 
 ### 2.14.0.rc1 / 2013-05-27
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.13.0...v2.14.0.rc1)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.13.0...v2.14.0.rc1)
 
 Enhancements:
 
@@ -162,7 +179,7 @@ Deprecations
 * Deprecate `at_least(0).times` and `any_number_of_times` (Michi Huber).
 
 ### 2.13.1 / 2013-04-06
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.13.0...v2.13.1)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.13.0...v2.13.1)
 
 Bug fixes
 
@@ -170,7 +187,7 @@ Bug fixes
   `and_yield`, `and_raise`, `and_return` or `and_throw` (Myron Marston).
 
 ### 2.13.0 / 2013-02-23
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.12.2...v2.13.0)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.12.2...v2.13.0)
 
 Bug fixes
 
@@ -200,7 +217,7 @@ Bug fixes
   (Myron Marston).
 
 ### 2.12.2 / 2013-01-27
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.12.1...v.2.12.2)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.12.1...v.2.12.2)
 
 Bug fixes
 
@@ -215,7 +232,7 @@ Bug fixes
   versions (Andy Lindeman).
 
 ### 2.12.1 / 2012-12-21
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.12.0...v2.12.1)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.12.0...v2.12.1)
 
 Bug fixes
 
@@ -227,7 +244,7 @@ Bug fixes
   work properly with constant strings that are prefixed with `::` (Myron Marston).
 
 ### 2.12.0 / 2012-11-12
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.11.3...v2.12.0)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.11.3...v2.12.0)
 
 Enhancements
 
@@ -243,7 +260,7 @@ Deprecations:
   (Neha Kumari)
 
 ### 2.11.3 / 2012-09-19
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.11.2...v2.11.3)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.11.2...v2.11.3)
 
 Bug fixes
 
@@ -257,7 +274,7 @@ Bug fixes
   extra time with the wrong arguments (Myron Marston).
 
 ### 2.11.2 / 2012-08-11
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.11.1...v2.11.2)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.11.1...v2.11.2)
 
 Bug fixes
 
@@ -269,7 +286,7 @@ Bug fixes
   Marston)
 
 ### 2.11.1 / 2012-07-09
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.11.0...v2.11.1)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.11.0...v2.11.1)
 
 Bug fixes
 
@@ -279,7 +296,7 @@ Bug fixes
   overriden with the null object implementation--`return self`). (Myron Marston)
 
 ### 2.11.0 / 2012-07-07
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.10.1...v2.11.0)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.10.1...v2.11.0)
 
 Enhancements
 
@@ -304,7 +321,7 @@ Bug fixes
   `Exception` by default, just like ruby does. (Andrew Marshall)
 
 ### 2.10.1 / 2012-05-05
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.10.0...v2.10.1)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.10.0...v2.10.1)
 
 Bug fixes
 
@@ -314,14 +331,14 @@ Bug fixes
     * fixed failure of `object.should_not_receive(:message).and_return value`
 
 ### 2.10.0 / 2012-05-03
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.9.0...v2.10.0)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.9.0...v2.10.0)
 
 Bug fixes
 
 * fail fast when an `exactly` or `at_most` expectation is exceeded
 
 ### 2.9.0 / 2012-03-17
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.8.0...v2.9.0)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.8.0...v2.9.0)
 
 Enhancements
 
@@ -336,19 +353,19 @@ Bug fixes
 
 ### 2.8.0 / 2012-01-04
 
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.8.0.rc2...v2.8.0)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.8.0.rc2...v2.8.0)
 
 No changes for this release. Just releasing with the other rspec gems.
 
 ### 2.8.0.rc2 / 2011-12-19
 
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.8.0.rc1...v2.8.0.rc2)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.8.0.rc1...v2.8.0.rc2)
 
 No changes for this release. Just releasing with the other rspec gems.
 
 ### 2.8.0.rc1 / 2011-11-06
 
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.7.0...v2.8.0.rc1)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.7.0...v2.8.0.rc1)
 
 Enhancements
 
@@ -356,7 +373,7 @@ Enhancements
 
 ### 2.7.0 / 2011-10-16
 
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.6.0...v2.7.0)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.6.0...v2.7.0)
 
 Enhancements
 
@@ -379,7 +396,7 @@ Bug fixes
 
 ### 2.6.0 / 2011-05-12
 
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.5.0...v2.6.0)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.5.0...v2.6.0)
 
 Enhancements
 
@@ -393,7 +410,7 @@ Bug fixes
 
 ### 2.5.0 / 2011-02-05
 
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.4.0...v2.5.0)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.4.0...v2.5.0)
 
 Bug fixes
 
@@ -404,14 +421,14 @@ Bug fixes
 
 ### 2.4.0 / 2011-01-02
 
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.3.0...v2.4.0)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.3.0...v2.4.0)
 
 No functional changes in this release, which was made to align with the
 rspec-core-2.4.0 release.
 
 ### 2.3.0 / 2010-12-12
 
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.2.0...v2.3.0)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.2.0...v2.3.0)
 
 Bug fixes
 
@@ -420,7 +437,7 @@ Bug fixes
 
 ### 2.2.0 / 2010-11-28
 
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.1.0...v2.2.0)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.1.0...v2.2.0)
 
 Enhancements
 
@@ -434,7 +451,7 @@ Bug fix
 
 ### 2.1.0 / 2010-11-07
 
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.0.1...v2.1.0)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.0.1...v2.1.0)
 
 Bug fixes
 
@@ -442,11 +459,11 @@ Bug fixes
 
 ### 2.0.0 / 2010-10-10
 
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.0.0.beta.22...v2.0.0)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.0.0.beta.22...v2.0.0)
 
 ### 2.0.0.rc / 2010-10-05
 
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.0.0.beta.22...v2.0.0.rc)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.0.0.beta.22...v2.0.0.rc)
 
 Enhancements
 
@@ -460,7 +477,7 @@ Bug fixes
 
 ### 2.0.0.beta.22 / 2010-09-12
 
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.0.0.beta.20...v2.0.0.beta.22)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.0.0.beta.20...v2.0.0.beta.22)
 
 Bug fixes
 

data/lib/rspec/mocks.rb

@@ -2,7 +2,6 @@ require 'rspec/mocks/framework'
 require 'rspec/mocks/version'
 
 module RSpec
-
   module Mocks
     class << self
       attr_accessor :space
@@ -108,6 +107,20 @@ module RSpec
     IGNORED_BACKTRACE_LINE = 'this backtrace line is ignored'
 
     self.space = RSpec::Mocks::Space.new
+
+    DEPRECATED_CONSTANTS =
+      {
+        :Mock            => Double,
+        :ConstantStubber => ConstantMutator,
+      }
+
+    def self.const_missing(name)
+      if const = DEPRECATED_CONSTANTS[name]
+        RSpec.deprecate("RSpec::Mocks::#{name}", :replacement => const.name)
+        const
+      else
+        super
+      end
+    end
   end
 end
-

data/lib/rspec/mocks/any_instance/recorder.rb

@@ -88,9 +88,6 @@ module RSpec
           if @expectation_set && !message_chains.all_expectations_fulfilled?
             raise RSpec::Mocks::MockExpectationError, "Exactly one instance should have received the following message(s) but didn't: #{message_chains.unfulfilled_expectations.sort.join(', ')}"
           end
-        ensure
-          stop_all_observation!
-          ::RSpec::Mocks.space.remove_any_instance_recorder_for(@klass)
         end
 
         # @private

data/lib/rspec/mocks/configuration.rb

@@ -6,6 +6,7 @@ module RSpec
       def initialize
         @yield_receiver_to_any_instance_implementation_blocks = false
         @should_warn_about_any_instance_blocks = true
+        @marshal_patched = false
       end
 
       def yield_receiver_to_any_instance_implementation_blocks?
@@ -62,6 +63,14 @@ module RSpec
         syntaxes << :expect if Syntax.expect_enabled?
         syntaxes
       end
+
+      def patch_marshal_to_support_partial_doubles=(val)
+        @marshal_patched = val
+      end
+
+      def marshal_patched?
+        @marshal_patched
+      end
     end
 
     def self.configuration

data/lib/rspec/mocks/extensions/marshal.rb

@@ -6,6 +6,21 @@ module Marshal
       if ::RSpec::Mocks.space.nil? || !::RSpec::Mocks.space.registered?(object) || NilClass === object
         dump_without_mocks(object, *rest)
       else
+        unless ::RSpec::Mocks.configuration.marshal_patched?
+          RSpec.warn_deprecation(<<-EOS.gsub(/^\s+\|/, ''))
+            |Using Marshal.dump on stubbed objects relies on a monkey-patch
+            |that is being made opt-in in RSpec 3. To silence this warning
+            |please explicitly enable it:
+            |
+            |RSpec.configure do |rspec|
+            |  rspec.mock_with :rspec do |mocks|
+            |    mocks.patch_marshal_to_support_partial_doubles = true
+            |  end
+            |end
+            |
+            |Called from #{RSpec::CallerFilter.first_non_rspec_line}."
+          EOS
+        end
         dump_without_mocks(object.dup, *rest)
       end
     end

data/lib/rspec/mocks/mock.rb

@@ -3,12 +3,5 @@ module RSpec
     class Double
       include TestDouble
     end
-
-    def self.const_missing(name)
-      return super unless name == :Mock
-      RSpec.deprecate("RSpec::Mocks::Mock", :replacement => "RSpec::Mocks::Double")
-      Double
-    end
   end
 end
-

data/lib/rspec/mocks/mutate_const.rb

@@ -399,11 +399,5 @@ module RSpec
         end
       end
     end
-
-    # Keeps backwards compatibility since we had released an rspec-mocks that
-    # only supported stubbing. Later, we released the hide_const feature and
-    # decided that the term "mutator" was a better term to wrap up the concept
-    # of both stubbing and hiding.
-    ConstantStubber = ConstantMutator
   end
 end

data/lib/rspec/mocks/space.rb

@@ -29,6 +29,11 @@ module RSpec
         end
 
         proxies.clear
+
+        any_instance_recorders.each_value do |recorder|
+          recorder.stop_all_observation!
+        end
+
         any_instance_recorders.clear
         expectation_ordering.clear
       end
@@ -45,10 +50,6 @@ module RSpec
         end
       end
 
-      def remove_any_instance_recorder_for(klass)
-        any_instance_recorders.delete(klass.__id__)
-      end
-
       def proxies_of(klass)
         proxies.values.select { |proxy| klass === proxy.object }
       end

data/lib/rspec/mocks/test_double.rb

@@ -13,6 +13,7 @@ module RSpec
       #   RSpec::Mocks::TestDouble.extend_onto(module, "MyMixin", :foo => "bar")
       #   module.foo  #=> "bar"
       def self.extend_onto(object, name=nil, stubs_and_options={})
+        RSpec.deprecate("`RSpec::Mocks::TestDouble.extend_onto(...)`")
         object.extend self
         object.send(:__initialize_as_test_double, name, stubs_and_options)
       end

data/lib/rspec/mocks/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Mocks
     module Version
-      STRING = '2.99.0.beta2'
+      STRING = '2.99.0.rc1'
     end
   end
 end

data/spec/rspec/mocks/any_instance_spec.rb

@@ -48,12 +48,12 @@ module RSpec
           end
 
           it "raises an error if 'with' follows 'and_return'" do
-            pending "see Github issue #42"
+            skip "see Github issue #42"
             expect { klass.any_instance.should_receive(:foo).and_return(1).with("1") }.to raise_error(NoMethodError)
           end
 
           it "raises an error if 'with' follows 'and_raise'" do
-            pending "see Github issue #42"
+            skip "see Github issue #42"
             expect { klass.any_instance.should_receive(:foo).and_raise(1).with("1") }.to raise_error(NoMethodError)
           end
         end
@@ -377,6 +377,7 @@ module RSpec
             klass.any_instance.should_not_receive(:bar)
             klass.new.foo
             RSpec::Mocks.space.verify_all
+            RSpec::Mocks.space.reset_all
           end
         end
 
@@ -399,24 +400,36 @@ module RSpec
 
           it "fails if an instance is created but no invocation occurs" do
             expect do
-              klass.any_instance.should_receive(:foo)
-              klass.new
-              RSpec::Mocks.space.verify_all
+              begin
+                klass.any_instance.should_receive(:foo)
+                klass.new
+                RSpec::Mocks.space.verify_all
+              ensure
+                RSpec::Mocks.space.reset_all
+              end
             end.to raise_error(RSpec::Mocks::MockExpectationError, foo_expectation_error_message)
           end
 
           it "fails if no instance is created" do
             expect do
-              klass.any_instance.should_receive(:foo).and_return(1)
-              RSpec::Mocks.space.verify_all
+              begin
+                klass.any_instance.should_receive(:foo).and_return(1)
+                RSpec::Mocks.space.verify_all
+              ensure
+                RSpec::Mocks.space.reset_all
+              end
             end.to raise_error(RSpec::Mocks::MockExpectationError, foo_expectation_error_message)
           end
 
           it "fails if no instance is created and there are multiple expectations" do
             expect do
-              klass.any_instance.should_receive(:foo)
-              klass.any_instance.should_receive(:bar)
-              RSpec::Mocks.space.verify_all
+              begin
+                klass.any_instance.should_receive(:foo)
+                klass.any_instance.should_receive(:bar)
+                RSpec::Mocks.space.verify_all
+              ensure
+                RSpec::Mocks.space.reset_all
+              end
             end.to raise_error(RSpec::Mocks::MockExpectationError, 'Exactly one instance should have received the following message(s) but didn\'t: bar, foo')
           end
 
@@ -478,24 +491,36 @@ module RSpec
 
           it "fails if an instance is created but no invocation occurs" do
             expect do
-              klass.any_instance.should_receive(:existing_method)
-              klass.new
-              RSpec::Mocks.space.verify_all
+              begin
+                klass.any_instance.should_receive(:existing_method)
+                klass.new
+                RSpec::Mocks.space.verify_all
+              ensure
+                RSpec::Mocks.space.reset_all
+              end
             end.to raise_error(RSpec::Mocks::MockExpectationError, existing_method_expectation_error_message)
           end
 
           it "fails if no instance is created" do
             expect do
-              klass.any_instance.should_receive(:existing_method)
-              RSpec::Mocks.space.verify_all
+              begin
+                klass.any_instance.should_receive(:existing_method)
+                RSpec::Mocks.space.verify_all
+              ensure
+                RSpec::Mocks.space.reset_all
+              end
             end.to raise_error(RSpec::Mocks::MockExpectationError, existing_method_expectation_error_message)
           end
 
           it "fails if no instance is created and there are multiple expectations" do
             expect do
-              klass.any_instance.should_receive(:existing_method)
-              klass.any_instance.should_receive(:another_existing_method)
-              RSpec::Mocks.space.verify_all
+              begin
+                klass.any_instance.should_receive(:existing_method)
+                klass.any_instance.should_receive(:another_existing_method)
+                RSpec::Mocks.space.verify_all
+              ensure
+                RSpec::Mocks.space.reset_all
+              end
             end.to raise_error(RSpec::Mocks::MockExpectationError, 'Exactly one instance should have received the following message(s) but didn\'t: another_existing_method, existing_method')
           end
 
@@ -588,16 +613,24 @@ module RSpec
 
             it "fails when no instances are declared" do
               expect do
-                klass.any_instance.should_receive(:foo).once
-                RSpec::Mocks.space.verify_all
+                begin
+                  klass.any_instance.should_receive(:foo).once
+                  RSpec::Mocks.space.verify_all
+                ensure
+                  RSpec::Mocks.space.reset_all
+                end
               end.to raise_error(RSpec::Mocks::MockExpectationError, foo_expectation_error_message)
             end
 
             it "fails when an instance is declared but there are no invocations" do
               expect do
-                klass.any_instance.should_receive(:foo).once
-                klass.new
-                RSpec::Mocks.space.verify_all
+                begin
+                  klass.any_instance.should_receive(:foo).once
+                  klass.new
+                  RSpec::Mocks.space.verify_all
+                ensure
+                  RSpec::Mocks.space.reset_all
+                end
               end.to raise_error(RSpec::Mocks::MockExpectationError, foo_expectation_error_message)
             end
 
@@ -722,9 +755,13 @@ module RSpec
 
               it "fails when the other expecations are not met" do
                 expect do
-                  klass.any_instance.should_receive(:foo).never
-                  klass.any_instance.should_receive(:existing_method).and_return(5)
-                  RSpec::Mocks.space.verify_all
+                  begin
+                    klass.any_instance.should_receive(:foo).never
+                    klass.any_instance.should_receive(:existing_method).and_return(5)
+                    RSpec::Mocks.space.verify_all
+                  ensure
+                    RSpec::Mocks.space.reset_all
+                  end
                 end.to raise_error(RSpec::Mocks::MockExpectationError, existing_method_expectation_error_message)
               end
             end
@@ -760,9 +797,13 @@ module RSpec
 
               it "fails when the other expecations are not met" do
                 expect do
-                  klass.any_instance.should_receive(:foo).any_number_of_times
-                  klass.any_instance.should_receive(:existing_method).and_return(5)
-                  RSpec::Mocks.space.verify_all
+                  begin
+                    klass.any_instance.should_receive(:foo).any_number_of_times
+                    klass.any_instance.should_receive(:existing_method).and_return(5)
+                    RSpec::Mocks.space.verify_all
+                  ensure
+                    RSpec::Mocks.space.reset_all
+                  end
                 end.to raise_error(RSpec::Mocks::MockExpectationError, existing_method_expectation_error_message)
               end
             end
@@ -787,6 +828,7 @@ module RSpec
 
               it "restores the class to its original state after each example when no instance is created" do
                 space.verify_all
+                space.reset_all
 
                 expect(klass.method_defined?(:__existing_method_without_any_instance__)).to be false
                 expect(klass.new.existing_method).to eq(existing_method_return_value)
@@ -796,6 +838,7 @@ module RSpec
                 klass.new.existing_method
 
                 space.verify_all
+                space.reset_all
 
                 expect(klass.method_defined?(:__existing_method_without_any_instance__)).to be false
                 expect(klass.new.existing_method).to eq(existing_method_return_value)
@@ -806,6 +849,7 @@ module RSpec
                 klass.new.existing_method
 
                 space.verify_all
+                space.reset_all
 
                 expect(klass.method_defined?(:__existing_method_without_any_instance__)).to be false
                 expect(klass.new.existing_method).to eq(existing_method_return_value)
@@ -816,6 +860,7 @@ module RSpec
               before :each do
                 klass.any_instance.stub(:private_method).and_return(:something)
                 space.verify_all
+                space.reset_all
               end
 
               it "cleans up the backed up method" do
@@ -838,6 +883,7 @@ module RSpec
                 klass.any_instance.should_receive(:private_method).and_return(:something)
                 klass.new.private_method
                 space.verify_all
+                space.reset_all
               end
 
               it "cleans up the backed up method" do
@@ -885,6 +931,7 @@ module RSpec
               klass.any_instance.should_receive(:existing_method).and_return(Object.new)
               klass.new.existing_method
               space.verify_all
+              space.reset_all
 
               expect(klass.new.existing_method).to eq(existing_method_return_value)
             end
@@ -897,6 +944,7 @@ module RSpec
             klass.any_instance.stub(:existing_method).and_return(true)
 
             RSpec::Mocks.space.verify_all
+            RSpec::Mocks.space.reset_all
             expect(klass.new).to respond_to(:existing_method)
             expect(klass.new.existing_method).to eq(existing_method_return_value)
           end
@@ -1178,6 +1226,7 @@ module RSpec
           expect(instance.existing_method).to eq :stubbed_return_value
 
           RSpec::Mocks.verify
+          RSpec::Mocks.teardown
 
           expect(instance.existing_method).to eq :existing_method_return_value
         end

data/spec/rspec/mocks/extensions/marshal_spec.rb

@@ -31,13 +31,21 @@ describe Marshal, 'extensions' do
     end
 
     context 'when rspec-mocks has been fully initialized' do
+      include_context 'with isolated configuration'
+
       it 'duplicates objects with stubbed or mocked implementations before serialization' do
+        RSpec::Mocks.configuration.patch_marshal_to_support_partial_doubles = true
         obj = double(:foo => "bar")
 
         serialized = Marshal.dump(obj)
         expect(Marshal.load(serialized)).to be_an(obj.class)
       end
 
+      it 'provides a deprecation warning' do
+        expect_warn_deprecation_with_call_site('marshal_spec.rb', __LINE__ + 1)
+        Marshal.dump double(:foo => "bar")
+      end
+
       it 'does not duplicate other objects before serialization' do
         obj = UndupableObject.new
 

data/spec/rspec/mocks/matchers/receive_spec.rb

@@ -9,6 +9,10 @@ module RSpec
         ::RSpec::Mocks.space.verify_all
       end
 
+      def reset_all
+        ::RSpec::Mocks.space.reset_all
+      end
+
       shared_examples_for "a receive matcher" do |*options|
         it 'allows the caller to configure how the subject responds' do
           wrapped.to receive(:foo).and_return(5)
@@ -105,6 +109,8 @@ module RSpec
           expect {
             verify_all
           }.to raise_error(RSpec::Mocks::MockExpectationError)
+
+          reset_all
         end
 
         it "reports the line number of expectation of unreceived message", :pending => options.include?(:does_not_report_line_num) do

data/spec/rspec/mocks/mock_space_spec.rb

@@ -98,16 +98,6 @@ module RSpec
         expect(r1).to be(r2)
         expect(r1).not_to be(r3)
       end
-
-      it 'removes an any_instance_recorder when requested' do
-        klass = Class.new
-
-        space.any_instance_recorder_for(klass)
-
-        expect {
-          space.remove_any_instance_recorder_for(klass)
-        }.to change { space.any_instance_recorders.size }.by(-1)
-      end
     end
   end
 end

data/spec/rspec/mocks/mutate_const_spec.rb

@@ -32,6 +32,11 @@ module RSpec
         ::RSpec::Mocks.space.reset_all
       end
 
+      specify "the use of ConstantStubber is deprecated" do
+        expect_deprecation_with_call_site(__FILE__, __LINE__ + 1)
+        expect(RSpec::Mocks::ConstantStubber).to eq RSpec::Mocks::ConstantMutator
+      end
+
       shared_context "constant example methods" do |const_name|
         define_method :const do
           recursive_const_get(const_name)

data/spec/rspec/mocks/serialization_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 module RSpec
   module Mocks
     describe "Serialization of mocked objects" do
+      include_context 'with isolated configuration'
 
       class SerializableObject < Struct.new(:foo, :bar); end
 
@@ -82,6 +83,7 @@ module RSpec
       end
 
       it 'marshals the same with and without stubbing' do
+        RSpec::Mocks.configuration.patch_marshal_to_support_partial_doubles = true
         expect { set_stub }.to_not change { Marshal.dump(serializable_object) }
       end
     end

data/spec/rspec/mocks/test_double_spec.rb

@@ -3,6 +3,8 @@ require 'spec_helper'
 module RSpec
   module Mocks
     describe TestDouble do
+      before { allow_deprecation }
+
       before(:all) do
         Module.class_eval do
           private
@@ -31,6 +33,11 @@ module RSpec
         expect { double.foo }.to raise_error(/Mock "MyDouble" received/)
       end
 
+      it 'warns when `extend_onto` is used' do
+        expect_deprecation_with_call_site(__FILE__, __LINE__ + 1, /RSpec::Mocks::TestDouble.extend_onto/)
+        Module.new { TestDouble.extend_onto(self) }
+      end
+
       [[:should, :expect], [:expect], [:should]].each do |syntax|
         context "with syntax #{syntax.inspect}" do
           include_context "with syntax", syntax

data/spec/spec_helper.rb

@@ -37,7 +37,7 @@ module HelperMethods
   end
 
   def allow_deprecation
-    allow(RSpec.configuration.reporter).to receive(:deprecation)
+    RSpec::Mocks.allow_message(RSpec.configuration.reporter, :deprecation)
   end
 
   def allow_unavoidable_1_8_deprecation

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-mocks
 version: !ruby/object:Gem::Version
-  version: 2.99.0.beta2
-  prerelease: 7
+  version: 2.99.0.rc1
 platform: ruby
 authors:
 - Steven Baker
@@ -10,54 +9,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.0.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.9
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
 description: RSpec's 'test double' framework, with support for stubbing and mocking
@@ -66,48 +59,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/rspec/mocks.rb
-- lib/rspec/mocks/any_instance/chain.rb
-- lib/rspec/mocks/any_instance/expectation_chain.rb
-- lib/rspec/mocks/any_instance/message_chains.rb
-- lib/rspec/mocks/any_instance/recorder.rb
-- lib/rspec/mocks/any_instance/stub_chain.rb
-- lib/rspec/mocks/any_instance/stub_chain_chain.rb
-- lib/rspec/mocks/argument_list_matcher.rb
-- lib/rspec/mocks/argument_matchers.rb
-- lib/rspec/mocks/caller_filter.rb
-- lib/rspec/mocks/configuration.rb
-- lib/rspec/mocks/deprecation.rb
-- lib/rspec/mocks/error_generator.rb
-- lib/rspec/mocks/errors.rb
-- lib/rspec/mocks/example_methods.rb
-- lib/rspec/mocks/extensions/instance_exec.rb
-- lib/rspec/mocks/extensions/marshal.rb
-- lib/rspec/mocks/extensions/proc.rb
-- lib/rspec/mocks/framework.rb
-- lib/rspec/mocks/instance_method_stasher.rb
-- lib/rspec/mocks/matchers/have_received.rb
-- lib/rspec/mocks/matchers/receive.rb
-- lib/rspec/mocks/message_expectation.rb
-- lib/rspec/mocks/method_double.rb
-- lib/rspec/mocks/mock.rb
-- lib/rspec/mocks/mutate_const.rb
-- lib/rspec/mocks/order_group.rb
-- lib/rspec/mocks/proxy.rb
-- lib/rspec/mocks/proxy_for_nil.rb
-- lib/rspec/mocks/space.rb
-- lib/rspec/mocks/standalone.rb
-- lib/rspec/mocks/stub_chain.rb
-- lib/rspec/mocks/syntax.rb
-- lib/rspec/mocks/targets.rb
-- lib/rspec/mocks/test_double.rb
-- lib/rspec/mocks/version.rb
-- lib/spec/mocks.rb
-- README.md
-- License.txt
+- ".document"
+- ".yardopts"
 - Changelog.md
-- .yardopts
-- .document
+- License.txt
+- README.md
 - features/README.md
 - features/Scope.md
 - features/Upgrade.md
@@ -146,6 +102,43 @@ files:
 - features/support/env.rb
 - features/support/rubinius.rb
 - features/test_frameworks/test_unit.feature
+- lib/rspec/mocks.rb
+- lib/rspec/mocks/any_instance/chain.rb
+- lib/rspec/mocks/any_instance/expectation_chain.rb
+- lib/rspec/mocks/any_instance/message_chains.rb
+- lib/rspec/mocks/any_instance/recorder.rb
+- lib/rspec/mocks/any_instance/stub_chain.rb
+- lib/rspec/mocks/any_instance/stub_chain_chain.rb
+- lib/rspec/mocks/argument_list_matcher.rb
+- lib/rspec/mocks/argument_matchers.rb
+- lib/rspec/mocks/caller_filter.rb
+- lib/rspec/mocks/configuration.rb
+- lib/rspec/mocks/deprecation.rb
+- lib/rspec/mocks/error_generator.rb
+- lib/rspec/mocks/errors.rb
+- lib/rspec/mocks/example_methods.rb
+- lib/rspec/mocks/extensions/instance_exec.rb
+- lib/rspec/mocks/extensions/marshal.rb
+- lib/rspec/mocks/extensions/proc.rb
+- lib/rspec/mocks/framework.rb
+- lib/rspec/mocks/instance_method_stasher.rb
+- lib/rspec/mocks/matchers/have_received.rb
+- lib/rspec/mocks/matchers/receive.rb
+- lib/rspec/mocks/message_expectation.rb
+- lib/rspec/mocks/method_double.rb
+- lib/rspec/mocks/mock.rb
+- lib/rspec/mocks/mutate_const.rb
+- lib/rspec/mocks/order_group.rb
+- lib/rspec/mocks/proxy.rb
+- lib/rspec/mocks/proxy_for_nil.rb
+- lib/rspec/mocks/space.rb
+- lib/rspec/mocks/standalone.rb
+- lib/rspec/mocks/stub_chain.rb
+- lib/rspec/mocks/syntax.rb
+- lib/rspec/mocks/targets.rb
+- lib/rspec/mocks/test_double.rb
+- lib/rspec/mocks/version.rb
+- lib/spec/mocks.rb
 - spec/rspec/mocks/and_call_original_spec.rb
 - spec/rspec/mocks/and_return_spec.rb
 - spec/rspec/mocks/and_yield_spec.rb
@@ -207,32 +200,28 @@ files:
 homepage: http://github.com/rspec/rspec-mocks
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1858263502933685358
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: rspec
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: rspec-mocks-2.99.0.beta2
+specification_version: 4
+summary: rspec-mocks-2.99.0.rc1
 test_files:
 - features/README.md
 - features/Scope.md