make assert_difference error message not suck

rails · Aug 13, 2011 · eaee18d · eaee18d
1 parent bb72183
commit eaee18d
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/activesupport/lib/active_support/testing/assertions.rb b/activesupport/lib/active_support/testing/assertions.rb
@@ -46,16 +46,17 @@ module Assertions
       #   end
       def assert_difference(expression, difference = 1, message = nil, &block)
         exps = Array.wrap(expression).map { |e|
-          e.respond_to?(:call) ? e : lambda { eval(e, block.binding) }
+          callee = e.respond_to?(:call) ? e : lambda { eval(e, block.binding) }
+          [e, callee]
         }
-        before = exps.map { |e| e.call }
+        before = exps.map { |_, block| block.call }
 
         yield
 
-        exps.each_with_index do |e, i|
+        exps.each_with_index do |(code, block), i|
-          error  = "#{e.inspect} didn't change by #{difference}"
+          error  = "#{code.inspect} didn't change by #{difference}"
           error  = "#{message}.\n#{error}" if message
-          assert_equal(before[i] + difference, e.call, error)
+          assert_equal(before[i] + difference, block.call, error)
         end
       end