rspec-mocks 2.14.1 → 2.14.2

data/Changelog.md

@@ -1,5 +1,12 @@
-### 2.14.2 Development
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.14.1...2-14-maintenance)
+### 2.14.2 / 2013-07-30
+[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.14.1...v2.14.2)
+
+Bug Fixes:
+
+* Fix `as_null_object` doubles so that they return `nil` from `to_ary`
+  (Jon Rowe).
+* Fix regression in 2.14 that made `stub!` (with an implicit receiver)
+  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)

data/features/method_stubs/to_ary.feature

@@ -17,10 +17,6 @@ Feature: double handling to_ary
       """ruby
       describe "#to_ary" do
         shared_examples "to_ary" do
-          it "raises a NoMethodError" do
-            expect { obj.to_ary }.to raise_error(NoMethodError)
-          end
-
           it "can be overridden with a stub" do
             obj.stub(:to_ary) { :non_nil_value }
             obj.to_ary.should be(:non_nil_value)
@@ -35,11 +31,19 @@ Feature: double handling to_ary
         context "sent to a double as_null_object" do
           let(:obj) { double('obj').as_null_object }
           include_examples "to_ary"
+
+          it "returns nil" do
+            expect( obj.to_ary ).to eq nil
+          end
         end
 
         context "sent to a double without as_null_object" do
           let(:obj) { double('obj') }
           include_examples "to_ary"
+
+          it "raises a NoMethodError" do
+            expect { obj.to_ary }.to raise_error(NoMethodError)
+          end
         end
       end
      """

data/lib/rspec/mocks/syntax.rb

@@ -4,6 +4,21 @@ module RSpec
     # Provides methods for enabling and disabling the available syntaxes
     # provided by rspec-mocks.
     module Syntax
+      # @api private
+      #
+      # Common stubbing logic for both `stub` and `stub!`. This used to
+      # live in `stub`, and `stub!` delegated to `stub`, but we discovered
+      # that `stub!` was delegating to `RSpec::Mocks::ExampleMethods#stub`
+      # (which declares a test double) when called with an implicit receiver,
+      # which was a regression in 2.14.0.
+      def self.stub_object(object, message_or_hash, opts = {}, &block)
+        if ::Hash === message_or_hash
+          message_or_hash.each {|message, value| stub_object(object, message).and_return value }
+        else
+          opts[:expected_from] = caller(1)[1]
+          ::RSpec::Mocks.allow_message(object, message_or_hash, opts, &block)
+        end
+      end
 
       # @api private
       # Enables the should syntax (`dbl.stub`, `dbl.should_receive`, etc).
@@ -22,12 +37,7 @@ module RSpec
           end
 
           def stub(message_or_hash, opts={}, &block)
-            if ::Hash === message_or_hash
-              message_or_hash.each {|message, value| stub(message).and_return value }
-            else
-              opts[:expected_from] = caller(1)[0]
-              ::RSpec::Mocks.allow_message(self, message_or_hash, opts, &block)
-            end
+            ::RSpec::Mocks::Syntax.stub_object(self, message_or_hash, opts, &block)
           end
 
           def unstub(message)
@@ -36,7 +46,7 @@ module RSpec
 
           def stub!(message_or_hash, opts={}, &block)
             ::RSpec.deprecate "stub!", :replacement => "stub"
-            stub(message_or_hash, opts={}, &block)
+            ::RSpec::Mocks::Syntax.stub_object(self, message_or_hash, opts, &block)
           end
 
           def unstub!(message)

data/lib/rspec/mocks/test_double.rb

@@ -58,7 +58,7 @@ module RSpec
 
       # @private
       def respond_to?(message, incl_private=false)
-        __mock_proxy.null_object? && message != :to_ary ? true : super
+        __mock_proxy.null_object? ? true : super
       end
 
       # @private
@@ -84,13 +84,19 @@ module RSpec
       end
 
       def method_missing(message, *args, &block)
-        raise NoMethodError if message == :to_ary || message == :to_a
-        return 0 if message == :to_int && __mock_proxy.null_object?
+        if __mock_proxy.null_object?
+          case message
+          when :to_int        then return 0
+          when :to_a, :to_ary then return nil
+          end
+        end
         __mock_proxy.record_message_received(message, *args, &block)
 
         begin
           __mock_proxy.null_object? ? self : super
         rescue NameError
+          # Required wrapping doubles in an Array on Ruby 1.9.2
+          raise NoMethodError if [:to_a, :to_ary].include? message
           __mock_proxy.raise_unexpected_message_error(message, *args)
         end
       end

data/lib/rspec/mocks/version.rb

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

data/spec/rspec/mocks/mock_spec.rb

@@ -227,6 +227,27 @@ module RSpec
         expect( Array(@double) ).to eq([@double])
       end
 
+      it "is wrappable in an array when a null object" do
+        expect( Array(@double.as_null_object) ).to eq [@double]
+      end
+
+      it "responds to to_ary as a null object" do
+        expect(@double.as_null_object.to_ary).to eq nil
+      end
+
+      it "responds to to_a as a null object" do
+        if RUBY_VERSION.to_f > 1.8
+          expect(@double.as_null_object.to_a).to eq nil
+        else
+          expect(@double.as_null_object.to_a).to eq [@double]
+        end
+      end
+
+      it "passes proc to expectation block without an argument" do
+        @double.should_receive(:foo) { |&block| expect(block.call).to eq(:bar) }
+        @double.foo { :bar }
+      end
+
       context "with Ruby > 1.8.6", :unless => RUBY_VERSION.to_s == '1.8.6' do
         it "passes proc to expectation block without an argument" do
           # We eval this because Ruby 1.8.6's syntax parser barfs on { |&block| ... }

data/spec/rspec/mocks/stub_spec.rb

@@ -38,12 +38,25 @@ module RSpec
       end
 
       describe "using stub!" do
-        it "warns of deprecation but still returns the declared value when message is received" do
+        before do
+          allow(RSpec).to receive(:deprecate)
+        end
+
+        it "warns of deprecation" do
           expect(RSpec).to receive(:deprecate).with("stub!", :replacement => "stub")
           @instance.stub!(:msg).and_return(:return_value)
+        end
+
+        it "returns the declared value when the message is received" do
+          @instance.stub!(:msg).and_return(:return_value)
           expect(@instance.msg).to equal(:return_value)
           verify @instance
         end
+
+        it "can be used to stub the example context itself (since `stub` returns a test dobule instead)" do
+          stub!(:foo).and_return(5)
+          expect(foo).to eq(5)
+        end
       end
 
       describe 'using unstub' do

data/spec/rspec/mocks/to_ary_spec.rb

@@ -2,16 +2,6 @@ require "spec_helper"
 
 describe "a double receiving to_ary" do
   shared_examples "to_ary" do
-    it "returns nil" do
-      expect do
-        expect(obj.to_ary).to be_nil
-      end.to raise_error(NoMethodError)
-    end
-
-    it "doesn't respond" do
-      expect(obj).not_to respond_to(:to_ary)
-    end
-
     it "can be overridden with a stub" do
       obj.stub(:to_ary) { :non_nil_value }
       expect(obj.to_ary).to be(:non_nil_value)
@@ -31,10 +21,34 @@ describe "a double receiving to_ary" do
   context "double as_null_object" do
     let(:obj) { double('obj').as_null_object }
     include_examples "to_ary"
+
+    it "does respond to to_ary" do
+      expect(obj).to respond_to(:to_ary)
+    end
+
+    it "does respond to to_a" do
+      expect(obj).to respond_to(:to_a)
+    end
+
+    it "returns nil" do
+      expect(obj.to_ary).to eq nil
+    end
   end
 
   context "double without as_null_object" do
     let(:obj) { double('obj') }
     include_examples "to_ary"
+
+    it "doesn't respond to to_ary" do
+      expect(obj).not_to respond_to(:to_ary)
+    end
+
+    it "doesn't respond to to_a", :if => ( RUBY_VERSION.to_f > 1.8 ) do
+      expect(obj).not_to respond_to(:to_a)
+    end
+
+    it "raises " do
+      expect { obj.to_ary }.to raise_error(NoMethodError)
+    end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: rspec-mocks
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 2.14.1
+  version: 2.14.2
 platform: ruby
 authors:
 - Steven Baker
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2013-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -214,7 +214,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 947550533951590931
+      hash: 3181053517643959284
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
@@ -223,14 +223,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 947550533951590931
+      hash: 3181053517643959284
   none: false
 requirements: []
 rubyforge_project: rspec
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: rspec-mocks-2.14.1
+summary: rspec-mocks-2.14.2
 test_files:
 - features/README.md
 - features/Scope.md