From d6cfbaea72e1b2852ed3206c0ffea8a572048369 Mon Sep 17 00:00:00 2001 From: Ben Woosley Date: Tue, 18 Jun 2013 03:32:01 -0700 Subject: Change Result#each to return an Enumerator when called without a block. As with #10992, this lets us call #with_index, etc on the results. --- activerecord/test/cases/result_test.rb | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 activerecord/test/cases/result_test.rb (limited to 'activerecord/test/cases') diff --git a/activerecord/test/cases/result_test.rb b/activerecord/test/cases/result_test.rb new file mode 100644 index 0000000000..c305d273fb --- /dev/null +++ b/activerecord/test/cases/result_test.rb @@ -0,0 +1,33 @@ +require "cases/helper" + +module ActiveRecord + class ResultTest < ActiveRecord::TestCase + + def result + Result.new(['col_1', 'col_2'], [ + ['row 1 col 1', 'row 1 col 2'], + ['row 2 col 1', 'row 2 col 2'] + ]) + end + + def test_to_hash_returns_row_hashes + assert_equal [ + {'col_1' => 'row 1 col 1', 'col_2' => 'row 1 col 2'}, + {'col_1' => 'row 2 col 1', 'col_2' => 'row 2 col 2'} + ], result.to_hash + end + + def test_each_with_block_returns_row_hashes + result.each do |row| + assert_equal ['col_1', 'col_2'], row.keys + end + end + + def test_each_without_block_returns_an_enumerator + result.each.with_index do |row, index| + assert_equal ['col_1', 'col_2'], row.keys + assert_kind_of Integer, index + end + end + end +end -- cgit v1.2.3