rr 0.6.0 → 0.7.0

data/spec/rr/adapters/rr_methods_space_spec.rb

@@ -74,8 +74,8 @@ module RR
             RR::DoubleDefinitions::DoubleDefinition.new(creator = RR::DoubleDefinitions::DoubleDefinitionCreator.new, subject_2)
           )
 
-          double_1.ordered
-          double_2.ordered
+          double_1.definition.ordered
+          double_2.definition.ordered
 
           space.ordered_doubles.should_not be_empty
 

data/spec/rr/double_definitions/child_double_definition_creator_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

data/spec/rr/double_definitions/double_definition_creator_proxy_spec.rb

@@ -46,34 +46,106 @@ module RR
           end
         end
 
-        context "with block" do
-          before do
-            @the_proxy = DoubleDefinitionCreatorProxy.new(creator) do |b|
-              b.foobar(1, 2) {:one_two}
-              b.foobar(1) {:one}
-              b.foobar.with_any_args {:default}
-              b.baz() {:baz_result}
+        context "when passed a block" do
+          macro("calls the block to define the Doubles") do
+            send "initializes proxy with passed in creator"
+
+            it "creates double_injections" do
+              subject.foobar(1, 2).should == :one_two
+              subject.foobar(1).should == :one
+              subject.foobar(:something).should == :default
+              subject.baz.should == :baz_result
+            end
+
+            it "clears out all methods from proxy" do
+              proxy_subclass = Class.new(DoubleDefinitionCreatorProxy) do
+                def i_should_be_a_double
+                end
+              end
+              proxy_subclass.instance_methods.map {|m| m.to_s}.should include('i_should_be_a_double')
+
+              proxy_subclass.new(creator) do |m|
+                m.i_should_be_a_double.should be_instance_of(DoubleDefinition)
+              end
             end
           end
 
-          send "initializes proxy with passed in creator"
+          context "when the block has an arity of 1" do
+            attr_reader :passed_in_argument
+            before do
+              passed_in_argument = nil
+              block = lambda do |b|
+                passed_in_argument = b
+                b.foobar(1, 2) {:one_two}
+                b.foobar(1) {:one}
+                b.foobar.with_any_args {:default}
+                b.baz() {:baz_result}
+              end
+              block.arity.should == 1
+
+              @the_proxy = DoubleDefinitionCreatorProxy.new(creator, &block)
+              @passed_in_argument = passed_in_argument
+            end
+
+            send("calls the block to define the Doubles")
 
-          it "creates double_injections" do
-            subject.foobar(1, 2).should == :one_two
-            subject.foobar(1).should == :one
-            subject.foobar(:something).should == :default
-            subject.baz.should == :baz_result
+            it "passes the self into the block" do
+              passed_in_argument.__creator__.should == creator
+            end
           end
 
-          it "clears out all methods from proxy" do
-            proxy_subclass = Class.new(DoubleDefinitionCreatorProxy) do
-              def i_should_be_a_double
+          context "when the block has an arity of -1" do
+            attr_reader :self_value, :passed_in_arguments
+            before do
+              self_value = nil
+              passed_in_arguments = nil
+              block = lambda do |*args|
+                self_value = self
+                passed_in_arguments = args
+                args[0].foobar(1, 2) {:one_two}
+                args[0].foobar(1) {:one}
+                args[0].foobar.with_any_args {:default}
+                args[0].baz() {:baz_result}
               end
+              block.arity.should == -1
+
+              @the_proxy = DoubleDefinitionCreatorProxy.new(creator, &block)
+              @self_value = self_value
+              @passed_in_arguments = passed_in_arguments
             end
-            proxy_subclass.instance_methods.map {|m| m.to_s}.should include('i_should_be_a_double')
 
-            proxy_subclass.new(creator) do |m|
-              m.i_should_be_a_double.should be_instance_of(DoubleDefinition)
+            send("calls the block to define the Doubles")
+
+            it "passes the self into the block" do
+              passed_in_arguments.map {|a| a.__creator__}.should == [creator]
+            end
+
+            it "evaluates the block with the context of self" do
+              self_value.__creator__.should == creator
+            end
+          end
+
+          context "when the block has an arity of 0" do
+            attr_reader :self_value
+            before do
+              self_value = nil
+              block = lambda do ||
+                self_value = self
+                foobar(1, 2) {:one_two}
+                foobar(1) {:one}
+                foobar.with_any_args {:default}
+                baz() {:baz_result}
+              end
+              block.arity.should == 0
+
+              @the_proxy = DoubleDefinitionCreatorProxy.new(creator, &block)
+              @self_value = self_value
+            end
+
+            send("calls the block to define the Doubles")
+
+            it "evaluates the block with the context of self" do
+              self_value.__creator__.should == creator
             end
           end
         end

data/spec/rr/double_definitions/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

data/spec/rr/double_definitions/double_definition_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
@@ -888,6 +895,18 @@ module RR
             definition.should be_verbose
           end
         end
+
+        describe "#verify_method_signature" do
+          it "sets #verify_method_signature? to true" do
+            definition.verify_method_signature?.should be_false
+            definition.verify_method_signature
+            definition.verify_method_signature?.should be_true
+          end
+
+          it "returns self" do
+            definition.verify_method_signature.should == definition
+          end
+        end
       end
 
       describe "NestedDoubleCreationMethods" do
@@ -896,7 +915,7 @@ module RR
           RR.verify(ChildDoubleDefinitionCreator)
           RR.verify(child_double_definition_creator)
         end
-        
+
         describe "#mock" do
           it "instantiates a ChildDoubleDefinitionCreator with self and delegates to its #mock method with the passed-in arguments and block" do
             child_subject = Object.new
@@ -905,7 +924,7 @@ module RR
               mock.proxy(child_double_definition_creator).mock(child_subject, :baz)
               child_double_definition_creator = child_double_definition_creator
             end
-            
+
             definition.mock(child_subject, :baz)
             @child_double_definition_creator = child_double_definition_creator
           end
@@ -999,6 +1018,28 @@ module RR
             end.should raise_error(Errors::DoubleDefinitionError)
           end
         end
+
+        describe "#strong" do
+          it "instantiates a ChildDoubleDefinitionCreator with self and delegates to its #strong method with the passed-in arguments and block" do
+            child_subject = Object.new
+            child_double_definition_creator = nil
+            mock.proxy(ChildDoubleDefinitionCreator).new(definition) do |child_double_definition_creator|
+              mock.proxy(child_double_definition_creator).strong(DoubleDefinitionCreator::NO_SUBJECT, nil)
+              child_double_definition_creator = child_double_definition_creator
+            end
+
+            definition.strong.mock(child_subject)
+            @child_double_definition_creator = child_double_definition_creator
+          end
+        end
+
+        describe "#strong!" do
+          it "raises a DoubleDefinitionError" do
+            lambda do
+              definition.strong!(:baz)
+            end.should raise_error(Errors::DoubleDefinitionError)
+          end
+        end
       end
 
       describe "StateQueryMethods" do
@@ -1009,8 +1050,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 +1078,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 +1130,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 +1148,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

data/spec/rr/double_injection/double_injection_dispatching_spec.rb

@@ -16,7 +16,7 @@ module RR
         DoubleDefinitions::DoubleDefinition.new(
           DoubleDefinitions::DoubleDefinitionCreator.new,
           subject
-        )
+        ).any_number_of_times
       )
     end
 
@@ -34,7 +34,7 @@ module RR
             end
           end
           double = new_double
-          double.with(1, 2).implemented_by(method_fixture.method(:method_with_block))
+          double.definition.with(1, 2).implemented_by(method_fixture.method(:method_with_block))
           subject.foobar(1, 2) {|a, b| [b, a]}.should == [2, 1]
         end
       end
@@ -42,11 +42,11 @@ module RR
       context "when no other Double with duplicate ArgumentExpectations exists" do
         it "dispatches to Double that have an exact match" do
           double1_with_exact_match = new_double
-          double1_with_exact_match.with(:exact_match_1).returns {:return_1}
+          double1_with_exact_match.definition.with(:exact_match_1).returns {:return_1}
           double_with_no_match = new_double
-          double_with_no_match.with("nothing that matches").returns {:no_match}
+          double_with_no_match.definition.with("nothing that matches").returns {:no_match}
           double2_with_exact_match = new_double
-          double2_with_exact_match.with(:exact_match_2).returns {:return_2}
+          double2_with_exact_match.definition.with(:exact_match_2).returns {:return_2}
 
           subject.foobar(:exact_match_1).should == :return_1
           subject.foobar(:exact_match_2).should == :return_2
@@ -54,9 +54,9 @@ module RR
 
         it "dispatches to Double that have a wildcard match" do
           double_with_wildcard_match = new_double
-          double_with_wildcard_match.with_any_args.returns {:wild_card_value}
+          double_with_wildcard_match.definition.with_any_args.returns {:wild_card_value}
           double_with_no_match = new_double
-          double_with_no_match.with("nothing that matches").returns {:no_match}
+          double_with_no_match.definition.with("nothing that matches").returns {:no_match}
 
           subject.foobar(:wildcard_match_1).should == :wild_card_value
           subject.foobar(:wildcard_match_2, 3).should == :wild_card_value
@@ -66,10 +66,10 @@ module RR
       context "when other Doubles exists but none of them match the passed-in arguments" do
         it "raises DoubleNotFoundError error when arguments do not match a double" do
           double_1 = new_double
-          double_1.with(1, 2)
+          double_1.definition.with(1, 2)
 
           double_2 = new_double
-          double_2.with(3)
+          double_2.definition.with(3)
 
           error = nil
           begin
@@ -122,7 +122,7 @@ module RR
 
         def new_double(*arguments, &return_value)
           double = super()
-          double.with(*arguments).any_number_of_times.returns(&return_value)
+          double.definition.with(*arguments).any_number_of_times.returns(&return_value)
           double.should_not be_terminal
           double
         end
@@ -164,7 +164,7 @@ module RR
 
         def new_double(*arguments, &return_value)
           double = super()
-          double.with(*arguments).once.returns(&return_value)
+          double.definition.with(*arguments).once.returns(&return_value)
           double.should be_terminal
           double
         end
@@ -206,7 +206,7 @@ module RR
 
         def new_double(&return_value)
           double = super
-          double.with_any_args.once.returns(&return_value)
+          double.definition.with_any_args.once.returns(&return_value)
           double.should be_terminal
           double
         end
@@ -221,11 +221,10 @@ module RR
       context "when the original method uses the passed-in block" do
         it "executes the block" do
           double = new_double
-          double.with(1, 2) {:return_value}
+          double.definition.with(1, 2) {:return_value}
           subject.foobar!(1, 2).should == :return_value
         end
       end
-
     end
 
     describe "method names with ?" do
@@ -236,7 +235,7 @@ module RR
       context "when the original method uses the passed-in block" do
         it "executes the block" do
           double = new_double
-          double.with(1, 2) {:return_value}
+          double.definition.with(1, 2) {:return_value}
           subject.foobar?(1, 2).should == :return_value
         end
       end

data/spec/rr/double_injection/double_injection_verify_spec.rb

@@ -19,7 +19,7 @@ module RR
         )
         double_injection.register_double double
 
-        double.with(1).once.returns {nil}
+        double.definition.with(1).once.returns {nil}
         lambda {double_injection.verify}.should raise_error(Errors::TimesCalledError)
         subject.foobar(1)
         lambda {double_injection.verify}.should_not raise_error

data/spec/rr/double_spec.rb

@@ -11,7 +11,9 @@ module RR
       end
       @double_injection = create_double_injection
       @definition_creator = DoubleDefinitions::DoubleDefinitionCreator.new
-      @definition = DoubleDefinitions::DoubleDefinition.new(definition_creator, subject)
+      @definition = DoubleDefinitions::DoubleDefinition.new(definition_creator, subject).
+        any_number_of_times.
+        with_any_args
       @double = Double.new(double_injection, definition)
     end
 
@@ -25,409 +27,16 @@ module RR
       end
     end
 
-    describe "#with" do
-      it "returns DoubleDefinition" do
-        double.with(1).should === double.definition
-      end
-
-      it "sets an ArgumentEqualityExpectation" do
-        double.with(1)
-        double.should be_exact_match(1)
-        double.should_not be_exact_match(2)
-      end
-
-      it "sets return value when block passed in" do
-        double.with(1) {:return_value}
-        subject.foobar(1).should == :return_value
-      end
-    end
-
-    describe "#with_any_args" do
-      before do
-        double.with_any_args {:return_value}
-      end
-
-      it "returns DoubleDefinition" do
-        double.with_no_args.should === double.definition
-      end
-
-      it "sets an AnyArgumentExpectation" do
-        double.should_not be_exact_match(1)
-        double.should be_wildcard_match(1)
-      end
-
-      it "sets return value when block passed in" do
-        subject.foobar(:anything).should == :return_value
-      end
-    end
-
-    describe "#with_no_args" do
-      before do
-        double.with_no_args {:return_value}
-      end
-
-      it "returns DoubleDefinition" do
-        double.with_no_args.should === double.definition
-      end
-
-      it "sets an ArgumentEqualityExpectation with no arguments" do
-        double.argument_expectation.should == Expectations::ArgumentEqualityExpectation.new()
-      end
-
-      it "sets return value when block passed in" do
-        subject.foobar().should == :return_value
-      end
-    end
-
-    describe "#never" do
-      it "returns DoubleDefinition" do
-        double.never.should === double.definition
-      end
-
-      it "sets up a Times Called Expectation with 0" do
-        double.never
-        lambda {double.call(double_injection)}.should raise_error(Errors::TimesCalledError)
-      end
-
-      it "sets return value when block passed in" do
-        double.with_any_args.never
-        lambda {double.call(double_injection)}.should raise_error(Errors::TimesCalledError)
-      end
-    end
-
-    describe "#once" do
-      it "returns DoubleDefinition" do
-        double.once.should === double.definition
-      end
-
-      it "sets up a Times Called Expectation with 1" do
-        double.once
-        double.call(double_injection)
-        lambda {double.call(double_injection)}.should raise_error(Errors::TimesCalledError)
-      end
-
-      it "sets return value when block passed in" do
-        double.with_any_args.once {:return_value}
-        subject.foobar.should == :return_value
-      end
-    end
-
-    describe "#twice" do
-      it "returns DoubleDefinition" do
-        double.twice.should === double.definition
-      end
-
-      it "sets up a Times Called Expectation with 2" do
-        double.twice
-        double.call(double_injection)
-        double.call(double_injection)
-        lambda {double.call(double_injection)}.should raise_error(Errors::TimesCalledError)
-      end
-
-      it "sets return value when block passed in" do
-        double.with_any_args.twice {:return_value}
-        subject.foobar.should == :return_value
-      end
-    end
-
-    describe "#at_least" do
-      it "returns DoubleDefinition" do
-        double.with_any_args.at_least(2).should === double.definition
-      end
-
-      it "sets up a AtLeastMatcher with 2" do
-        double.at_least(2)
-        double.definition.times_matcher.should == TimesCalledMatchers::AtLeastMatcher.new(2)
-      end
-
-      it "sets return value when block passed in" do
-        double.with_any_args.at_least(2) {:return_value}
-        subject.foobar.should == :return_value
-      end
-    end
-
-    describe "#at_most" do
-      it "returns DoubleDefinition" do
-        double.with_any_args.at_most(2).should === double.definition
-      end
-
-      it "sets up a Times Called Expectation with 1" do
-        double.at_most(2)
-        double.call(double_injection)
-        double.call(double_injection)
-        lambda do
-          double.call(double_injection)
-        end.should raise_error(
-        Errors::TimesCalledError,
-        "foobar()\nCalled 3 times.\nExpected at most 2 times."
-        )
-      end
-
-      it "sets return value when block passed in" do
-        double.with_any_args.at_most(2) {:return_value}
-        subject.foobar.should == :return_value
-      end
-    end
-
-    describe "#times" do
-      it "returns DoubleDefinition" do
-        double.times(3).should === double.definition
-      end
-
-      it "sets up a Times Called Expectation with passed in times" do
-        double.times(3)
-        double.call(double_injection)
-        double.call(double_injection)
-        double.call(double_injection)
-        lambda {double.call(double_injection)}.should raise_error(Errors::TimesCalledError)
-      end
-
-      it "sets return value when block passed in" do
-        double.with_any_args.times(3) {:return_value}
-        subject.foobar.should == :return_value
-      end
-    end
-
-    describe "#any_number_of_times" do
-      it "returns DoubleDefinition" do
-        double.any_number_of_times.should === double.definition
-      end
-
-      it "sets up a Times Called Expectation with AnyTimes matcher" do
-        double.any_number_of_times
-        double.times_matcher.should == TimesCalledMatchers::AnyTimesMatcher.new
-      end
-
-      it "sets return value when block passed in" do
-        double.with_any_args.any_number_of_times {:return_value}
-        subject.foobar.should == :return_value
-      end
-    end
-
-    describe "#ordered" do
-      it "adds itself to the ordered doubles list" do
-        double.ordered
-        space.ordered_doubles.should include(double)
-      end
-
-      it "does not double_injection add itself" do
-        double.ordered
-        double.ordered
-        space.ordered_doubles.should == [double ]
-      end
-
-      it "sets ordered? to true" do
-        double.ordered
-        double.should be_ordered
-      end
-
-      it "sets return value when block passed in" do
-        double.with_any_args.once.ordered {:return_value}
-        subject.foobar.should == :return_value
-      end
-    end
-
     describe "#ordered?" do
       it "defaults to false" do
         double.should_not be_ordered
       end
     end
 
-    describe "#yields" do
-      it "returns DoubleDefinition" do
-        double.yields(:baz).should === double.definition
-      end
-
-      it "yields the passed in argument to the call block when there is no returns value set" do
-        double.with_any_args.yields(:baz)
-        passed_in_block_arg = nil
-        subject.foobar {|arg| passed_in_block_arg = arg}.should == nil
-        passed_in_block_arg.should == :baz
-      end
-
-      it "yields the passed in argument to the call block when there is a no returns value set" do
-        double.with_any_args.yields(:baz).returns(:return_value)
-
-        passed_in_block_arg = nil
-        subject.foobar {|arg| passed_in_block_arg = arg}.should == :return_value
-        passed_in_block_arg.should == :baz
-      end
-
-      it "sets return value when block passed in" do
-        double.with_any_args.yields {:return_value}
-        subject.foobar {}.should == :return_value
-      end
-    end
-
-    describe "#after_call" do
-      it "returns DoubleDefinition" do
-        double.after_call {}.should === double.definition
-      end
-
-      it "sends return value of Double implementation to after_call" do
-        return_value = {}
-        double.returns(return_value).after_call do |value|
-          value[:foo] = :bar
-          value
-        end
-
-        actual_value = double.call(double_injection)
-        actual_value.should === return_value
-        actual_value.should == {:foo => :bar}
-      end
-
-      it "receives the return value in the after_call callback" do
-        return_value = :returns_value
-        double.returns(return_value).after_call do |value|
-          :after_call_proc
-        end
-
-        actual_value = double.call(double_injection)
-        actual_value.should == :after_call_proc
-      end
-
-      it "allows after_call to mock the return value" do
-        return_value = Object.new
-        double.with_any_args.returns(return_value).after_call do |value|
-          mock(value).inner_method(1) {:baz}
-          value
-        end
-
-        subject.foobar.inner_method(1).should == :baz
-      end
-
-      it "raises an error when not passed a block" do
-        lambda do
-          double.after_call
-        end.should raise_error(ArgumentError, "after_call expects a block")
-      end
-    end
-
-    describe "#verbose" do
-      it "returns DoubleDefinition" do
-        double.verbose.should === double.definition
-      end
-
-      it "sets #verbose? to true" do
-        double.should_not be_verbose
-        double.verbose
-        double.should be_verbose
-      end
-
-      it "sets return value when block passed in" do
-        (class << double; self; end).__send__(:define_method, :puts) {|value|}
-        double.with().verbose {:return_value}
-        subject.foobar.should == :return_value
-      end
-    end
-
-    describe "#returns" do
-      it "returns DoubleDefinition" do
-        double.returns {:baz}.should === double.definition
-        double.returns(:baz).should === double.definition
-      end
-
-      context "when passed a block" do
-        context "when the block returns a DoubleDefinition" do
-          it "causes #call to return the #subject of the DoubleDefinition" do
-            new_subject = Object.new
-            double.returns do
-              definition = stub(new_subject).foobar
-              definition.class.should == DoubleDefinitions::DoubleDefinition
-              definition
-            end
-            double.call(double_injection).should == new_subject
-          end
-        end
-
-        context "when the block returns a DoubleDefinitionCreatorProxy" do
-          it "causes #call to return the #subject of the DoubleDefinition" do
-            new_subject = Object.new
-            double.returns do
-              stub(new_subject)
-            end
-            double.call(double_injection).should == new_subject
-          end
-        end
-
-        context "when the block returns an Object" do
-          it "causes #call to return the value of the block" do
-            double.returns {:baz}
-            double.call(double_injection).should == :baz
-          end          
-        end
-      end
-
-      context "when passed a return value argument" do
-        context "when passed a DoubleDefinition" do
-          it "causes #call to return the #subject of the DoubleDefinition" do
-            new_subject = Object.new
-            definition = stub(new_subject).foobar
-            definition.class.should == DoubleDefinitions::DoubleDefinition
-            
-            double.returns(definition)
-            double.call(double_injection).should == new_subject
-          end
-        end
-
-        context "when passed a DoubleDefinitionCreatorProxy" do
-          it "causes #call to return the #subject of the DoubleDefinition" do
-            new_subject = Object.new
-            proxy = stub(new_subject)
-            proxy.__creator__.subject.should == new_subject
-
-            double.returns(proxy)
-            double.call(double_injection).should == new_subject
-          end
-        end
-
-        context "when passed an Object" do
-          it "causes #call to return the Object" do
-            double.returns(:baz)
-            double.call(double_injection).should == :baz
-          end
-        end
-
-        context "when passed false" do
-          it "causes #call to return false" do
-            double.returns(false)
-            double.call(double_injection).should == false
-          end
-        end        
-      end
-
-      context "when passed both a return value argument and a block" do
-        it "raises an error" do
-          lambda do
-            double.returns(:baz) {:another}
-          end.should raise_error(ArgumentError, "returns cannot accept both an argument and a block")
-        end
-      end
-    end
-
-    describe "#implemented_by" do
-      it "returns the DoubleDefinition" do
-        double.implemented_by(lambda{:baz}).should === double.definition
-      end
-
-      it "sets the implementation to the passed in Proc" do
-        double.implemented_by(lambda{:baz})
-        double.call(double_injection).should == :baz
-      end
-
-      it "sets the implementation to the passed in method" do
-        def subject.foobar(a, b)
-          [b, a]
-        end
-        double.implemented_by(subject.method(:foobar))
-        double.call(double_injection, 1, 2).should == [2, 1]
-      end
-    end
-
     describe "#call" do
       describe "when verbose" do
         it "prints the message call" do
-          double.verbose
+          double.definition.verbose
           output = nil
           (class << double; self; end).__send__(:define_method, :puts) do |output|
             output = output
@@ -450,12 +59,12 @@ module RR
 
       describe "when implemented by a lambda" do
         it "calls the return lambda when implemented by a lambda" do
-          double.returns {|arg| "returning #{arg}"}
+          double.definition.returns {|arg| "returning #{arg}"}
           double.call(double_injection, :foobar).should == "returning foobar"
         end
 
         it "calls and returns the after_call when after_call is set" do
-          double.returns {|arg| "returning #{arg}"}.after_call do |value|
+          double.definition.returns {|arg| "returning #{arg}"}.after_call do |value|
             "#{value} after call"
           end
           double.call(double_injection, :foobar).should == "returning foobar after call"
@@ -466,12 +75,12 @@ module RR
         end
 
         it "works when times_called is not set" do
-          double.returns {:value}
+          double.definition.returns {:value}
           double.call(double_injection)
         end
 
         it "verifes the times_called does not exceed the TimesCalledExpectation" do
-          double.times(2).returns {:value}
+          double.definition.times(2).returns {:value}
 
           double.call(double_injection, :foobar)
           double.call(double_injection, :foobar)
@@ -482,8 +91,8 @@ module RR
           double1 = double
           double2 = Double.new(double_injection, DoubleDefinitions::DoubleDefinition.new(definition_creator, subject))
 
-          double1.with(1).returns {:return_1}.once.ordered
-          double2.with(2).returns {:return_2}.once.ordered
+          double1.definition.with(1).returns {:return_1}.once.ordered
+          double2.definition.with(2).returns {:return_2}.once.ordered
 
           lambda do
             subject.foobar(2)
@@ -506,7 +115,7 @@ module RR
             end
           end
 
-          double.returns {:value}.ordered
+          double.definition.returns {:value}.ordered
           double.call(double_injection, :foobar)
           verify_ordered_double_called.should be_true
           passed_in_double.should === double
@@ -521,27 +130,27 @@ module RR
             end
           end
 
-          double.returns {:value}
+          double.definition.returns {:value}
           double.call(double_injection, :foobar)
           verify_ordered_double_called.should be_false
         end
 
         it "does not add block argument if no block passed in" do
-          double.with(1, 2).returns {|*args| args}
+          double.definition.with(1, 2).returns {|*args| args}
 
           args = subject.foobar(1, 2)
           args.should == [1, 2]
         end
 
         it "makes the block the last argument" do
-          double.with(1, 2).returns {|a, b, blk| blk}
+          double.definition.with(1, 2).returns {|a, b, blk| blk}
 
           block = subject.foobar(1, 2) {|a, b| [b, a]}
           block.call(3, 4).should == [4, 3]
         end
 
         it "raises ArgumentError when yields was called and no block passed in" do
-          double.with(1, 2).yields(55)
+          double.definition.with(1, 2).yields(55)
 
           lambda do
             subject.foobar(1, 2)
@@ -555,7 +164,7 @@ module RR
             yield(a, b)
           end
 
-          double.with(1, 2).implemented_by(subject.method(:foobar))
+          double.definition.with(1, 2).implemented_by(subject.method(:foobar))
 
           subject.foobar(1, 2) {|a, b| [b, a]}.should == [2, 1]
         end
@@ -565,6 +174,7 @@ module RR
     describe "#exact_match?" do
       context "when no expectation is set" do
         it "raises a DoubleDefinitionError" do
+          double.definition.argument_expectation = nil
           lambda do
             double.exact_match?
           end.should raise_error(Errors::DoubleDefinitionError)
@@ -573,7 +183,7 @@ module RR
 
       context "when arguments are not an exact match" do
         it "returns false" do
-          double.with(1, 2, 3)
+          double.definition.with(1, 2, 3)
           double.should_not be_exact_match(1, 2)
           double.should_not be_exact_match(1)
           double.should_not be_exact_match()
@@ -583,7 +193,7 @@ module RR
 
       context "when arguments are an exact match" do
         it "returns true" do
-          double.with(1, 2, 3)
+          double.definition.with(1, 2, 3)
           double.should be_exact_match(1, 2, 3)
         end
       end
@@ -592,6 +202,7 @@ module RR
     describe "#wildcard_match?" do
       context "when no expectation set" do
         it "raises a DoubleDefinitionError" do
+          double.definition.argument_expectation = nil
           lambda do
             double.wildcard_match?
           end.should raise_error(Errors::DoubleDefinitionError)
@@ -600,7 +211,7 @@ module RR
 
       context "when arguments are an exact match" do
         it "returns true" do
-          double.with(1, 2, 3)
+          double.definition.with(1, 2, 3)
           double.should be_wildcard_match(1, 2, 3)
           double.should_not be_wildcard_match(1, 2)
           double.should_not be_wildcard_match(1)
@@ -611,7 +222,7 @@ module RR
 
       context "when with_any_args" do
         it "returns true" do
-          double.with_any_args
+          double.definition.with_any_args
 
           double.should be_wildcard_match(1, 2, 3)
           double.should be_wildcard_match(1, 2)
@@ -623,31 +234,39 @@ module RR
     end
 
     describe "#attempt?" do
-      it "returns true when TimesCalledExpectation#attempt? is true" do
-        double.with(1, 2, 3).twice
-        double.call(double_injection, 1, 2, 3)
-        double.times_called_expectation.should be_attempt
-        double.should be_attempt
+      context "when TimesCalledExpectation#attempt? is true" do
+        it "returns true" do
+          double.definition.with(1, 2, 3).twice
+          double.call(double_injection, 1, 2, 3)
+          double.times_called_expectation.should be_attempt
+          double.should be_attempt
+        end
       end
 
-      it "returns false when TimesCalledExpectation#attempt? is true" do
-        double.with(1, 2, 3).twice
-        double.call(double_injection, 1, 2, 3)
-        double.call(double_injection, 1, 2, 3)
-        double.times_called_expectation.should_not be_attempt
-        double.should_not be_attempt
+      context "when TimesCalledExpectation#attempt? is true" do
+        it "returns false" do
+          double.definition.with(1, 2, 3).twice
+          double.call(double_injection, 1, 2, 3)
+          double.call(double_injection, 1, 2, 3)
+          double.times_called_expectation.should_not be_attempt
+          double.should_not be_attempt
+        end
       end
 
-      it "returns true when there is no Times Called expectation" do
-        double.with(1, 2, 3)
-        double.definition.times_matcher.should be_nil
-        double.should be_attempt
+      context "when there is no Times Called expectation" do
+        it "raises a DoubleDefinitionError" do
+          double.definition.with(1, 2, 3)
+          double.definition.times_matcher = nil
+          lambda do
+            double.should be_attempt
+          end.should raise_error(RR::Errors::DoubleDefinitionError)
+        end
       end
     end
 
     describe "#verify" do
       it "verifies that times called expectation was met" do
-        double.twice.returns {:return_value}
+        double.definition.twice.returns {:return_value}
 
         lambda {double.verify}.should raise_error(Errors::TimesCalledError)
         double.call(double_injection)
@@ -667,21 +286,29 @@ module RR
     end
 
     describe "#terminal?" do
-      it "returns true when times_called_expectation's terminal? is true" do
-        double.once
-        double.times_called_expectation.should be_terminal
-        double.should be_terminal
+      context "when times_called_expectation's terminal? is true" do
+        it "returns true" do
+          double.definition.once
+          double.times_called_expectation.should be_terminal
+          double.should be_terminal
+        end
       end
 
-      it "returns false when times_called_expectation's terminal? is false" do
-        double.any_number_of_times
-        double.times_called_expectation.should_not be_terminal
-        double.should_not be_terminal
+      context "when times_called_expectation's terminal? is false" do
+        it "returns false" do
+          double.definition.any_number_of_times
+          double.times_called_expectation.should_not be_terminal
+          double.should_not be_terminal
+        end
       end
 
-      it "returns false when there is no times_matcher" do
-        double.definition.times_matcher.should be_nil
-        double.should_not be_terminal
+      context "when there is no times_matcher" do
+        it "raises a DoubleDefinitionError" do
+          double.definition.times_matcher = nil
+          lambda do
+            double.should_not be_terminal
+          end.should raise_error(RR::Errors::DoubleDefinitionError)
+        end
       end
     end
 
@@ -693,14 +320,21 @@ module RR
     end
 
     describe "#expected_arguments" do
-      it "returns argument expectation's expected_arguments when there is a argument expectation" do
-        double.with(1, 2)
-        double.expected_arguments.should == [1, 2]
+      context "when there is an argument expectation" do
+        it "returns argument expectation's expected_arguments" do
+          double.definition.with(1, 2)
+          double.definition.argument_expectation.should_not be_nil
+          double.expected_arguments.should == [1, 2]
+        end
       end
 
-      it "returns an empty array when there is no argument expectation" do
-        double.argument_expectation.should be_nil
-        double.expected_arguments.should == []
+      context "when there is no argument expectation" do
+        it "raises an DoubleDefinitionError" do
+          double.definition.argument_expectation = nil
+          lambda do
+            double.expected_arguments
+          end.should raise_error(Errors::DoubleDefinitionError)
+        end
       end
     end
 
@@ -710,7 +344,7 @@ module RR
       end
 
       it "renders the formatted name of the Double with arguments" do
-        double.with(1, 2)
+        double.definition.with(1, 2)
         double.formatted_name.should == "foobar(1, 2)"
       end
     end