Revert "Yield only one argument instead of splatting."

This reverts commit f9cb645dfcb5cc89f59d2f8b58a019486c828c73.

Conflicts:
	activerecord/CHANGELOG.md

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

This reverts commit 9cc2bf69ce296b7351dc612a8366193390a305f3.

Conflicts:
	activerecord/lib/active_record/relation/calculations.rb

1 files changed, 0 insertions, 16 deletions

diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb
index 65d28ea028..bf8c0f1e70 100644
--- a/activerecord/test/cases/calculations_test.rb
+++ b/activerecord/test/cases/calculations_test.rb
@@ -383,22 +383,6 @@ 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),