rr 0.4.8 → 0.4.9

data/spec/rr/double_spec.rb

@@ -2,15 +2,22 @@ require "spec/spec_helper"
 
 module RR
   describe Double do
+    it_should_behave_like "Swapped Space"
     attr_reader :space, :object, :double_injection, :double
     before do
-      @space = Space.new
+      @space = Space.instance
       @object = Object.new
       def object.foobar(a, b)
         [b, a]
       end
       @double_injection = space.double_injection(object, :foobar)
-      @double = space.double(double_injection)
+      @double = Double.new(double_injection)
+    end
+
+    describe "#initialize" do
+      it "registers self with associated DoubleInjection" do
+        double_injection.doubles.should include(double)
+      end
     end
 
     describe "#with" do
@@ -74,12 +81,12 @@ module RR
 
       it "sets up a Times Called Expectation with 0" do
         double.never
-        proc {double.call(double_injection)}.should raise_error(Errors::TimesCalledError)
+        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
-        proc {double.call(double_injection)}.should raise_error(Errors::TimesCalledError)
+        lambda {double.call(double_injection)}.should raise_error(Errors::TimesCalledError)
       end
     end
 
@@ -91,7 +98,7 @@ module RR
       it "sets up a Times Called Expectation with 1" do
         double.once
         double.call(double_injection)
-        proc {double.call(double_injection)}.should raise_error(Errors::TimesCalledError)
+        lambda {double.call(double_injection)}.should raise_error(Errors::TimesCalledError)
       end
 
       it "sets return value when block passed in" do
@@ -109,7 +116,7 @@ module RR
         double.twice
         double.call(double_injection)
         double.call(double_injection)
-        proc {double.call(double_injection)}.should raise_error(Errors::TimesCalledError)
+        lambda {double.call(double_injection)}.should raise_error(Errors::TimesCalledError)
       end
 
       it "sets return value when block passed in" do
@@ -143,7 +150,7 @@ module RR
         double.at_most(2)
         double.call(double_injection)
         double.call(double_injection)
-        proc do
+        lambda do
           double.call(double_injection)
         end.should raise_error(
         Errors::TimesCalledError,
@@ -167,7 +174,7 @@ module RR
         double.call(double_injection)
         double.call(double_injection)
         double.call(double_injection)
-        proc {double.call(double_injection)}.should raise_error(Errors::TimesCalledError)
+        lambda {double.call(double_injection)}.should raise_error(Errors::TimesCalledError)
       end
 
       it "sets return value when block passed in" do
@@ -285,7 +292,7 @@ module RR
       end
 
       it "raises an error when not passed a block" do
-        proc do
+        lambda do
           double.after_call
         end.should raise_error(ArgumentError, "after_call expects a block")
       end
@@ -303,7 +310,7 @@ module RR
       end
 
       it "sets return value when block passed in" do
-        (class << double; self; end).send(:define_method, :puts) {|value|}
+        (class << double; self; end).__send__(:define_method, :puts) {|value|}
         double.with().verbose {:return_value}
         object.foobar.should == :return_value
       end
@@ -331,7 +338,7 @@ module RR
       end
 
       it "raises an error when both argument and block is passed in" do
-        proc do
+        lambda do
           double.returns(:baz) {:another}
         end.should raise_error(ArgumentError, "returns cannot accept both an argument and a block")
       end
@@ -339,11 +346,11 @@ module RR
 
     describe "#implemented_by" do
       it "returns the DoubleDefinition" do
-        double.implemented_by(proc{:baz}).should === double.definition
+        double.implemented_by(lambda{:baz}).should === double.definition
       end
 
-      it "sets the implementation to the passed in proc" do
-        double.implemented_by(proc{:baz})
+      it "sets the implementation to the passed in lambda" do
+        double.implemented_by(lambda{:baz})
         double.call(double_injection).should == :baz
       end
 
@@ -356,13 +363,13 @@ module RR
       end
     end
 
-    describe "#implemented_by_original_method" do
+    describe "#proxy" do
       it "returns the DoubleDefinition object" do
-        double.implemented_by_original_method.should === double.definition
+        double.proxy.should === double.definition
       end
 
       it "sets the implementation to the original method" do
-        double.implemented_by_original_method
+        double.proxy
         double.call(double_injection, 1, 2).should == [2, 1]
       end
 
@@ -384,9 +391,9 @@ module RR
         end
 
         double_injection = space.double_injection(object, :foobar)
-        double = space.double(double_injection)
+        double = Double.new(double_injection)
         double.with_any_args
-        double.implemented_by_original_method
+        double.proxy
 
         object.foobar(1, 2).should == [2, 1]
       end
@@ -398,9 +405,9 @@ module RR
           end
         end
         double_injection = space.double_injection(object, :does_not_exist)
-        double = space.double(double_injection)
+        double = Double.new(double_injection)
         double.with_any_args
-        double.implemented_by_original_method
+        double.proxy
 
         return_value = object.does_not_exist(1, 2)
         return_value.should == "method_missing for does_not_exist([1, 2])"
@@ -412,7 +419,7 @@ module RR
         it "prints the message call" do
           double.verbose
           output = nil
-          (class << double; self; end).send(:define_method, :puts) do |output|
+          (class << double; self; end).__send__(:define_method, :puts) do |output|
             output = output
           end
           double.call(double_injection, 1, 2)
@@ -423,7 +430,7 @@ module RR
       describe "when not verbose" do
         it "does not print the message call" do
           output = nil
-          (class << double; self; end).send(:define_method, :puts) do |output|
+          (class << double; self; end).__send__(:define_method, :puts) do |output|
             output = output
           end
           double.call(double_injection, 1, 2)
@@ -431,8 +438,8 @@ module RR
         end
       end
 
-      describe "when implemented by a proc" do
-        it "calls the return proc when implemented by a proc" do
+      describe "when implemented by a lambda" do
+        it "calls the return lambda when implemented by a lambda" do
           double.returns {|arg| "returning #{arg}"}
           double.call(double_injection, :foobar).should == "returning foobar"
         end
@@ -458,17 +465,17 @@ module RR
 
           double.call(double_injection, :foobar)
           double.call(double_injection, :foobar)
-          proc {double.call(double_injection, :foobar)}.should raise_error(Errors::TimesCalledError)
+          lambda {double.call(double_injection, :foobar)}.should raise_error(Errors::TimesCalledError)
         end
 
         it "raises DoubleOrderError when ordered and called out of order" do
           double1 = double
-          double2 = space.double(double_injection)
+          double2 = Double.new(double_injection)
 
           double1.with(1).returns {:return_1}.ordered.once
           double2.with(2).returns {:return_2}.ordered.once
 
-          proc do
+          lambda do
             object.foobar(2)
           end.should raise_error(
           Errors::DoubleOrderError,
@@ -482,10 +489,7 @@ module RR
           verify_ordered_double_called = false
           passed_in_double = nil
           space.method(:verify_ordered_double).arity.should == 1
-          (
-          class << space;
-            self;
-          end).class_eval do
+          (class << space; self; end).class_eval do
             define_method :verify_ordered_double do |double|
               passed_in_double = double
               verify_ordered_double_called = true
@@ -501,10 +505,7 @@ module RR
         it "does not dispatche to Space#verify_ordered_double when not ordered" do
           verify_ordered_double_called = false
           space.method(:verify_ordered_double).arity.should == 1
-          (
-          class << space;
-            self;
-          end).class_eval do
+          (class << space; self; end).class_eval do
             define_method :verify_ordered_double do |double|
               verify_ordered_double_called = true
             end
@@ -532,7 +533,7 @@ module RR
         it "raises ArgumentError when yields was called and no block passed in" do
           double.with(1, 2).yields(55)
 
-          proc do
+          lambda do
             object.foobar(1, 2)
           end.should raise_error(ArgumentError, "A Block must be passed into the method call when using yields")
         end
@@ -628,20 +629,20 @@ module RR
       it "verifies that times called expectation was met" do
         double.twice.returns {:return_value}
 
-        proc {double.verify}.should raise_error(Errors::TimesCalledError)
+        lambda {double.verify}.should raise_error(Errors::TimesCalledError)
         double.call(double_injection)
-        proc {double.verify}.should raise_error(Errors::TimesCalledError)
+        lambda {double.verify}.should raise_error(Errors::TimesCalledError)
         double.call(double_injection)
 
-        proc {double.verify}.should_not raise_error
+        lambda {double.verify}.should_not raise_error
       end
 
       it "does not raise an error when there is no times called expectation" do
-        proc {double.verify}.should_not raise_error
+        lambda {double.verify}.should_not raise_error
         double.call(double_injection)
-        proc {double.verify}.should_not raise_error
+        lambda {double.verify}.should_not raise_error
         double.call(double_injection)
-        proc {double.verify}.should_not raise_error
+        lambda {double.verify}.should_not raise_error
       end
     end
 

data/spec/rr/errors/rr_error_spec.rb

@@ -4,20 +4,20 @@ module RR
   module Errors
     describe RRError, "#backtrace" do
       before do
-        @original_trim_backtrace = RR::Space.trim_backtrace
+        @original_trim_backtrace = RR.trim_backtrace
       end
       after do
-        RR::Space.trim_backtrace = @original_trim_backtrace
+        RR.trim_backtrace = @original_trim_backtrace
       end
 
       it "does not include the rr library files when trim_backtrace is true" do
-        RR::Space.trim_backtrace = true
+        RR.trim_backtrace = true
 
         error = nil
         begin
           obj = Object.new
           mock(obj).foobar
-          RR::Space.verify_double(obj, :foobar)
+          RR.verify_double(obj, :foobar)
         rescue RRError=> e
           error = e
         end
@@ -27,13 +27,13 @@ module RR
       end
 
       it "includes the rr library files when trim_backtrace is false" do
-        RR::Space.trim_backtrace = false
+        RR.trim_backtrace = false
 
         error = nil
         begin
           obj = Object.new
           mock(obj).foobar
-          RR::Space.verify_double(obj, :foobar)
+          RR.verify_double(obj, :foobar)
         rescue RRError=> e
           error = e
         end

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

@@ -14,7 +14,7 @@ module RR
       describe "#verify!" do
         it "always passes" do
           expectation.verify!
-          10.times {expectation.attempt!}
+          10.times {expectation.attempt}
           expectation.verify!
         end
       end
@@ -22,14 +22,14 @@ module RR
       describe "#attempt?" do
         it "always returns true" do
           expectation.should be_attempt
-          10.times {expectation.attempt!}
+          10.times {expectation.attempt}
           expectation.should be_attempt
         end
       end
 
       describe "#attempt!" do
         it "always passes" do
-          10.times {expectation.attempt!}
+          10.times {expectation.attempt}
         end
       end
 

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

@@ -14,18 +14,18 @@ module Expectations
     
     describe "#verify!" do
       it "passes when times called > times" do
-        4.times {expectation.attempt!}
+        4.times {expectation.attempt}
         expectation.verify!
       end
 
       it "passes when times called == times" do
-        3.times {expectation.attempt!}
+        3.times {expectation.attempt}
         expectation.verify!
       end
 
       it "raises error when times called < times" do
-        expectation.attempt!
-        proc do
+        expectation.attempt
+        lambda do
           expectation.verify!
         end.should raise_error(
         RR::Errors::TimesCalledError,
@@ -37,22 +37,22 @@ module Expectations
     describe "#attempt?" do
       it "always returns true" do
         expectation.should be_attempt
-        10.times {expectation.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!}
+        4.times {expectation.attempt}
       end
 
       it "passes when times called == times" do
-        3.times {expectation.attempt!}
+        3.times {expectation.attempt}
       end
 
       it "passes when times called < times" do
-        expectation.attempt!
+        expectation.attempt
       end
     end
 

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

@@ -14,49 +14,47 @@ module RR
 
       describe "#verify!" do
         it "returns true when times called == times" do
-          3.times {expectation.attempt!}
+          3.times {expectation.attempt}
           expectation.verify!
         end
 
         it "raises error when times called < times" do
-          2.times {expectation.attempt!}
+          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!}
+          2.times {expectation.attempt}
           expectation.should be_attempt
         end
 
         it "returns false when attempted expected times" do
-          3.times {expectation.attempt!}
+          3.times {expectation.attempt}
           expectation.should_not be_attempt
         end
 
         it "raises error before attempted more than expected times" do
-          3.times {expectation.attempt!}
-          proc {expectation.attempt!}.should raise_error(
-          Errors::TimesCalledError
-          )
+          3.times {expectation.attempt}
+          lambda {expectation.attempt}.should raise_error( Errors::TimesCalledError )
         end
       end
 
       describe "#attempt!" do
         it "fails when times called more than times" do
-          3.times {expectation.attempt!}
-          proc do
-            expectation.attempt!
+          3.times {expectation.attempt}
+          lambda do
+            expectation.attempt
           end.should raise_error(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 {expectation.attempt}
         end
 
         it "passes when times called < times" do
-          expectation.attempt!
+          expectation.attempt
         end
       end
 

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

@@ -9,12 +9,12 @@ module RR
         @object = Object.new
         @method_name = :foobar
         @double_injection = space.double_injection(object, method_name)
-        @double = space.double(double_injection)
+        @double = Double.new(double_injection)
         double.with_any_args
       end
 
       def raises_expectation_error(&block)
-        proc {block.call}.should raise_error(Errors::TimesCalledError)
+        lambda {block.call}.should raise_error(Errors::TimesCalledError)
       end
     end
   end