rspec-mocks 2.14.0 → 2.14.1

data/Changelog.md

@@ -1,3 +1,18 @@
+### 2.14.2 Development
+[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.14.1...2-14-maintenance)
+
+### 2.14.1 / 2013-07-07
+[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.14.0...v2.14.1)
+
+Bug Fixes:
+
+* Restore `double.as_null_object` behavior from 2.13 and earlier: a
+  double's nullness persisted between examples in earlier examples.
+  While this is not an intended use case (test doubles are meant to live
+  for only one example), we don't want to break behavior users rely
+  on in a minor relase.  This will be deprecated in 2.99 and removed
+  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)
 
@@ -72,6 +87,14 @@ Deprecations
   (Jon Rowe).
 * 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)
+
+Bug fixes
+
+* Allow a block implementation to be used in combination with
+  `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)
 

data/features/support/rubinius.rb

@@ -0,0 +1,6 @@
+# Required until https://github.com/rubinius/rubinius/issues/2430 is resolved
+ENV['RBXOPT'] = "#{ENV["RBXOPT"]} -Xcompiler.no_rbc"
+
+Around "@unsupported-on-rbx" do |scenario, block|
+  block.call unless defined?(Rubinius)
+end

data/lib/rspec/mocks/test_double.rb

@@ -27,12 +27,13 @@ module RSpec
       # are declared, they'll work as expected. If not, the receiver is
       # returned.
       def as_null_object
+        @__null_object = true
         __mock_proxy.as_null_object
       end
 
       # Returns true if this object has received `as_null_object`
       def null_object?
-        __mock_proxy.null_object?
+        @__null_object
       end
 
       # This allows for comparing the mock to other objects that proxy such as
@@ -62,12 +63,16 @@ module RSpec
 
       # @private
       def __build_mock_proxy
-        Proxy.new(self, @name, @options || {})
+        proxy = Proxy.new(self, @name, @options || {})
+        proxy.as_null_object if null_object?
+        proxy
       end
 
     private
 
       def __initialize_as_test_double(name=nil, stubs_and_options={})
+        @__null_object = false
+
         if name.is_a?(Hash) && stubs_and_options.empty?
           stubs_and_options = name
           @name = nil

data/lib/rspec/mocks/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Mocks
     module Version
-      STRING = '2.14.0'
+      STRING = '2.14.1'
     end
   end
 end

data/spec/rspec/mocks/null_object_mock_spec.rb

@@ -88,6 +88,13 @@ module RSpec
         # returns an int value from #to_int.
         expect(("%i" % @double)).to eq("0")
       end
+
+      it "preserves its nullness to subsequent examples to " +
+         "maintain compatibility with <= 2.13" do
+        RSpec::Mocks.teardown
+        expect(@double).to be_null_object
+        expect { @double.some.long.message.chain }.not_to raise_error
+      end
     end
 
     describe "#as_null_object" do

metadata

@@ -2,7 +2,7 @@
 name: rspec-mocks
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 2.14.0
+  version: 2.14.1
 platform: ruby
 authors:
 - Steven Baker
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-06 00:00:00.000000000 Z
+date: 2013-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -142,6 +142,7 @@ files:
 - features/spies/spy_unstubbed_method.feature
 - features/step_definitions/additional_cli_steps.rb
 - features/support/env.rb
+- features/support/rubinius.rb
 - features/test_frameworks/test_unit.feature
 - spec/rspec/mocks/and_call_original_spec.rb
 - spec/rspec/mocks/and_yield_spec.rb
@@ -213,7 +214,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3612137047295133706
+      hash: 947550533951590931
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
@@ -222,14 +223,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3612137047295133706
+      hash: 947550533951590931
   none: false
 requirements: []
 rubyforge_project: rspec
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: rspec-mocks-2.14.0
+summary: rspec-mocks-2.14.1
 test_files:
 - features/README.md
 - features/Scope.md
@@ -267,6 +268,7 @@ test_files:
 - features/spies/spy_unstubbed_method.feature
 - features/step_definitions/additional_cli_steps.rb
 - features/support/env.rb
+- features/support/rubinius.rb
 - features/test_frameworks/test_unit.feature
 - spec/rspec/mocks/and_call_original_spec.rb
 - spec/rspec/mocks/and_yield_spec.rb