@@ -1,3 +1,5 @@ +- Fixed DoubleDefinition chaining edge cases + * 0.6.1 - DoubleDefinitionCreatorProxy definition eval block is instance_evaled when the arity is not 1. When the arity is 1, the block is yielded with the DoubleDefinitionCreatorProxy passed in. CHANGES @@ -349,9 +349,9 @@ module RR def extract_subject_from_return_value(return_value) case return_value when DoubleDefinitions::DoubleDefinition - return_value.subject + return_value.root_subject when DoubleDefinitions::DoubleDefinitionCreatorProxy - return_value.__creator__.subject + return_value.__creator__.root_subject else return_value end lib/rr/double.rb @@ -7,6 +7,10 @@ module RR super() end + def root_subject + parent_double_definition.root_subject + end + def instance_of(*args) raise NoMethodError end lib/rr/double_definitions/child_double_definition_creator.rb @@ -41,6 +41,10 @@ module RR @subject = subject end + def root_subject + double_definition_creator.root_subject + end + module DefinitionConstructionMethods def with(*args, &return_value_block) @argument_expectation = Expectations::ArgumentEqualityExpectation.new(*args) lib/rr/double_definitions/double_definition.rb @@ -62,6 +62,10 @@ module RR @scope_strategy = Strategies::Scope::Instance.new(self) end + def root_subject + subject + end + module StrategySetupMethods def no_subject? subject.__id__ === NO_SUBJECT.__id__ lib/rr/double_definitions/double_definition_creator.rb @@ -36,6 +36,12 @@ describe "RR" do mock(subject).first(1) {mock!.second(2) {mock!.third(3) {4}}} subject.first(1).second(2).third(3).should == 4 + + mock(subject).first(1) {mock!.second(2).mock!.third(3) {4}} + subject.first(1).second(2).third(3).should == 4 + + mock(subject).first(1) {mock!.second(2).mock! {third(3) {4}}} + subject.first(1).second(2).third(3).should == 4 mock(subject).first(1).mock!.second(2).mock!.third(3) {4} subject.first(1).second(2).third(3).should == 4 spec/high_level_spec.rb @@ -11,6 +11,15 @@ module RR @parent_double_definition = DoubleDefinition.new(parent_double_definition_creator, parent_subject) @child_double_definition_creator = ChildDoubleDefinitionCreator.new(parent_double_definition) end + + describe "#root_subject" do + it "returns the #parent_double_definition.root_subject" do + child_subject = Object.new + parent_double_definition_creator.stub(parent_subject) + child_double_definition_creator.stub(child_subject) + child_double_definition_creator.root_subject.should == parent_subject + end + end describe "Strategies::Verification definitions" do describe "methods without !" do spec/rr/double_definitions/child_double_definition_creator_spec.rb @@ -9,6 +9,13 @@ module RR @subject = Object.new @creator = DoubleDefinitionCreator.new end + + describe "#root_subject" do + it "returns #subject" do + creator.stub(subject).foobar + creator.root_subject.should == subject + end + end describe "StrategySetupMethods" do describe "normal strategy definitions" do spec/rr/double_definitions/double_definition_creator_spec.rb @@ -3,16 +3,16 @@ require File.expand_path("#{File.dirname(__FILE__)}/../../spec_helper") module RR module DoubleDefinitions describe DoubleDefinition do - attr_reader :subject, :double_injection, :double, :definition + attr_reader :subject, :double_definition_creator, :double, :definition it_should_behave_like "Swapped Space" before do @subject = Object.new add_original_method - @double_injection = Space.instance.double_injection(subject, :foobar) - @double = new_double(double_injection) - @definition = double.definition + @double_definition_creator = DoubleDefinitionCreator.new + @definition = double_definition_creator.stub(subject).foobar + @double = definition.double end def add_original_method @@ -20,6 +20,13 @@ module RR :original_return_value end end + + describe "#root_subject" do + it "returns #double_definition_creator.root_subject" do + definition.root_subject.should == definition.double_definition_creator.root_subject + definition.root_subject.should == subject + end + end describe "DefinitionConstructionMethods" do macro("DoubleDefinition where #double_definition_creator is a Reimplementation") do @@ -1009,8 +1016,9 @@ module RR end describe "#exact_match?" do - context "when no expectation set" do + context "when no argument_expectation set" do it "raises a DoubleDefinitionError" do + definition.argument_expectation = nil lambda do definition.exact_match? end.should raise_error(Errors::DoubleDefinitionError) @@ -1036,8 +1044,9 @@ module RR end describe "#wildcard_match?" do - context "when no expectation is set" do + context "when no #argument_expectation is set" do it "raises a DoubleDefinitionError" do + definition.argument_expectation = nil lambda do definition.wildcard_match? end.should raise_error(Errors::DoubleDefinitionError) @@ -1087,7 +1096,7 @@ module RR context "when there is not times_matcher" do it "raises a DoubleDefinitionError" do - definition.times_matcher.should be_nil + definition.times_matcher = nil lambda do definition.terminal? end.should raise_error(Errors::DoubleDefinitionError) @@ -1105,7 +1114,7 @@ module RR context "when there is no argument expectation" do it "returns an empty array" do - definition.argument_expectation.should be_nil + definition.argument_expectation = nil definition.expected_arguments.should == [] end end spec/rr/double_definitions/double_definition_spec.rb a35296c8f719f3b87dc118e37cc03a783d5a788b Brian Takita btakita@btakita-laptop.(none) http://github.com/btakita/rr/commit/e33239dd614e3a3d434419afaaf898eabfbce0cd e33239dd614e3a3d434419afaaf898eabfbce0cd 2008-10-27T22:19:56-07:00 2008-10-27T22:19:56-07:00 - Fixed DoubleDefinition chaining edge cases 391b035a451b864014d5a6b6726d527333a05030 Brian Takita btakita@btakita-laptop.(none)