Merge pull request rspec#145 from zhangsu/master

Fix confusing error message in `be_within`
TylerRick · May 17, 2012 · d186bf8 · d186bf8
2 parents 5626043 + 675115d
commit d186bf8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/lib/rspec/matchers/built_in/be_within.rb b/lib/rspec/matchers/built_in/be_within.rb
@@ -14,6 +14,9 @@ def matches?(actual)
           unless defined?(@expected)
             raise ArgumentError.new("You must set an expected value using #of: be_within(#{delta}).of(expected_value)")
           end
+          unless actual.is_a? Numeric
+            raise ArgumentError, "Expected a numeric value be within #{delta} of #{expected} but got #{actual.inspect}"
+          end
           (super(actual) - expected).abs <= delta
         end
 

diff --git a/spec/rspec/matchers/be_within_spec.rb b/spec/rspec/matchers/be_within_spec.rb
@@ -59,6 +59,10 @@ module Matchers
         matcher = be_within(0.5)
         expect { matcher.matches?(5.1) }.to raise_error(ArgumentError, /must set an expected value using #of/)
       end
+
+      it "raises an error if the actual value is not numeric" do
+        expect { be_within(0.1).of(0).matches?(nil) }.to raise_error(ArgumentError, /Expected a numeric value be within/)
+      end
     end
   end
 end