rspec-mocks 2.11.0 → 2.11.1

data/Changelog.md

@@ -1,3 +1,13 @@
+### 2.11.1 / 2012-07-09
+[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.11.0...v2.11.1)
+
+Bug fixes
+
+* Fix `should_receive` so that when it is called on an `as_null_object`
+  double with no implementation, and there is a previous explicit stub
+  for the same method, the explicit stub remains (rather than being
+  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)
 

data/lib/rspec/mocks/method_double.rb

@@ -158,6 +158,12 @@ module RSpec
         stub
       end
 
+      # @private
+      def add_default_stub(*args, &implementation)
+        return if stubs.any?
+        add_stub(*args, &implementation)
+      end
+
       # @private
       def remove_stub
         raise_method_not_stubbed_error if stubs.empty?

data/lib/rspec/mocks/proxy.rb

@@ -65,8 +65,15 @@ module RSpec
 
       # @private
       def add_message_expectation(location, method_name, opts={}, &block)        
-        block ||= Proc.new { @object } if null_object?
-        method_double[method_name].add_expectation @error_generator, @expectation_ordering, location, opts, &block
+        meth_double = method_double[method_name]
+
+        if null_object? && !block
+          meth_double.add_default_stub(@error_generator, @expectation_ordering, location, opts) do
+            @object
+          end
+        end
+
+        meth_double.add_expectation @error_generator, @expectation_ordering, location, opts, &block
       end
 
       # @private

data/lib/rspec/mocks/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Mocks
     module Version
-      STRING = '2.11.0'
+      STRING = '2.11.1'
     end
   end
 end

data/spec/rspec/mocks/null_object_mock_spec.rb

@@ -50,6 +50,12 @@ module RSpec
         @double.foo.bar.should be(@double)
       end
 
+      it 'returns an explicitly stubbed value from an expectation with no implementation' do
+        @double.stub(:foo => "bar")
+        @double.should_receive(:foo)
+        @double.foo.should eq("bar")
+      end
+
       it "fails verification when explicit exception not met" do
         lambda do
           @double.should_receive(:something)

metadata

@@ -1,71 +1,80 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rspec-mocks
-version: !ruby/object:Gem::Version
-  version: 2.11.0
+version: !ruby/object:Gem::Version 
+  hash: 33
   prerelease: 
+  segments: 
+  - 2
+  - 11
+  - 1
+  version: 2.11.1
 platform: ruby
-authors:
+authors: 
 - Steven Baker
 - David Chelimsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-07 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-07-10 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
         version: 0.9.2
-- !ruby/object:Gem::Dependency
+  requirement: *id001
+- !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
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 1
+        - 9
         version: 1.1.9
-- !ruby/object:Gem::Dependency
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
   name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.11
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 4
+        - 11
         version: 0.4.11
+  requirement: *id003
 description: RSpec's 'test double' framework, with support for stubbing and mocking
 email: rspec-users@rubyforge.org
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/rspec/mocks.rb
 - lib/rspec/mocks/any_instance.rb
 - lib/rspec/mocks/any_instance/chain.rb
@@ -175,38 +184,39 @@ files:
 - spec/rspec/mocks_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/rspec/rspec-mocks
-licenses:
+licenses: 
 - MIT
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --charset=UTF-8
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 1632544807063438503
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 1632544807063438503
+      version: "0"
 requirements: []
+
 rubyforge_project: rspec
-rubygems_version: 1.8.24
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: rspec-mocks-2.11.0
-test_files:
+summary: rspec-mocks-2.11.1
+test_files: 
 - features/README.md
 - features/Scope.md
 - features/Upgrade.md