aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2011-09-05 00:23:10 -0700
committerJon Leighton <j@jonathanleighton.com>2011-09-05 00:23:10 -0700
commit499ad11700dbfdfe6382f72fb8f46cad62ac7c9b (patch)
tree9e7e126756f9e0955f948fc695978ca26944e178
parent7e16394b92ba8dd537b347ebda91a7c63cfa20ed (diff)
parent76e94016a43c8c86eef869115ead22e93dbd1241 (diff)
downloadrails-499ad11700dbfdfe6382f72fb8f46cad62ac7c9b.tar.gz
rails-499ad11700dbfdfe6382f72fb8f46cad62ac7c9b.tar.bz2
rails-499ad11700dbfdfe6382f72fb8f46cad62ac7c9b.zip
Merge pull request #2868 from arunagw/batches_test_pg_master
Sort here to make sure the order is ok.
-rw-r--r--activerecord/test/cases/batches_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/batches_test.rb b/activerecord/test/cases/batches_test.rb
index 6ce1fbc7fa..660098b9ad 100644
--- a/activerecord/test/cases/batches_test.rb
+++ b/activerecord/test/cases/batches_test.rb
@@ -128,7 +128,7 @@ class EachTest < ActiveRecord::TestCase
end
def test_find_in_batches_should_not_ignore_the_default_scope_if_it_is_other_then_order
- special_posts_ids = SpecialPostWithDefaultScope.all.map(&:id)
+ special_posts_ids = SpecialPostWithDefaultScope.all.map(&:id).sort
posts = []
SpecialPostWithDefaultScope.find_in_batches do |batch|
posts.concat(batch)