Quit ignoring default :include options in has_many :through calls [Mark James]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3974 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 26 insertions, 1 deletions

diff --git a/activerecord/test/associations_join_model_test.rb b/activerecord/test/associations_join_model_test.rb
index 4ea2b6e684..d7a230ddba 100644
--- a/activerecord/test/associations_join_model_test.rb
+++ b/activerecord/test/associations_join_model_test.rb
@@ -36,9 +36,34 @@ class AssociationsJoinModelTest < Test::Unit::TestCase
   end
 
   def test_polymorphic_has_many_going_through_join_model
-    assert_equal tags(:general), posts(:welcome).tags.first
+    assert_equal tags(:general), tag = posts(:welcome).tags.first
+    assert_no_queries do
+      tag.tagging
+    end
+  end
+
+  def test_polymorphic_has_many_going_through_join_model_with_find
+    assert_equal tags(:general), tag = posts(:welcome).tags.find(:first)
+    assert_no_queries do
+      tag.tagging
+    end
   end
 
+  def test_polymorphic_has_many_going_through_join_model_with_include_on_source_reflection
+    assert_equal tags(:general), tag = posts(:welcome).funky_tags.first
+    assert_no_queries do
+      tag.tagging
+    end
+  end
+
+  def test_polymorphic_has_many_going_through_join_model_with_include_on_source_reflection_with_find
+    assert_equal tags(:general), tag = posts(:welcome).funky_tags.find(:first)
+    assert_no_queries do
+      tag.tagging
+    end
+  end
+
+
   def test_polymorphic_has_many_going_through_join_model_with_custom_foreign_key
     assert_equal tags(:misc), taggings(:welcome_general).super_tag
     assert_equal tags(:misc), posts(:welcome).super_tags.first