assert_difference can take a callable piece of code rather than just evaling a string

2 files changed, 19 insertions, 8 deletions

diff --git a/activerecord/test/cases/associations/belongs_to_associations_test.rb b/activerecord/test/cases/associations/belongs_to_associations_test.rb
index 7518bc19f9..ddcc36c841 100644
--- a/activerecord/test/cases/associations/belongs_to_associations_test.rb
+++ b/activerecord/test/cases/associations/belongs_to_associations_test.rb
@@ -576,11 +576,11 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
   end
 
   def test_polymorphic_counter_cache
-    tagging     = taggings(:welcome_general)
-    post = post = posts(:welcome)
-    comment     = comments(:greetings)
+    tagging = taggings(:welcome_general)
+    post    = posts(:welcome)
+    comment = comments(:greetings)
 
-    assert_difference 'post.reload.taggings_count', -1 do
+    assert_difference lambda { post.reload.taggings_count }, -1 do
       assert_difference 'comment.reload.taggings_count', +1 do
         tagging.taggable = comment
       end
diff --git a/activesupport/lib/active_support/testing/assertions.rb b/activesupport/lib/active_support/testing/assertions.rb
index a4e0361a32..bfc2024529 100644
--- a/activesupport/lib/active_support/testing/assertions.rb
+++ b/activesupport/lib/active_support/testing/assertions.rb
@@ -29,6 +29,16 @@ module ActiveSupport
       #     post :create, :article => {...}
       #   end
       #
+      # A lambda or a list of lambdas can be passed in and evaluated:
+      #
+      #   assert_difference lambda { Article.count }, 2 do
+      #     post :create, :article => {...}
+      #   end
+      #
+      #   assert_difference [->{ Article.count }, ->{ Post.count }], 2 do
+      #     post :create, :article => {...}
+      #   end
+      #
       # A error message can be specified.
       #
       #   assert_difference 'Article.count', -1, "An Article should be destroyed" do
@@ -37,14 +47,15 @@ module ActiveSupport
       def assert_difference(expression, difference = 1, message = nil, &block)
         b = block.send(:binding)
         exps = Array.wrap(expression)
-        before = exps.map { |e| eval(e, b) }
+        before = exps.map { |e| e.respond_to?(:call) ? e.call : eval(e, b) }
 
         yield
 
         exps.each_with_index do |e, i|
-          error = "#{e.inspect} didn't change by #{difference}"
-          error = "#{message}.\n#{error}" if message
-          assert_equal(before[i] + difference, eval(e, b), error)
+          error  = "#{e.inspect} didn't change by #{difference}"
+          error  = "#{message}.\n#{error}" if message
+          actual = e.respond_to?(:call) ? e.call : eval(e, b)
+          assert_equal(before[i] + difference, actual, error)
         end
       end