rr 1.0.1 → 1.0.2

data/CHANGES

@@ -1,3 +1,10 @@
+1.0.2
+- Fixed Two calls recorded to a mock expecting only one call when called via another mock's yield block (http://github.com/btakita/rr/issues/closed#issue/42). Patch by Eugene Pimenov (http://github.com/libc).
+
+1.0.1
+- Removed new_instance_of for Ruby 1.9.2 compatibility. instance_of is now an alias for any_instance_of.
+- Compatible with Ruby 1.9.2
+
 1.0.0
 - Added any_instance_of (aliased by all_instances_of), which binds methods directly to the class (instead of the eigenclass).
 - Subclasses of a injected class do not have their methods overridden.
@@ -250,4 +257,4 @@
 - Rspec and Test::Unit integration fixes
 
 * 0.1.0
-- Initial Release
+- Initial Release

data/README.rdoc

@@ -363,6 +363,7 @@ If you have directly contributed to RR and I missed you in this list, please let
 * David Chelimsky for encouragement to make the RR framework, for developing the Rspec mock framework, syntax ideas, and patches
 * Daniel Sudol for identifing performance issues with RR
 * Dmitry Ratnikov for patches
+* Eugene Pimenov for patches
 * Felix Morio for pairing with me
 * Gabriel Horner for patches
 * Gerard Meszaros for his excellent book "xUnit Test Patterns"
@@ -380,4 +381,5 @@ If you have directly contributed to RR and I missed you in this list, please let
 * Phil Darnowsky for patches
 * Pivotal Labs for sponsoring RR development
 * Stephen Baker for Developing Rspec
-* Tatsuya Ono for patches
+* Tatsuya Ono for patches
+* Tuomas Kareinen for a bug report

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :minor: 0
-:patch: 1
+:patch: 2
 :major: 1
 :build: 

data/lib/rr/method_dispatches/method_missing_dispatch.rb

@@ -16,7 +16,6 @@ module RR
         if Injections::DoubleInjection.exists?(subject_class, method_name)
           @double = find_double_to_attempt
           if double
-            call_yields
             return_value = extract_subject_from_return_value(call_implementation)
             if after_call_proc
               extract_subject_from_return_value(after_call_proc.call(return_value))

data/spec/api/mock/mock_spec.rb

@@ -156,6 +156,16 @@ describe "mock" do
     end.should raise_error(RR::Errors::DoubleNotFoundError)
   end
 
+  it "expects a method call to a mock via another mock's block yield only once" do
+    cage = Object.new
+    cat = Object.new
+    mock(cat).miau    # should be expected to be called only once
+    mock(cage).find_cat.yields(cat)
+    mock(cage).cats
+    cage.find_cat { |c| c.miau }
+    cage.cats
+  end
+
   describe "on class method" do
     class SampleClass1
       def self.hello; "hello!"; end

data/spec/api/stub/stub_spec.rb

@@ -123,4 +123,30 @@ describe "stub" do
       subject.foobar(4).should == :baz
     end
   end
+
+  context "stub that yields" do
+    context "when yields called without any arguments" do
+      it "yields only once" do
+        called_from_block = mock!.foo.once.subject
+        block_caller = stub!.bar.yields.subject
+        block_caller.bar { called_from_block.foo }
+      end
+    end
+
+    context "when yields called with an argument" do
+      it "yields only once" do
+        called_from_block = mock!.foo(1).once.subject
+        block_caller = stub!.bar.yields(1).subject
+        block_caller.bar { |argument| called_from_block.foo(argument) }
+      end
+    end
+
+    context "when yields calls are chained" do
+      it "yields several times" do
+        called_from_block = mock!.foo(1).once.then.foo(2).once.subject
+        block_caller = stub!.bar.yields(1).yields(2).subject
+        block_caller.bar { |argument| called_from_block.foo(argument) }
+      end
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rr
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Brian Takita
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-30 00:00:00 -07:00
+date: 2010-11-01 00:00:00 -07:00
 default_executable: 
 dependencies: []