rr 0.3.9 → 0.3.10

data/CHANGES

@@ -1,3 +1,6 @@
+* 0.3.10
+- Fixed [#13139] Blocks added to proxy sets the return_value and not the after_call callback
+
 * 0.3.9
 - Alias probe to proxy
 

data/README

@@ -22,14 +22,14 @@ http://xunitpatterns.com/Test%20Stub.html
   jane = User.new
   stub(User).find('42') {jane}
 
-== Mock Probes
+== Mock Proxies/Probes
 Add verifications that a method was called while actually calling it.
 The following example verifies render partial will be called and
 renders the partial.
 
   view = controller.template
-  mock.probe(view).render(:partial => "right_navigation")
-  mock.probe(view).render(:partial => "user_info") do |html|
+  mock.proxy(view).render(:partial => "right_navigation")
+  mock.proxy(view).render(:partial => "user_info") do |html|
     html.should include("John Doe")
     "Different html"
   end
@@ -40,21 +40,21 @@ This technique is also useful for verifying that you are mocking exists and
 functions proberly, thereby testing you interface.
 For example, using ActiveRecord:
 
-  mock.probe(User).find('5') do |user|
-    mock.probe(user).projects do |projects|
+  mock.proxy(User).find('5') do |user|
+    mock.proxy(user).projects do |projects|
       projects[0..3]
     end
     mock(user).valid? {false}
     user
   end
 
-== Stub Probes
+== Stub Proxy/Probes
 Intercept the return value of a method call.
 The following example verifies render partial will be called and
 renders the partial.
 
   view = controller.template
-  stub.probe(view).render(:partial => "user_info") do |html|
+  stub.proxy(view).render(:partial => "user_info") do |html|
     html.should include("Joe Smith")
     html
   end

data/Rakefile

@@ -15,6 +15,7 @@ task(:spec) do
   run_suite
 end
 
+desc "Copies the trunk to a tag with the name of the current release"
 task(:tag_release) do
   tag_release
 end
@@ -25,7 +26,7 @@ def run_suite
 end
 
 PKG_NAME = "rr"
-PKG_VERSION = "0.3.9"
+PKG_VERSION = "0.3.10"
 PKG_FILES = FileList[
   '[A-Z]*',
   '*.rb',

data/examples/core_example_suite.rb

@@ -0,0 +1,31 @@
+require "rubygems"
+require "spec"
+
+class CoreExampleSuite
+  def run
+    options = ::Spec::Runner::OptionParser.new.parse(ARGV.dup, STDERR, STDOUT, false)
+    options.configure
+    $behaviour_runner = options.create_behaviour_runner
+
+    require_specs
+
+    puts "Running Rspec Example Suite"
+    $behaviour_runner.run(ARGV, false)
+  end
+
+  def require_specs
+    exclusions = []
+    exclusions << "rspec/"
+    exclusions << "test_unit/"
+
+    Dir["#{File.dirname(__FILE__)}/**/*_example.rb"].each do |file|
+      unless exclusions.any? {|match| file.include?(match)}
+        require file
+      end
+    end
+  end
+end
+
+if $0 == __FILE__
+  CoreExampleSuite.new.run
+end

data/examples/example_suite.rb

@@ -1,30 +1,12 @@
-require "rubygems"
-require "spec"
-
 class ExampleSuite
   def run
-    options = ::Spec::Runner::OptionParser.new.parse(ARGV.dup, STDERR, STDOUT, false)
-    $behaviour_runner = options.create_behaviour_runner
-
-    require_specs
-
-    puts "Running Example Suite"
-    $behaviour_runner.run(ARGV, false)
-
+    run_core_examples
     run_rspec_examples
     run_test_unit_examples
   end
 
-  def require_specs
-    exclusions = []
-    exclusions << "rspec/"
-    exclusions << "test_unit/"
-
-    Dir["#{dir}/**/*_example.rb"].each do |file|
-      unless exclusions.any? {|match| file.include?(match)}
-        require file
-      end
-    end
+  def run_core_examples
+    system("ruby #{dir}/core_example_suite.rb") || raise("Core suite Failed")
   end
 
   def run_rspec_examples

data/examples/rr/expectations/times_called_expectation/times_called_expectation_example.rb

@@ -2,16 +2,6 @@ require "examples/example_helper"
 
 module RR
 module Expectations
-describe TimesCalledExpectation, :shared => true do
-  before do
-    @space = Space.new
-    @object = Object.new
-    @double = @space.double(@object, :foobar)
-    @scenario = @space.scenario(@double)
-    @scenario.with(1, 2)
-  end
-end
-
 describe TimesCalledExpectation, " with failure", :shared => true do
   it_should_behave_like "RR::Expectations::TimesCalledExpectation"
 

data/examples/rr/expectations/times_called_expectation/times_called_expectation_helper.rb

@@ -1,18 +1,20 @@
+require "examples/example_helper"
+
 module RR
 module Expectations
-  describe TimesCalledExpectation, :shared => true do
-    before do
-      @space = Space.new
-      @object = Object.new
-      @method_name = :foobar
-      @double = @space.double(@object, @method_name)
-      @scenario = @space.scenario(@double)
-      @scenario.with_any_args
-    end
+describe TimesCalledExpectation, :shared => true do
+  before do
+    @space = Space.new
+    @object = Object.new
+    @method_name = :foobar
+    @double = @space.double(@object, @method_name)
+    @scenario = @space.scenario(@double)
+    @scenario.with_any_args
+  end
 
-    def raises_expectation_error(&block)
-      proc {block.call}.should raise_error(Errors::TimesCalledError)
-    end
+  def raises_expectation_error(&block)
+    proc {block.call}.should raise_error(Errors::TimesCalledError)
   end
 end
 end
+end

data/examples/rr/scenario_creator_example.rb

@@ -80,6 +80,11 @@ describe ScenarioCreator, "#mock" do
     )
   end
 
+  it "sets up the ScenarioDefinition to be in returns block_callback_strategy" do
+    scenario = @creator.mock(@subject, :foobar)
+    scenario.block_callback_strategy.should == :returns
+  end
+
   def create_scenario_with_method_name(scenario)
     scenario.with(1, 2) {:baz}
     scenario.times_matcher.should == TimesCalledMatchers::IntegerMatcher.new(1)
@@ -114,6 +119,11 @@ describe ScenarioCreator, "#stub" do
     should create_scenario_with_method_name(@creator.stub(@subject, :foobar))
   end
 
+  it "sets up the ScenarioDefinition to be in returns block_callback_strategy" do
+    scenario = @creator.stub(@subject, :foobar)
+    scenario.block_callback_strategy.should == :returns
+  end
+
   def create_scenario_with_method_name(scenario)
     scenario.with(1, 2) {:baz}
     scenario.times_matcher.should == TimesCalledMatchers::AnyTimesMatcher.new
@@ -255,6 +265,20 @@ describe ScenarioCreator, "(#probe or #proxy) and #stub" do
     scenario.argument_expectation.class.should == RR::Expectations::ArgumentEqualityExpectation
     @subject.foobar(1, 2).should == :baz
   end
+  
+  it "sets up the ScenarioDefinition to be in after_call block_callback_strategy" do
+    def @subject.foobar
+      :original_implementation_value
+    end
+
+    args = nil
+    scenario = @creator.stub.proxy(@subject, :foobar).with() do |*args|
+      args = args
+    end
+    @subject.foobar
+    args.should == [:original_implementation_value]
+    scenario.block_callback_strategy.should == :after_call
+  end
 end
 
 describe ScenarioCreator, "#instance_of" do

data/examples/rr/scenario_definition_example.rb

@@ -5,16 +5,35 @@ describe ScenarioDefinition, :shared => true do
   before do
     @space = Space.new
     @object = Object.new
-    def @object.foobar(a, b)
-      [b, a]
-    end
+    add_original_method
     @double = @space.double(@object, :foobar)
     @scenario = @space.scenario(@double)
     @definition = @scenario.definition
   end
+
+  def add_original_method
+    def @object.foobar(a, b)
+      :original_return_value
+    end
+  end
+end
+
+describe ScenarioDefinition, " with returns block_callback_strategy", :shared => true do
+  before do
+    @definition.returns_block_callback_strategy!
+    create_definition
+  end
+end
+
+describe ScenarioDefinition, " with after_call block_callback_strategy", :shared => true do
+  before do
+    @definition.implemented_by_original_method
+    @definition.after_call_block_callback_strategy!
+    create_definition
+  end
 end
 
-describe ScenarioDefinition, "#with" do
+describe ScenarioDefinition, "#with", :shared => true do
   it_should_behave_like "RR::ScenarioDefinition"
 
   it "returns ScenarioDefinition" do
@@ -22,23 +41,44 @@ describe ScenarioDefinition, "#with" do
   end
 
   it "sets an ArgumentEqualityExpectation" do
-    @definition.with(1)
-    @definition.should be_exact_match(1)
+    @definition.should be_exact_match(1, 2)
     @definition.should_not be_exact_match(2)
   end
 
+  def create_definition
+    actual_args = nil
+    @definition.with(1, 2) do |*args|
+      actual_args = args
+      :new_return_value
+    end
+    @object.foobar(1, 2)
+    @return_value = @object.foobar(1, 2)
+    @args = actual_args
+  end
+end
+
+describe ScenarioDefinition, "#with with returns block_callback_strategy" do
+  it_should_behave_like "RR::ScenarioDefinition#with"
+  it_should_behave_like "RR::ScenarioDefinition with returns block_callback_strategy"
+
   it "sets return value when block passed in" do
-    @definition.with(1) {:return_value}
-    @object.foobar(1).should == :return_value
+    @return_value.should == :new_return_value
+    @args.should == [1, 2]
   end
 end
 
-describe ScenarioDefinition, "#with_any_args" do
-  it_should_behave_like "RR::ScenarioDefinition"
+describe ScenarioDefinition, "#with with after_call block_callback_strategy" do
+  it_should_behave_like "RR::ScenarioDefinition#with"
+  it_should_behave_like "RR::ScenarioDefinition with after_call block_callback_strategy"
 
-  before do
-    @definition.with_any_args {:return_value}
+  it "sets return value when block passed in" do
+    @return_value.should == :new_return_value
+    @args.should == [:original_return_value]
   end
+end
+
+describe ScenarioDefinition, "#with_any_args", :shared => true do
+  it_should_behave_like "RR::ScenarioDefinition"
 
   it "returns ScenarioDefinition" do
     @definition.with_no_args.should === @definition
@@ -49,17 +89,39 @@ describe ScenarioDefinition, "#with_any_args" do
     @definition.should be_wildcard_match(1)
   end
 
+  def create_definition
+    actual_args = nil
+    @definition.with_any_args do |*args|
+      actual_args = args
+      :new_return_value
+    end
+    @return_value = @object.foobar(1, 2)
+    @args = actual_args
+  end
+end
+
+describe ScenarioDefinition, "#with_any_args with returns block_callback_strategy" do
+  it_should_behave_like "RR::ScenarioDefinition#with_any_args"
+  it_should_behave_like "RR::ScenarioDefinition with returns block_callback_strategy"
+
   it "sets return value when block passed in" do
-    @object.foobar(:anything).should == :return_value
+    @return_value.should == :new_return_value
+    @args.should == [1, 2]
   end
 end
 
-describe ScenarioDefinition, "#with_no_args" do
-  it_should_behave_like "RR::ScenarioDefinition"
+describe ScenarioDefinition, "#with_any_args with after_call block_callback_strategy" do
+  it_should_behave_like "RR::ScenarioDefinition#with_any_args"
+  it_should_behave_like "RR::ScenarioDefinition with after_call block_callback_strategy"
 
-  before do
-    @definition.with_no_args {:return_value}
+  it "sets return value when block passed in" do
+    @return_value.should == :new_return_value
+    @args.should == [:original_return_value]
   end
+end
+
+describe ScenarioDefinition, "#with_no_args", :shared => true do
+  it_should_behave_like "RR::ScenarioDefinition"
 
   it "returns ScenarioDefinition" do
     @definition.with_no_args.should === @definition
@@ -69,8 +131,40 @@ describe ScenarioDefinition, "#with_no_args" do
     @definition.argument_expectation.should == Expectations::ArgumentEqualityExpectation.new()
   end
 
+  def add_original_method
+    def @object.foobar()
+      :original_return_value
+    end
+  end
+
+  def create_definition
+    actual_args = nil
+    @definition.with_no_args do |*args|
+      actual_args = args
+      :new_return_value
+    end
+    @return_value = @object.foobar
+    @args = actual_args
+  end
+end
+
+describe ScenarioDefinition, "#with_no_args with returns block_callback_strategy" do
+  it_should_behave_like "RR::ScenarioDefinition#with_no_args"
+  it_should_behave_like "RR::ScenarioDefinition with returns block_callback_strategy"
+
+  it "sets return value when block passed in" do
+    @return_value.should == :new_return_value
+    @args.should == []
+  end
+end
+
+describe ScenarioDefinition, "#with_no_args with after_call block_callback_strategy" do
+  it_should_behave_like "RR::ScenarioDefinition#with_no_args"
+  it_should_behave_like "RR::ScenarioDefinition with after_call block_callback_strategy"
+
   it "sets return value when block passed in" do
-    @object.foobar().should == :return_value
+    @return_value.should == :new_return_value
+    @args.should == [:original_return_value]
   end
 end
 
@@ -93,7 +187,7 @@ describe ScenarioDefinition, "#never" do
   end
 end
 
-describe ScenarioDefinition, "#once" do
+describe ScenarioDefinition, "#once", :shared => true do
   it_should_behave_like "RR::ScenarioDefinition"
 
   it "returns ScenarioDefinition" do
@@ -101,18 +195,41 @@ describe ScenarioDefinition, "#once" do
   end
 
   it "sets up a Times Called Expectation with 1" do
-    @definition.once.with_any_args
-    @object.foobar
     proc {@object.foobar}.should raise_error(Errors::TimesCalledError)
   end
 
+  def create_definition
+    actual_args = nil
+    @definition.with_any_args.once do |*args|
+      actual_args = args
+      :new_return_value
+    end
+    @return_value = @object.foobar(1, 2)
+    @args = actual_args
+  end
+end
+
+describe ScenarioDefinition, "#once with returns block_callback_strategy" do
+  it_should_behave_like "RR::ScenarioDefinition#once"
+  it_should_behave_like "RR::ScenarioDefinition with returns block_callback_strategy"
+
+  it "sets return value when block passed in" do
+    @return_value.should == :new_return_value
+    @args.should == [1, 2]
+  end
+end
+
+describe ScenarioDefinition, "#once with after_call block_callback_strategy" do
+  it_should_behave_like "RR::ScenarioDefinition#once"
+  it_should_behave_like "RR::ScenarioDefinition with after_call block_callback_strategy"
+
   it "sets return value when block passed in" do
-    @definition.with_any_args.once {:return_value}
-    @object.foobar.should == :return_value
+    @return_value.should == :new_return_value
+    @args.should == [:original_return_value]
   end
 end
 
-describe ScenarioDefinition, "#twice" do
+describe ScenarioDefinition, "#twice", :shared => true do
   it_should_behave_like "RR::ScenarioDefinition"
 
   it "returns ScenarioDefinition" do
@@ -121,18 +238,42 @@ describe ScenarioDefinition, "#twice" do
 
   it "sets up a Times Called Expectation with 2" do
     @definition.twice.with_any_args
-    @object.foobar
-    @object.foobar
-    proc {@object.foobar}.should raise_error(Errors::TimesCalledError)
+    proc {@object.foobar(1, 2)}.should raise_error(Errors::TimesCalledError)
   end
 
+  def create_definition
+    actual_args = nil
+    @definition.with_any_args.twice do |*args|
+      actual_args = args
+      :new_return_value
+    end
+    @object.foobar(1, 2)
+    @return_value = @object.foobar(1, 2)
+    @args = actual_args
+  end
+end
+
+describe ScenarioDefinition, "#twice with returns block_callback_strategy" do
+  it_should_behave_like "RR::ScenarioDefinition#twice"
+  it_should_behave_like "RR::ScenarioDefinition with returns block_callback_strategy"
+
   it "sets return value when block passed in" do
-    @definition.with_any_args.twice {:return_value}
-    @object.foobar.should == :return_value
+    @return_value.should == :new_return_value
+    @args.should == [1, 2]
   end
 end
 
-describe ScenarioDefinition, "#at_least" do
+describe ScenarioDefinition, "#twice with after_call block_callback_strategy" do
+  it_should_behave_like "RR::ScenarioDefinition#twice"
+  it_should_behave_like "RR::ScenarioDefinition with after_call block_callback_strategy"
+
+  it "sets return value when block passed in" do
+    @return_value.should == :new_return_value
+    @args.should == [:original_return_value]
+  end
+end
+
+describe ScenarioDefinition, "#at_least", :shared => true do
   it_should_behave_like "RR::ScenarioDefinition"
 
   it "returns ScenarioDefinition" do
@@ -140,17 +281,42 @@ describe ScenarioDefinition, "#at_least" do
   end
 
   it "sets up a Times Called Expectation with 1" do
-    @definition.at_least(2)
     @definition.times_matcher.should == TimesCalledMatchers::AtLeastMatcher.new(2)
   end
 
+  def create_definition
+    actual_args = nil
+    @definition.with_any_args.at_least(2) do |*args|
+      actual_args = args
+      :new_return_value
+    end
+    @object.foobar(1, 2)
+    @return_value = @object.foobar(1, 2)
+    @args = actual_args
+  end
+end
+
+describe ScenarioDefinition, "#at_least with returns block_callback_strategy" do
+  it_should_behave_like "RR::ScenarioDefinition#at_least"
+  it_should_behave_like "RR::ScenarioDefinition with returns block_callback_strategy"
+
+  it "sets return value when block passed in" do
+    @return_value.should == :new_return_value
+    @args.should == [1, 2]
+  end
+end
+
+describe ScenarioDefinition, "#at_least with after_call block_callback_strategy" do
+  it_should_behave_like "RR::ScenarioDefinition#at_least"
+  it_should_behave_like "RR::ScenarioDefinition with after_call block_callback_strategy"
+
   it "sets return value when block passed in" do
-    @definition.with_any_args.at_least(2) {:return_value}
-    @object.foobar.should == :return_value
+    @return_value.should == :new_return_value
+    @args.should == [:original_return_value]
   end
 end
 
-describe ScenarioDefinition, "#at_most" do
+describe ScenarioDefinition, "#at_most", :shared => true do
   it_should_behave_like "RR::ScenarioDefinition"
 
   it "returns ScenarioDefinition" do
@@ -158,9 +324,6 @@ describe ScenarioDefinition, "#at_most" do
   end
 
   it "sets up a Times Called Expectation with 1" do
-    @definition.at_most(2).with_any_args
-    @object.foobar
-    @object.foobar
     proc do
       @object.foobar
     end.should raise_error(
@@ -169,13 +332,39 @@ describe ScenarioDefinition, "#at_most" do
     )
   end
 
+  def create_definition
+    actual_args = nil
+    @definition.with_any_args.at_most(2) do |*args|
+      actual_args = args
+      :new_return_value
+    end
+    @object.foobar(1, 2)
+    @return_value = @object.foobar(1, 2)
+    @args = actual_args
+  end
+end
+
+describe ScenarioDefinition, "#at_most with returns block_callback_strategy" do
+  it_should_behave_like "RR::ScenarioDefinition#at_most"
+  it_should_behave_like "RR::ScenarioDefinition with returns block_callback_strategy"
+
+  it "sets return value when block passed in" do
+    @return_value.should == :new_return_value
+    @args.should == [1, 2]
+  end
+end
+
+describe ScenarioDefinition, "#at_most with after_call block_callback_strategy" do
+  it_should_behave_like "RR::ScenarioDefinition#at_most"
+  it_should_behave_like "RR::ScenarioDefinition with after_call block_callback_strategy"
+
   it "sets return value when block passed in" do
-    @definition.with_any_args.at_most(2) {:return_value}
-    @object.foobar.should == :return_value
+    @return_value.should == :new_return_value
+    @args.should == [:original_return_value]
   end
 end
 
-describe ScenarioDefinition, "#times" do
+describe ScenarioDefinition, "#times", :shared => true do
   it_should_behave_like "RR::ScenarioDefinition"
 
   it "returns ScenarioDefinition" do
@@ -183,20 +372,43 @@ describe ScenarioDefinition, "#times" do
   end
 
   it "sets up a Times Called Expectation with passed in times" do
-    @definition.times(3).with_any_args
-    @object.foobar
-    @object.foobar
-    @object.foobar
-    proc {@object.foobar}.should raise_error(Errors::TimesCalledError)
+    proc {@object.foobar(1, 2)}.should raise_error(Errors::TimesCalledError)
+  end
+
+  def create_definition
+    actual_args = nil
+    @definition.with(1, 2).times(3) do |*args|
+      actual_args = args
+      :new_return_value
+    end
+    @object.foobar(1, 2)
+    @object.foobar(1, 2)
+    @return_value = @object.foobar(1, 2)
+    @args = actual_args
+  end
+end
+
+describe ScenarioDefinition, "#times with returns block_callback_strategy" do
+  it_should_behave_like "RR::ScenarioDefinition#times"
+  it_should_behave_like "RR::ScenarioDefinition with returns block_callback_strategy"
+
+  it "sets return value when block passed in" do
+    @return_value.should == :new_return_value
+    @args.should == [1, 2]
   end
+end
+
+describe ScenarioDefinition, "#times with after_call block_callback_strategy" do
+  it_should_behave_like "RR::ScenarioDefinition#times"
+  it_should_behave_like "RR::ScenarioDefinition with after_call block_callback_strategy"
 
   it "sets return value when block passed in" do
-    @definition.with_any_args.times(3) {:return_value}
-    @object.foobar.should == :return_value
+    @return_value.should == :new_return_value
+    @args.should == [:original_return_value]
   end
 end
 
-describe ScenarioDefinition, "#any_number_of_times" do
+describe ScenarioDefinition, "#any_number_of_times", :shared => true do
   it_should_behave_like "RR::ScenarioDefinition"
 
   it "returns ScenarioDefinition" do
@@ -204,17 +416,42 @@ describe ScenarioDefinition, "#any_number_of_times" do
   end
 
   it "sets up a Times Called Expectation with AnyTimes matcher" do
-    @definition.any_number_of_times
     @definition.times_matcher.should == TimesCalledMatchers::AnyTimesMatcher.new
   end
 
+  def create_definition
+    actual_args = nil
+    @definition.with(1, 2).any_number_of_times do |*args|
+      actual_args = args
+      :new_return_value
+    end
+    @object.foobar(1, 2)
+    @return_value = @object.foobar(1, 2)
+    @args = actual_args
+  end
+end
+
+describe ScenarioDefinition, "#any_number_of_times with returns block_callback_strategy" do
+  it_should_behave_like "RR::ScenarioDefinition#any_number_of_times"
+  it_should_behave_like "RR::ScenarioDefinition with returns block_callback_strategy"
+
+  it "sets return value when block passed in" do
+    @return_value.should == :new_return_value
+    @args.should == [1, 2]
+  end
+end
+
+describe ScenarioDefinition, "#any_number_of_times with after_call block_callback_strategy" do
+  it_should_behave_like "RR::ScenarioDefinition#any_number_of_times"
+  it_should_behave_like "RR::ScenarioDefinition with after_call block_callback_strategy"
+
   it "sets return value when block passed in" do
-    @definition.with_any_args.any_number_of_times {:return_value}
-    @object.foobar.should == :return_value
+    @return_value.should == :new_return_value
+    @args.should == [:original_return_value]
   end
 end
 
-describe ScenarioDefinition, "#ordered" do
+describe ScenarioDefinition, "#ordered", :shared => true do
   it_should_behave_like "RR::ScenarioDefinition"
 
   it "adds itself to the ordered scenarios list" do
@@ -223,21 +460,14 @@ describe ScenarioDefinition, "#ordered" do
   end
 
   it "does not double add itself" do
-    @definition.ordered
     @definition.ordered
     @space.ordered_scenarios.should == [@scenario]
   end
 
   it "sets ordered? to true" do
-    @definition.ordered
     @definition.should be_ordered
   end
 
-  it "sets return value when block passed in" do
-    @definition.with_any_args.once.ordered {:return_value}
-    @object.foobar.should == :return_value
-  end
-
   it "raises error when there is no Scenario" do
     @definition.scenario = nil
     proc do
@@ -249,6 +479,36 @@ describe ScenarioDefinition, "#ordered" do
       "probe the class's #new method instead."
     )
   end
+
+  def create_definition
+    actual_args = nil
+    @definition.with(1, 2).once.ordered do |*args|
+      actual_args = args
+      :new_return_value
+    end
+    @return_value = @object.foobar(1, 2)
+    @args = actual_args
+  end
+end
+
+describe ScenarioDefinition, "#ordered with returns block_callback_strategy" do
+  it_should_behave_like "RR::ScenarioDefinition#ordered"
+  it_should_behave_like "RR::ScenarioDefinition with returns block_callback_strategy"
+
+  it "sets return value when block passed in" do
+    @return_value.should == :new_return_value
+    @args.should == [1, 2]
+  end
+end
+
+describe ScenarioDefinition, "#ordered with after_call block_callback_strategy" do
+  it_should_behave_like "RR::ScenarioDefinition#ordered"
+  it_should_behave_like "RR::ScenarioDefinition with after_call block_callback_strategy"
+
+  it "sets return value when block passed in" do
+    @return_value.should == :new_return_value
+    @args.should == [:original_return_value]
+  end
 end
 
 describe ScenarioDefinition, "#ordered?" do
@@ -259,31 +519,52 @@ describe ScenarioDefinition, "#ordered?" do
   end
 end
 
-describe ScenarioDefinition, "#yields" do
+describe ScenarioDefinition, "#yields", :shared => true do
   it_should_behave_like "RR::ScenarioDefinition"
 
   it "returns ScenarioDefinition" do
     @definition.yields(:baz).should === @definition
   end
 
-  it "yields the passed in argument to the call block when there is no returns value set" do
-    @definition.with_any_args.yields(:baz)
+  it "yields the passed in argument to the call block when there is a no returns value set" do
+    @passed_in_block_arg.should == :baz
+  end
+
+  def create_definition
+    actual_args = nil
+    @definition.with(1, 2).once.yields(:baz) do |*args|
+      actual_args = args
+      :new_return_value
+    end
     passed_in_block_arg = nil
-    @object.foobar {|arg| passed_in_block_arg = arg}.should == nil
-    passed_in_block_arg.should == :baz
+    @return_value = @object.foobar(1, 2) do |arg|
+      passed_in_block_arg = arg
+    end
+    @passed_in_block_arg = passed_in_block_arg
+    
+    @args = actual_args
   end
+end
 
-  it "yields the passed in argument to the call block when there is a no returns value set" do
-    @definition.with_any_args.yields(:baz).returns(:return_value)
+describe ScenarioDefinition, "#yields with returns block_callback_strategy" do
+  it_should_behave_like "RR::ScenarioDefinition#yields"
+  it_should_behave_like "RR::ScenarioDefinition with returns block_callback_strategy"
 
-    passed_in_block_arg = nil
-    @object.foobar {|arg| passed_in_block_arg = arg}.should == :return_value
-    passed_in_block_arg.should == :baz
+  it "sets return value when block passed in" do
+    @return_value.should == :new_return_value
+    @args.length.should == 3
+    @args[0..1].should == [1, 2]
+    @args[2].should be_instance_of(Proc)
   end
+end
+
+describe ScenarioDefinition, "#yields with after_call block_callback_strategy" do
+  it_should_behave_like "RR::ScenarioDefinition#yields"
+  it_should_behave_like "RR::ScenarioDefinition with after_call block_callback_strategy"
 
   it "sets return value when block passed in" do
-    @definition.with_any_args.yields {:return_value}
-    @object.foobar {}.should == :return_value
+    @return_value.should == :new_return_value
+    @args.should == [:original_return_value]
   end
 end
 
@@ -393,7 +674,7 @@ describe ScenarioDefinition, "#implemented_by_original_method" do
 
   it "sets the implementation to the original method" do
     @definition.implemented_by_original_method.with_any_args
-    @object.foobar(1, 2).should == [2, 1]
+    @object.foobar(1, 2).should == :original_return_value
   end
 
   it "calls method_missing when original_method does not exist" do
@@ -500,4 +781,30 @@ describe ScenarioDefinition, "#expected_arguments" do
     @definition.expected_arguments.should == []
   end
 end
+
+describe ScenarioDefinition, "#block_callback_strategy" do
+  it_should_behave_like "RR::ScenarioDefinition"
+
+  it "defaults to :returns" do
+    @definition.block_callback_strategy.should == :returns
+  end
+end
+
+describe ScenarioDefinition, "#returns_block_callback_strategy!" do
+  it_should_behave_like "RR::ScenarioDefinition"
+
+  it "sets the block_callback_strategy to :returns" do
+    @definition.returns_block_callback_strategy!
+    @definition.block_callback_strategy.should == :returns
+  end
+end
+
+describe ScenarioDefinition, "#after_call_block_callback_strategy!" do
+  it_should_behave_like "RR::ScenarioDefinition"
+
+  it "sets the block_callback_strategy to :after_call" do
+    @definition.after_call_block_callback_strategy!
+    @definition.block_callback_strategy.should == :after_call
+  end
+end
 end

data/examples/rspec_example_suite.rb

@@ -4,10 +4,10 @@ require "spec"
 class RspecExampleSuite
   def run
     options = ::Spec::Runner::OptionParser.new.parse(ARGV.dup, STDERR, STDOUT, false)
+    options.configure 
     $behaviour_runner = options.create_behaviour_runner
 
     require_specs
-
     puts "Running Rspec Example Suite"
     $behaviour_runner.run(ARGV, false)
   end

data/lib/rr/scenario_definition.rb

@@ -7,11 +7,11 @@ module RR
     attr_accessor :times_called,
                   :argument_expectation,
                   :times_matcher,
-                  :double,
                   :implementation,
                   :after_call_value,
                   :yields_value,
                   :scenario
+    attr_reader   :block_callback_strategy
 
     def initialize(space)
       @space = space
@@ -20,6 +20,7 @@ module RR
       @times_matcher = nil
       @after_call_value = nil
       @yields_value = nil
+      returns_block_callback_strategy!
     end
 
     # Scenario#with sets the expectation that the Scenario will receive
@@ -30,7 +31,7 @@ module RR
     #   mock(subject).method_name.with(1, 2) {:return_value}
     def with(*args, &returns)
       @argument_expectation = Expectations::ArgumentEqualityExpectation.new(*args)
-      returns(&returns) if returns
+      install_method_callback returns
       self
     end
 
@@ -42,7 +43,7 @@ module RR
     #   mock(subject).method_name.with_any_args {:return_value}
     def with_any_args(&returns)
       @argument_expectation = Expectations::AnyArgumentExpectation.new
-      returns(&returns) if returns
+      install_method_callback returns
       self
     end
 
@@ -54,7 +55,7 @@ module RR
     #   mock(subject).method_name.with_no_args {:return_value}
     def with_no_args(&returns)
       @argument_expectation = Expectations::ArgumentEqualityExpectation.new()
-      returns(&returns) if returns
+      install_method_callback returns
       self
     end
 
@@ -77,7 +78,7 @@ module RR
     #   mock(subject).method_name.once {:return_value}
     def once(&returns)
       @times_matcher = TimesCalledMatchers::IntegerMatcher.new(1)
-      returns(&returns) if returns
+      install_method_callback returns
       self
     end
 
@@ -89,7 +90,7 @@ module RR
     #   mock(subject).method_name.twice {:return_value}
     def twice(&returns)
       @times_matcher = TimesCalledMatchers::IntegerMatcher.new(2)
-      returns(&returns) if returns
+      install_method_callback returns
       self
     end
 
@@ -102,7 +103,7 @@ module RR
     #   mock(subject).method_name.at_least(4) {:return_value}
     def at_least(number, &returns)
       @times_matcher = TimesCalledMatchers::AtLeastMatcher.new(number)
-      returns(&returns) if returns
+      install_method_callback returns
       self
     end
 
@@ -115,7 +116,7 @@ module RR
     #   mock(subject).method_name.at_most(4) {:return_value}
     def at_most(number, &returns)
       @times_matcher = TimesCalledMatchers::AtMostMatcher.new(number)
-      returns(&returns) if returns
+      install_method_callback returns
       self
     end
 
@@ -128,7 +129,7 @@ module RR
     #   mock(subject).method_name.any_number_of_times
     def any_number_of_times(&returns)
       @times_matcher = TimesCalledMatchers::AnyTimesMatcher.new
-      returns(&returns) if returns
+      install_method_callback returns
       self
     end
 
@@ -140,7 +141,7 @@ module RR
     #   mock(subject).method_name.times(4) {:return_value}
     def times(matcher_value, &returns)
       @times_matcher = TimesCalledMatchers::TimesCalledMatcher.create(matcher_value)
-      returns(&returns) if returns
+      install_method_callback returns
       self
     end
 
@@ -159,7 +160,7 @@ module RR
       ) unless @scenario
       @ordered = true
       @space.ordered_scenarios << @scenario unless @space.ordered_scenarios.include?(@scenario)
-      returns(&returns) if returns
+      install_method_callback returns
       self
     end
 
@@ -181,7 +182,7 @@ module RR
     #   subject.method_name {|yield_arg1, yield_arg2|}
     def yields(*args, &returns)
       @yields_value = args
-      returns(&returns) if returns
+      install_method_callback returns
       self
     end
 
@@ -273,5 +274,23 @@ module RR
       return [] unless argument_expectation
       argument_expectation.expected_arguments
     end
+
+    def returns_block_callback_strategy! # :nodoc:
+      @block_callback_strategy = :returns
+    end
+
+    def after_call_block_callback_strategy! # :nodoc:
+      @block_callback_strategy = :after_call
+    end
+
+    protected
+    def install_method_callback(block)
+      return unless block
+      case @block_callback_strategy
+      when :returns; returns(&block)
+      when :after_call; after_call(&block)
+      else raise "Unknown block_callback_strategy: #{@block_callback_strategy.inspect}"
+      end
+    end
   end
 end

data/lib/rr/scenario_definition_builder.rb

@@ -36,6 +36,7 @@ module RR
     end
     
     def probe!
+      @definition.after_call_block_callback_strategy!
       @definition.implemented_by_original_method
       @definition.after_call(&@handler) if @handler
     end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.3
 specification_version: 1
 name: rr
 version: !ruby/object:Gem::Version 
-  version: 0.3.9
-date: 2007-08-14 00:00:00 -07:00
+  version: 0.3.10
+date: 2007-08-18 00:00:00 -07:00
 summary: RR (Double Ruby) is a double framework that features a rich selection of double techniques and a terse syntax. http://xunitpatterns.com/Test%20Double.html
 require_paths: 
 - lib
@@ -72,6 +72,7 @@ files:
 - lib/rr/extensions/instance_methods.rb
 - examples/environment_fixture_setup.rb
 - examples/rspec_example_suite.rb
+- examples/core_example_suite.rb
 - examples/example_suite.rb
 - examples/example_helper.rb
 - examples/test_unit_example_suite.rb