Allow blocks for count with ActiveRecord::Relation. Document and test that sum allows blocks

1 files changed, 16 insertions, 0 deletions

diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb
index 041f8ffb7c..a279b0e77c 100644
--- a/activerecord/test/cases/calculations_test.rb
+++ b/activerecord/test/cases/calculations_test.rb
@@ -376,6 +376,22 @@ class CalculationsTest < ActiveRecord::TestCase
         Company.where(:type => "Firm").from('companies').count(:type)
   end
 
+  def test_count_with_block_acts_as_array
+    accounts = Account.where('id > 0')
+    assert_equal Account.count, accounts.count { true }
+    assert_equal 0, accounts.count { false }
+    assert_equal Account.where('credit_limit > 50').size, accounts.count { |account| account.credit_limit > 50 }
+    assert_equal Account.count, Account.count { true }
+    assert_equal 0, Account.count { false }
+  end
+
+  def test_sum_with_block_acts_as_array
+    accounts = Account.where('id > 0')
+    assert_equal Account.sum(:credit_limit), accounts.sum { |account| account.credit_limit }
+    assert_equal Account.sum(:credit_limit) + Account.count, accounts.sum{ |account| account.credit_limit + 1 }
+    assert_equal 0, accounts.sum { |account| 0 }
+  end
+
   def test_sum_with_from_option
     assert_equal Account.sum(:credit_limit), Account.from('accounts').sum(:credit_limit)
     assert_equal Account.where("credit_limit > 50").sum(:credit_limit),