rr 0.10.10 → 0.10.11

data/spec/rr/double_injection/double_injection_verify_spec.rb

@@ -9,13 +9,13 @@ module RR
         @subject = Object.new
         @method_name = :foobar
         subject.methods.should_not include(method_name.to_s)
-        @double_injection = space.double_injection(subject, method_name)
+        @double_injection = Injections::DoubleInjection.create(subject, method_name)
       end
 
       it "verifies each double was met" do
         double = RR::Double.new(
           double_injection,
-          RR::DoubleDefinitions::DoubleDefinition.new(RR::DoubleDefinitions::DoubleDefinitionCreator.new, subject)
+          RR::DoubleDefinitions::DoubleDefinition.new(RR::DoubleDefinitions::DoubleDefinitionCreate.new)
         )
         double_injection.register_double double
 

data/spec/rr/expectations/times_called_expectation/times_called_expectation_any_times_spec.rb

@@ -5,39 +5,15 @@ module RR
     describe TimesCalledExpectation do
       context "when using an AnyTimesMatcher" do
         it_should_behave_like "RR::Expectations::TimesCalledExpectation"
-        attr_reader :matcher, :expectation
-
-        before do
-          double.definition.any_number_of_times
-          @matcher = double.definition.times_matcher
-          @expectation = TimesCalledExpectation.new(double)
-        end
 
         describe "#verify!" do
           it "always passes" do
-            expectation.verify!
-            10.times {expectation.attempt}
-            expectation.verify!
-          end
-        end
-
-        describe "#attempt?" do
-          it "always returns true" do
-            expectation.should be_attempt
-            10.times {expectation.attempt}
-            expectation.should be_attempt
-          end
-        end
-
-        describe "#attempt!" do
-          it "always passes" do
-            10.times {expectation.attempt}
-          end
-        end
+            stub(subject).foobar.any_number_of_times
+            RR.verify
 
-        describe "#terminal?" do
-          it "returns false" do
-            expectation.should_not be_terminal
+            stub(subject).foobar.any_number_of_times
+            10.times {subject.foobar}
+            RR.verify
           end
         end
       end

data/spec/rr/expectations/times_called_expectation/times_called_expectation_at_least_spec.rb

@@ -5,64 +5,32 @@ module RR
     describe TimesCalledExpectation do
       context "when using an AtLeastMatcher" do
         it_should_behave_like "RR::Expectations::TimesCalledExpectation"
-        attr_reader :times, :at_least, :expectation
 
         before do
-          @times = 3
-          double.definition.at_least(times)
-          @at_least = double.definition.times_matcher
-          @expectation = TimesCalledExpectation.new(double)
+          mock(subject).foobar.at_least(3)
         end
 
         describe "#verify!" do
           it "passes when times called > times" do
-            4.times {expectation.attempt}
-            expectation.verify!
+            4.times {subject.foobar}
+            RR.verify
           end
 
           it "passes when times called == times" do
-            3.times {expectation.attempt}
-            expectation.verify!
+            3.times {subject.foobar}
+            RR.verify
           end
 
           it "raises error when times called < times" do
-            expectation.attempt
+            subject.foobar
             lambda do
-              expectation.verify!
+              RR.verify
             end.should raise_error(
             RR::Errors::TimesCalledError,
             "foobar()\nCalled 1 time.\nExpected at least 3 times."
             )
           end
         end
-
-        describe "#attempt?" do
-          it "always returns true" do
-            expectation.should be_attempt
-            10.times {expectation.attempt}
-            expectation.should be_attempt
-          end
-        end
-
-        describe "#attempt!" do
-          it "passes when times called more than times" do
-            4.times {expectation.attempt}
-          end
-
-          it "passes when times called == times" do
-            3.times {expectation.attempt}
-          end
-
-          it "passes when times called < times" do
-            expectation.attempt
-          end
-        end
-
-        describe "#terminal?" do
-          it "returns false" do
-            expectation.should_not be_terminal
-          end
-        end
       end
     end
   end

data/spec/rr/expectations/times_called_expectation/times_called_expectation_at_most_spec.rb

@@ -5,64 +5,36 @@ module RR
     describe TimesCalledExpectation do
       context "when using an AtMostMatcher" do
         it_should_behave_like "RR::Expectations::TimesCalledExpectation"
-        attr_reader :times, :at_most, :expectation
 
         before do
-          @times = 3
-          double.definition.at_most(times)
-          @at_most = double.definition.times_matcher
-          @expectation = TimesCalledExpectation.new(double)
+          stub(subject).foobar.at_most(3)
         end
 
         describe "#verify!" do
-          it "returns true when times called == times" do
-            3.times {expectation.attempt}
-            expectation.verify!
-          end
-
-          it "raises error when times called < times" do
-            2.times {expectation.attempt}
-            expectation.verify!
-          end
-        end
-
-        describe "#attempt?" do
-          it "returns true when attempted less than expected times" do
-            2.times {expectation.attempt}
-            expectation.should be_attempt
-          end
-
-          it "returns false when attempted expected times" do
-            3.times {expectation.attempt}
-            expectation.should_not be_attempt
-          end
-
-          it "raises error before attempted more than expected times" do
-            3.times {expectation.attempt}
-            lambda {expectation.attempt}.should raise_error( RR::Errors::TimesCalledError )
-          end
-        end
-
-        describe "#attempt!" do
-          it "fails when times called more than times" do
-            3.times {expectation.attempt}
-            lambda do
-              expectation.attempt
-            end.should raise_error(RR::Errors::TimesCalledError, "foobar()\nCalled 4 times.\nExpected at most 3 times.")
-          end
-
           it "passes when times called == times" do
-            3.times {expectation.attempt}
+            3.times {subject.foobar}
+            RR.verify
           end
 
           it "passes when times called < times" do
-            expectation.attempt
+            2.times {subject.foobar}
+            RR.verify
           end
-        end
 
-        describe "#terminal?" do
-          it "returns true" do
-            expectation.should be_terminal
+          it "raises error when times called > times" do
+            lambda do
+              4.times {subject.foobar}
+            end.should raise_error(
+              RR::Errors::TimesCalledError,
+              "foobar()\nCalled 4 times.\nExpected at most 3 times."
+            )
+
+            lambda do
+              RR.verify
+            end.should raise_error(
+              RR::Errors::TimesCalledError,
+              "foobar()\nCalled 4 times.\nExpected at most 3 times."
+            )
           end
         end
       end

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

@@ -1,18 +1,10 @@
 module RR
   module Expectations
     describe TimesCalledExpectation, :shared => true do
-      attr_reader :subject, :method_name, :double_injection, :double, :double_definition
+      attr_reader :subject
       it_should_behave_like "Swapped Space"
       before do
         @subject = Object.new
-        @method_name = :foobar
-        @double_injection = space.double_injection(subject, method_name)
-        @double_definition = RR::DoubleDefinitions::DoubleDefinition.new(
-          RR::DoubleDefinitions::DoubleDefinitionCreator.new,
-          subject
-        )
-        @double = new_double(double_injection)
-        double.definition.with_any_args.any_number_of_times
       end
 
       def raises_expectation_error(&block)

data/spec/rr/expectations/times_called_expectation/times_called_expectation_integer_spec.rb

@@ -5,99 +5,53 @@ module RR
     describe TimesCalledExpectation do
       context "when using an IntegerMatcher" do
         it_should_behave_like "RR::Expectations::TimesCalledExpectation"
-        attr_reader :matcher, :expected_line, :expectation
 
         before do
-          double.definition.times(2)
-          @matcher = double.definition.times_matcher
-          @expectation = TimesCalledExpectation.new(double)
+          stub(subject).foobar.times(2)
         end
 
-        describe "#verify" do
-          it "returns true when times called exactly matches an integer" do
-            expectation.verify.should == false
-            expectation.attempt
-            expectation.verify.should == false
-            expectation.attempt
-            expectation.verify.should == true
-          end
-        end
-
-        describe "#verify! when passed an Integer (2)" do
+        describe "verify" do
           it "passes after attempt! called 2 times" do
-            expectation.attempt
-            expectation.attempt
-            expectation.verify!
+            subject.foobar
+            subject.foobar
+            RR.verify
           end
 
           it "fails after attempt! called 1 time" do
-            expectation.attempt
-            lambda {expectation.verify!}.should raise_error(
-            RR::Errors::TimesCalledError,
-            "foobar()\nCalled 1 time.\nExpected 2 times."
+            subject.foobar
+            lambda {RR.verify}.should raise_error(
+              RR::Errors::TimesCalledError,
+              "foobar()\nCalled 1 time.\nExpected 2 times."
             )
           end
 
           it "can't be called when attempt! is called 3 times" do
-            expectation.attempt
-            expectation.attempt
+            subject.foobar
+            subject.foobar
+            lambda do
+              subject.foobar
+            end.should raise_error(RR::Errors::TimesCalledError, "foobar()\nCalled 3 times.\nExpected 2 times.")
             lambda do
-              expectation.attempt
+              RR.verify
             end.should raise_error(RR::Errors::TimesCalledError, "foobar()\nCalled 3 times.\nExpected 2 times.")
           end
 
           it "has a backtrace to where the TimesCalledExpectation was instantiated on failure" do
             error = nil
             begin
-              expectation.verify!
+              RR.verify
             rescue RR::Errors::TimesCalledError => e
               error = e
             end
-            e.backtrace.first.should include(__FILE__)
-            e.backtrace.first.should include(":#{expected_line}")
+            e.backtrace.join("\n").should include(__FILE__)
           end
 
           it "has an error message that includes the number of times called and expected number of times" do
             lambda do
-              expectation.verify!
+              RR.verify
             end.should raise_error(RR::Errors::TimesCalledError, "foobar()\nCalled 0 times.\nExpected 2 times.")
           end
         end
-
-        describe "#attempt?" do
-          it "returns true when attempted less than expected times" do
-            1.times {expectation.attempt}
-            expectation.should be_attempt
-          end
-
-          it "returns false when attempted expected times" do
-            2.times {expectation.attempt}
-            expectation.should_not be_attempt
-          end
-
-          it "raises error before attempted more than expected times" do
-            2.times {expectation.attempt}
-            lambda {expectation.attempt}.should raise_error(
-            RR::Errors::TimesCalledError
-            )
-          end
-        end
-
-        describe "#attempt! for an IntegerMatcher" do
-          it "raises error when attempt! called more than the expected number of times" do
-            expectation.attempt
-            expectation.attempt
-            lambda do
-              expectation.attempt
-            end.should raise_error(RR::Errors::TimesCalledError)
-          end
-        end
-
-        describe "#terminal?" do
-          it "returns true" do
-            expectation.should be_terminal
-          end
-        end
       end
     end
   end

data/spec/rr/expectations/times_called_expectation/times_called_expectation_proc_spec.rb

@@ -5,74 +5,28 @@ module RR
     describe TimesCalledExpectation do
       context "when using a ProcMatcher" do
         it_should_behave_like "RR::Expectations::TimesCalledExpectation"
-        attr_reader :matcher, :expectation
 
         before do
-          double.definition.times(lambda {|value| value == 2})
-          @matcher = double.definition.times_matcher
-          @expectation = TimesCalledExpectation.new(double)
+          stub(subject).foobar.times(lambda {|value| value == 2})
         end
 
         describe "#verify" do
-          it "matches a block" do
-            expectation.verify.should == false
-            expectation.attempt
-            expectation.verify.should == false
-            expectation.attempt
-            expectation.verify.should == true
-            expectation.attempt
-            expectation.verify.should == false
-          end
-        end
-
-        describe "#verify! when passed a block (== 2 times)" do
           it "passes after attempt! called 2 times" do
-            expectation.attempt
-            expectation.attempt
-            expectation.verify!
+            subject.foobar
+            subject.foobar
+            RR.verify
           end
 
           it "fails after attempt! called 1 time" do
-            expectation.attempt
-            lambda {expectation.verify!}.should raise_error(RR::Errors::TimesCalledError)
+            subject.foobar
+            lambda {RR.verify}.should raise_error(RR::Errors::TimesCalledError)
           end
 
           it "fails after attempt! called 3 times" do
-            expectation.attempt
-            expectation.attempt
-            expectation.attempt
-            lambda {expectation.verify!}.should raise_error(RR::Errors::TimesCalledError)
-          end
-        end
-
-        describe "#attempt? with IntegerMatcher" do
-          it "returns true when attempted less than expected times" do
-            1.times {expectation.attempt}
-            expectation.should be_attempt
-          end
-
-          it "returns true when attempted expected times" do
-            2.times {expectation.attempt}
-            expectation.should be_attempt
-          end
-
-          it "returns true when attempted more than expected times" do
-            3.times {expectation.attempt}
-            expectation.should be_attempt
-          end
-        end
-
-        describe "#attempt! for a lambda expectation" do
-          it "lets everything pass" do
             subject.foobar
             subject.foobar
             subject.foobar
-          end
-        end
-
-        describe "#terminal? with ProcMatcher" do
-          it "returns false" do
-            expectation.should_not be_terminal
+            lambda {RR.verify}.should raise_error(RR::Errors::TimesCalledError)
           end
         end
       end

data/spec/rr/expectations/times_called_expectation/times_called_expectation_range_spec.rb

@@ -5,76 +5,32 @@ module RR
     describe TimesCalledExpectation do
       context "when using a RangeMatcher" do
         it_should_behave_like "RR::Expectations::TimesCalledExpectation"
-        attr_reader :matcher, :expectation
 
         before do
-          double.definition.times(1..2)
-          @matcher = double.definition.times_matcher
-          @expectation = TimesCalledExpectation.new(double)
+          stub(subject).foobar.times(1..2)
         end
 
         describe "#verify" do
-          it "returns true when times called falls within a range" do
-            expectation.verify.should == false
-            expectation.attempt
-            expectation.verify.should == true
-            expectation.attempt
-            expectation.verify.should == true
-          end
-        end
-
-        describe "#verify! when passed a Range (1..2)" do
           it "passes after attempt! called 1 time" do
-            expectation.attempt
-            expectation.verify!
+            subject.foobar
+            RR.verify
           end
 
           it "passes after attempt! called 2 times" do
-            expectation.attempt
-            expectation.attempt
-            expectation.verify!
+            subject.foobar
+            subject.foobar
+            RR.verify
           end
 
           it "can't be called when attempt! is called 3 times" do
-            expectation.attempt
-            expectation.attempt
+            subject.foobar
+            subject.foobar
             lambda do
-              expectation.attempt
+              subject.foobar
+            end.should raise_error(RR::Errors::TimesCalledError, "foobar()\nCalled 3 times.\nExpected 1..2 times.")
+            lambda do
+              RR.verify
             end.should raise_error(RR::Errors::TimesCalledError, "foobar()\nCalled 3 times.\nExpected 1..2 times.")
-          end
-        end
-
-        describe "#attempt? with RangeMatcher" do
-          it "returns true when attempted less than low end of range" do
-            expectation.should be_attempt
-          end
-
-          it "returns false when attempted in range" do
-            expectation.attempt
-            expectation.should be_attempt
-            expectation.attempt
-            expectation.should be_attempt
-          end
-
-          it "raises error before attempted more than expected times" do
-            2.times {expectation.attempt}
-            lambda {expectation.attempt}.should raise_error(
-            RR::Errors::TimesCalledError
-            )
-          end
-        end
-
-        describe "#attempt! for a range expectation" do
-          it "raises error when attempt! called more than range permits" do
-            expectation.attempt
-            expectation.attempt
-            raises_expectation_error {expectation.attempt}
-          end
-        end
-
-        describe "#terminal? with RangeMatcher" do
-          it "returns true" do
-            expectation.should be_terminal
           end
         end
       end