diff options
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/associations/join_model_test.rb | 7 | ||||
| -rwxr-xr-x | activerecord/test/associations_test.rb | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/activerecord/test/associations/join_model_test.rb b/activerecord/test/associations/join_model_test.rb index 7b77765d7a..2c7902a695 100644 --- a/activerecord/test/associations/join_model_test.rb +++ b/activerecord/test/associations/join_model_test.rb @@ -351,6 +351,13 @@ class AssociationsJoinModelTest < Test::Unit::TestCase assert_equal [1,2,3,5,6,7,8,9,10], author.comments.collect(&:id) end end + + def test_eager_load_has_many_through_has_many_with_conditions + post = Post.find(:first, :include => :invalid_tags) + assert_no_queries do + post.invalid_tags + end + end def test_eager_belongs_to_and_has_one_not_singularized assert_nothing_raised do diff --git a/activerecord/test/associations_test.rb b/activerecord/test/associations_test.rb index 350799e306..e67880681c 100755 --- a/activerecord/test/associations_test.rb +++ b/activerecord/test/associations_test.rb @@ -315,7 +315,7 @@ class HasOneAssociationsTest < Test::Unit::TestCase assert_equal a, firm.account assert_equal a, firm.account(true) end - + def test_finding_with_interpolated_condition firm = Firm.find(:first) superior = firm.clients.create(:name => 'SuperiorCo') |