rspec-mocks 2.0.0.beta.22 → 2.0.0.rc

data/{History.md → History.markdown}

@@ -1,5 +1,17 @@
 ## rspec-mocks release history (incomplete)
 
+### 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)
+
+* Enhancements
+  * support passing a block to an expecttation block (Nicolas Braem)
+    * obj.should_receive(:msg) {|&block| ... }
+
+* Bug fixes
+  * Fix YAML serialization of stub (Myron Marston)
+  * Fix rdoc rake task (Hans de Graaff)
+
 ### 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)

data/Rakefile

@@ -4,6 +4,7 @@ Bundler::GemHelper.install_tasks
 
 require 'rake'
 require 'rspec/core/rake_task'
+require 'rspec/mocks/version'
 require 'cucumber/rake/task'
 
 RSpec::Core::RakeTask.new(:spec)

data/lib/rspec/mocks.rb

@@ -26,7 +26,7 @@ module RSpec
   # message some time before the example ends. If the message is received, the
   # expectation is satisfied. If not, the example fails.
   #
-  #   registrar = double("registrar")
+  #   validator = double("validator")
   #   validator.should_receive(:validate).with("02134")
   #   zipcode = Zipcode.new("02134", validator)
   #   zipcode.valid?

data/lib/rspec/mocks/framework.rb

@@ -14,3 +14,4 @@ require 'rspec/mocks/order_group'
 require 'rspec/mocks/errors'
 require 'rspec/mocks/error_generator'
 require 'rspec/mocks/space'
+require 'rspec/mocks/serialization'

data/lib/rspec/mocks/message_expectation.rb

@@ -115,7 +115,7 @@ module RSpec
           Kernel::throw @symbol_to_throw unless @symbol_to_throw.nil?
           
           default_return_val = if !@method_block.nil?
-                                 invoke_method_block(*args)
+                                 invoke_method_block(*args, &block)
                                elsif !@args_to_yield.empty? || @eval_context
                                  invoke_with_yield(&block)
                                else
@@ -141,9 +141,9 @@ module RSpec
       
       protected
 
-      def invoke_method_block(*args)
+      def invoke_method_block(*args, &block)
         begin
-          @method_block.call(*args)
+          @method_block.call(*args, &block)
         rescue => detail
           @error_generator.raise_block_failed_error(@sym, detail.message)
         end

data/lib/rspec/mocks/methods.rb

@@ -73,10 +73,15 @@ module RSpec
     private
 
       def __mock_proxy
-        if Mock === self
-          @mock_proxy ||= Proxy.new(self, @name, @options)
-        else
-          @mock_proxy ||= Proxy.new(self)
+        @mock_proxy ||= begin
+          mp = if Mock === self
+            Proxy.new(self, @name, @options)
+          else
+            Proxy.new(self)
+          end
+
+          Serialization.fix_for(self)
+          mp
         end
       end
 

data/lib/rspec/mocks/proxy.rb

@@ -105,6 +105,9 @@ module RSpec
         elsif expectation = find_almost_matching_expectation(method_name, *args)
           expectation.advise(*args) if null_object? unless expectation.expected_messages_received?
           raise_unexpected_message_args_error(expectation, *args) unless (has_negative_expectation?(method_name) or null_object?)
+        elsif stub = find_almost_matching_stub(method_name, *args)
+          stub.advise(*args)
+          raise_unexpected_message_args_error(stub, *args)
         elsif @object.is_a?(Class)
           @object.superclass.send(method_name, *args, &block)
         else
@@ -145,6 +148,10 @@ module RSpec
         method_double[method_name].stubs.find {|stub| stub.matches?(method_name, *args)}
       end
 
+      def find_almost_matching_stub(method_name, *args)
+        method_double[method_name].stubs.find {|stub| stub.matches_name_but_not_args(method_name, *args)}
+      end
+
     end
   end
 end

data/lib/rspec/mocks/serialization.rb

@@ -0,0 +1,24 @@
+module RSpec
+  module Mocks
+    module Serialization
+      def self.fix_for(object)
+        object.extend(YAML) if defined?(::YAML)
+      end
+
+      module YAML
+        def to_yaml(*a)
+          return super(*a) unless instance_variable_defined?(:@mock_proxy)
+
+          mp = @mock_proxy
+          remove_instance_variable(:@mock_proxy)
+
+          begin
+            super(*a)
+          ensure
+            @mock_proxy = mp
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rspec/mocks/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Mocks # :nodoc:
     module Version # :nodoc:
-      STRING = '2.0.0.beta.22'
+      STRING = '2.0.0.rc'
     end
   end
 end

data/spec/rspec/mocks/mock_spec.rb

@@ -144,6 +144,15 @@ module RSpec
         }.to raise_error(RSpec::Mocks::MockExpectationError, /Double \"test double\" received :something but passed block failed with: expected false to be true/)
       end
 
+      it "passes block to expectation block" do
+        a = nil
+        @mock.should_receive(:something) { |&block| a = block }
+        b = lambda { }
+        @mock.something(&b)
+        a.should == b
+        @moc.rspec_verify
+      end
+
       it "fails right away when method defined as never is received" do
         @mock.should_receive(:not_expected).never
         expect { @mock.not_expected }.to raise_error(

data/spec/rspec/mocks/serialization_spec.rb

@@ -0,0 +1,69 @@
+require 'spec_helper'
+require 'yaml'
+
+module RSpec
+  module Mocks
+    class SerializableStruct < Struct.new(:foo, :bar); end
+
+    describe Serialization do
+      def self.with_yaml_loaded(&block)
+        context 'with YAML loaded' do
+          module_eval(&block)
+        end
+      end
+
+      def self.without_yaml_loaded(&block)
+        context 'without YAML loaded' do
+          before(:each) do
+            # We can't really unload yaml, but we can fake it here...
+            @orig_yaml_constant = Object.send(:remove_const, :YAML)
+            Struct.class_eval do
+              alias __old_to_yaml to_yaml
+              undef to_yaml
+            end
+          end
+
+          module_eval(&block)
+
+          after(:each) do
+            Object.const_set(:YAML, @orig_yaml_constant)
+            Struct.class_eval do
+              alias to_yaml __old_to_yaml
+              undef __old_to_yaml
+            end
+          end
+        end
+      end
+
+      subject { SerializableStruct.new(7, "something") }
+
+      def set_stub
+        subject.stub(:bazz => 5)
+      end
+
+      with_yaml_loaded do
+        it 'serializes to yaml the same with and without stubbing, using #to_yaml' do
+          expect { set_stub }.to_not change { subject.to_yaml }
+        end
+
+        it 'serializes to yaml the same with and without stubbing, using YAML.dump' do
+          expect { set_stub }.to_not change { YAML.dump(subject) }
+        end
+      end
+
+      without_yaml_loaded do
+        it 'does not add #to_yaml to the stubbed object' do
+          subject.should_not respond_to(:to_yaml)
+          set_stub
+          subject.should_not respond_to(:to_yaml)
+        end
+      end
+
+      it 'marshals the same with and without stubbing' do
+        pending("not sure how to fix this yet") do
+          expect { set_stub }.to_not change { Marshal.dump(subject) }
+        end
+      end
+    end
+  end
+end

data/spec/rspec/mocks/stub_spec.rb

@@ -199,13 +199,13 @@ module RSpec
       it "complains if called with no arg" do
         lambda do
           @stub.foo
-        end.should raise_error
+        end.should raise_error(/received :foo with unexpected arguments/)
       end
 
       it "complains if called with other arg" do
         lambda do
           @stub.foo("other")
-        end.should raise_error
+        end.should raise_error(/received :foo with unexpected arguments/)
       end
 
       it "does not complain if also mocked w/ different args" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-mocks
 version: !ruby/object:Gem::Version 
+  hash: 7712058
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
-  - beta
-  - 22
-  version: 2.0.0.beta.22
+  - rc
+  version: 2.0.0.rc
 platform: ruby
 authors: 
 - David Chelimsky
@@ -17,43 +17,43 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-12 00:00:00 -05:00
+date: 2010-10-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec-core
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 7712058
         segments: 
         - 2
         - 0
         - 0
-        - beta
-        - 22
-        version: 2.0.0.beta.22
+        - rc
+        version: 2.0.0.rc
+  requirement: *id001
   type: :runtime
+  name: rspec-core
   prerelease: false
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec-expectations
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 7712058
         segments: 
         - 2
         - 0
         - 0
-        - beta
-        - 22
-        version: 2.0.0.beta.22
+        - rc
+        version: 2.0.0.rc
+  requirement: *id002
   type: :runtime
+  name: rspec-expectations
   prerelease: false
-  version_requirements: *id002
 description: RSpec's 'test double' framework, with support for stubbing and mocking
 email: dchelimsky@gmail.com;chad.humphries@gmail.com
 executables: []
@@ -67,7 +67,7 @@ files:
 - .document
 - .gitignore
 - Gemfile
-- History.md
+- History.markdown
 - License.txt
 - README.markdown
 - Rakefile
@@ -94,6 +94,7 @@ files:
 - lib/rspec/mocks/mock.rb
 - lib/rspec/mocks/order_group.rb
 - lib/rspec/mocks/proxy.rb
+- lib/rspec/mocks/serialization.rb
 - lib/rspec/mocks/space.rb
 - lib/rspec/mocks/spec_methods.rb
 - lib/rspec/mocks/version.rb
@@ -134,6 +135,7 @@ files:
 - spec/rspec/mocks/passing_argument_matchers_spec.rb
 - spec/rspec/mocks/precise_counts_spec.rb
 - spec/rspec/mocks/record_messages_spec.rb
+- spec/rspec/mocks/serialization_spec.rb
 - spec/rspec/mocks/stash_spec.rb
 - spec/rspec/mocks/stub_chain_spec.rb
 - spec/rspec/mocks/stub_implementation_spec.rb
@@ -157,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2717904534021083883
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -166,6 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
       - 1
       - 3
@@ -177,7 +180,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec-mocks-2.0.0.beta.22
+summary: rspec-mocks-2.0.0.rc
 test_files: 
 - features/README.markdown
 - features/configuration.feature
@@ -221,6 +224,7 @@ test_files:
 - spec/rspec/mocks/passing_argument_matchers_spec.rb
 - spec/rspec/mocks/precise_counts_spec.rb
 - spec/rspec/mocks/record_messages_spec.rb
+- spec/rspec/mocks/serialization_spec.rb
 - spec/rspec/mocks/stash_spec.rb
 - spec/rspec/mocks/stub_chain_spec.rb
 - spec/rspec/mocks/stub_implementation_spec.rb