1 files changed, 14 insertions, 6 deletions
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 9c64cb35e4..0bd48913e1 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -165,7 +165,7 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_finding_with_order_concatenated
-    topics = Topic.order('author_name').order('title')
+    topics = Topic.order('title').order('author_name')
     assert_equal 4, topics.to_a.size
     assert_equal topics(:fourth).title, topics.first.title
   end
@@ -1032,7 +1032,7 @@ class RelationTest < ActiveRecord::TestCase
     assert_equal Post.where(:author_id => 1).to_a, author_posts.to_a
 
     all_posts = relation.except(:where, :order, :limit)
-    assert_equal Post.to_a, all_posts.to_a
+    assert_equal Post.all, all_posts
   end
 
   def test_only
@@ -1068,20 +1068,20 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_default_scope_order_with_scope_order
-    assert_equal 'zyke', CoolCar.order_using_new_style.limit(1).first.name
-    assert_equal 'zyke', FastCar.order_using_new_style.limit(1).first.name
+    assert_equal 'honda', CoolCar.order_using_new_style.limit(1).first.name
+    assert_equal 'honda', FastCar.order_using_new_style.limit(1).first.name
   end
 
   def test_order_using_scoping
     car1 = CoolCar.order('id DESC').scoping do
       CoolCar.all.merge!(:order => 'id asc').first
     end
-    assert_equal 'zyke', car1.name
+    assert_equal 'honda', car1.name
 
     car2 = FastCar.order('id DESC').scoping do
       FastCar.all.merge!(:order => 'id asc').first
     end
-    assert_equal 'zyke', car2.name
+    assert_equal 'honda', car2.name
   end
 
   def test_unscoped_block_style
@@ -1342,4 +1342,12 @@ class RelationTest < ActiveRecord::TestCase
     node = relation.arel.constraints.first.grep(Arel::Attributes::Attribute).first
     assert_equal table_alias, node.relation
   end
+
+  test '#load' do
+    relation = Post.all
+    assert_queries(1) do
+      assert_equal relation, relation.load
+    end
+    assert_no_queries { relation.to_a }
+  end
 end