rr 0.4.7 → 0.4.8

data/CHANGES

@@ -1,3 +1,6 @@
+* 0.4.8
+- Fixed issue with Hash arguments
+
 * 0.4.7
 - Improved error message
 

data/Rakefile

@@ -26,7 +26,7 @@ def run_suite
 end
 
 PKG_NAME = "rr"
-PKG_VERSION = "0.4.7"
+PKG_VERSION = "0.4.8"
 PKG_FILES = FileList[
   '[A-Z]*',
   '*.rb',

data/lib/rr/expectations/argument_equality_expectation.rb

@@ -33,7 +33,7 @@ module RR
 
       protected
       def equality_match(arg1, arg2)
-        arg1.respond_to?(:__rr__eql?) ? arg1 == arg2 : arg1.eql?(arg2)
+        arg1.respond_to?(:'__rr__original_==') ? arg1.__send__(:'__rr__original_==', arg2) : arg1 == arg2
       end
     end
   end

data/spec/rr/expectations/argument_equality_expectation_spec.rb

@@ -77,25 +77,40 @@ module RR
           @predicate3 = 'third'
         end
 
-        it "when mock.proxy ==, does not have infinite recursion" do
-          mock.proxy(@predicate1) == @predicate1
-          mock.proxy(@predicate2) == @predicate2
-          ArgumentEqualityFunctionalFixture.new(@predicate1, @predicate2).should == ArgumentEqualityFunctionalFixture.new(@predicate1, @predicate2)
-
-          mock.proxy(@predicate1) == @predicate1
-          mock.proxy(@predicate2) == @predicate3
-          ArgumentEqualityFunctionalFixture.new(@predicate1, @predicate2).should_not == ArgumentEqualityFunctionalFixture.new(@predicate1, @predicate3)
+        describe "when mock.proxy ==" do
+          it "does not have infinite recursion" do
+            mock.proxy(@predicate1) == @predicate1
+            mock.proxy(@predicate2) == @predicate2
+            ArgumentEqualityFunctionalFixture.new(@predicate1, @predicate2).should == ArgumentEqualityFunctionalFixture.new(@predicate1, @predicate2)
+
+            mock.proxy(@predicate1) == @predicate1
+            mock.proxy(@predicate2) == @predicate3
+            ArgumentEqualityFunctionalFixture.new(@predicate1, @predicate2).should_not == ArgumentEqualityFunctionalFixture.new(@predicate1, @predicate3)
+          end
+
+          it "matches Hashes properly (using ==)" do
+            mock.proxy(@predicate1) == {:foo => :bar}
+            @predicate1 == {:foo => :bar}
+          end
         end
 
-        it "when mock.proxy .eql?, does not have infinite recursion" do
-          mock.proxy(@predicate1).eql? @predicate1
-          mock.proxy(@predicate2).eql? @predicate2
-          ArgumentEqualityFunctionalFixture.new(@predicate1, @predicate2).should be_eql(ArgumentEqualityFunctionalFixture.new(@predicate1, @predicate2))
+        describe "when mock.proxy .eql?" do
+          it "does not have infinite recursion" do
+            mock.proxy(@predicate1).eql? @predicate1
+            mock.proxy(@predicate2).eql? @predicate2
+            ArgumentEqualityFunctionalFixture.new(@predicate1, @predicate2).should be_eql(ArgumentEqualityFunctionalFixture.new(@predicate1, @predicate2))
 
-          mock.proxy(@predicate1).eql? @predicate1
-          mock.proxy(@predicate2).eql? @predicate3
-          ArgumentEqualityFunctionalFixture.new(@predicate1, @predicate2).should_not be_eql(ArgumentEqualityFunctionalFixture.new(@predicate1, @predicate3))
+            mock.proxy(@predicate1).eql? @predicate1
+            mock.proxy(@predicate2).eql? @predicate3
+            ArgumentEqualityFunctionalFixture.new(@predicate1, @predicate2).should_not be_eql(ArgumentEqualityFunctionalFixture.new(@predicate1, @predicate3))
+          end
+
+          it "matches Hashes properly (using ==)" do
+            mock.proxy(@predicate1).eql?({:foo => :bar})
+            @predicate1.eql?({:foo => :bar})
+          end
         end
+
       end
     end
 

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: rr
 version: !ruby/object:Gem::Version 
-  version: 0.4.7
+  version: 0.4.8
 date: 2008-01-23 00:00:00 -08: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: