Return sized enumerator from Batches#find_each

2 files changed, 14 insertions, 0 deletions

diff --git a/activerecord/test/cases/batches_test.rb b/activerecord/test/cases/batches_test.rb
index 4ee09a640e..c12fa03015 100644
--- a/activerecord/test/cases/batches_test.rb
+++ b/activerecord/test/cases/batches_test.rb
@@ -35,6 +35,14 @@ class EachTest < ActiveRecord::TestCase
     end
   end
 
+  if Enumerator.method_defined? :size
+    def test_each_should_return_a_sized_enumerator
+      assert_equal 11, Post.find_each(:batch_size => 1).size
+      assert_equal 5, Post.find_each(:batch_size => 2, :start => 7).size
+      assert_equal 11, Post.find_each(:batch_size => 10_000).size
+    end
+  end
+
   def test_each_enumerator_should_execute_one_query_per_batch
     assert_queries(@total + 1) do
       Post.find_each(:batch_size => 1).with_index do |post, index|
diff --git a/activerecord/test/cases/result_test.rb b/activerecord/test/cases/result_test.rb
index edaeb85211..2131b32a0c 100644
--- a/activerecord/test/cases/result_test.rb
+++ b/activerecord/test/cases/result_test.rb
@@ -30,5 +30,11 @@ module ActiveRecord
         assert_kind_of Integer, index
       end
     end
+
+    if Enumerator.method_defined? :size
+      def test_each_without_block_returns_a_sized_enumerator
+        assert_equal 3, result.each.size
+      end
+    end
   end
 end