1 files changed, 21 insertions, 5 deletions
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index bf1eb6386a..f1a9f3e0a1 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -16,7 +16,6 @@ require 'models/engine'
 require 'models/tyre'
 require 'models/minivan'
 
-
 class RelationTest < ActiveRecord::TestCase
   fixtures :authors, :topics, :entrants, :developers, :companies, :developers_projects, :accounts, :categories, :categorizations, :posts, :comments,
     :tags, :taggings, :cars, :minivans
@@ -177,19 +176,19 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_finding_with_cross_table_order_and_limit
-    tags = Tag.includes(:taggings).
+    tags = Tag.eager_load(:taggings).
               order("tags.name asc", "taggings.taggable_id asc", "REPLACE('abc', taggings.taggable_type, taggings.taggable_type)").
               limit(1).to_a
     assert_equal 1, tags.length
   end
 
   def test_finding_with_complex_order_and_limit
-    tags = Tag.includes(:taggings).order("REPLACE('abc', taggings.taggable_type, taggings.taggable_type)").limit(1).to_a
+    tags = Tag.eager_load(:taggings).order("REPLACE('abc', taggings.taggable_type, taggings.taggable_type)").limit(1).to_a
     assert_equal 1, tags.length
   end
 
   def test_finding_with_complex_order
-    tags = Tag.includes(:taggings).order("REPLACE('abc', taggings.taggable_type, taggings.taggable_type)").to_a
+    tags = Tag.eager_load(:taggings).order("REPLACE('abc', taggings.taggable_type, taggings.taggable_type)").to_a
     assert_equal 3, tags.length
   end
 
@@ -1104,7 +1103,9 @@ class RelationTest < ActiveRecord::TestCase
       )
     )
 
-    assert scope.eager_loading?
+    assert_deprecated do
+      assert scope.eager_loading?
+    end
   end
 
   def test_ordering_with_extra_spaces
@@ -1164,4 +1165,19 @@ class RelationTest < ActiveRecord::TestCase
     end
     assert_equal ['Foo', 'Foo'], query.uniq(true).uniq(false).map(&:name)
   end
+
+  def test_deprecated_references_eager_loaded_tables
+    expected = tags(:general)
+    tagging  = taggings(:welcome_general)
+    tag = assert_queries 1 do
+      assert_deprecated do
+        Tag.includes(:taggings).where(:taggings => { :id => tagging.id }).to_a.first
+      end
+    end
+
+    assert_equal expected, tag
+    assert_no_queries do
+      tag.taggings.to_a
+    end
+  end
 end