diff options
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/associations/join_model_test.rb | 6 | ||||
| -rw-r--r-- | activerecord/test/fixtures/author.rb | 1 | ||||
| -rw-r--r-- | activerecord/test/fixtures/post.rb | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/activerecord/test/associations/join_model_test.rb b/activerecord/test/associations/join_model_test.rb index 0e146f74c4..631f7034f4 100644 --- a/activerecord/test/associations/join_model_test.rb +++ b/activerecord/test/associations/join_model_test.rb @@ -410,6 +410,12 @@ class AssociationsJoinModelTest < Test::Unit::TestCase authors(:david).author_favorites.create :favorite_author => new_author assert_equal new_author, authors(:david).reload.favorite_authors.first end + + def test_has_many_through_uses_conditions_specified_on_the_has_many_association + author = Author.find(:first) + assert !author.comments.blank? + assert author.nonexistant_comments.blank? + end def test_has_many_through_uses_correct_attributes assert_nil posts(:thinking).tags.find_by_name("General").attributes["tag_id"] diff --git a/activerecord/test/fixtures/author.rb b/activerecord/test/fixtures/author.rb index 5ef0c6cfe9..979c72ec63 100644 --- a/activerecord/test/fixtures/author.rb +++ b/activerecord/test/fixtures/author.rb @@ -22,6 +22,7 @@ class Author < ActiveRecord::Base has_many :special_nonexistant_posts, :class_name => "SpecialPost", :conditions => "posts.body = 'nonexistant'" has_many :special_nonexistant_post_comments, :through => :special_nonexistant_posts, :source => :comments, :conditions => "comments.post_id = 0" + has_many :nonexistant_comments, :through => :posts has_many :hello_posts, :class_name => "Post", :conditions => "posts.body = 'hello'" has_many :hello_post_comments, :through => :hello_posts, :source => :comments diff --git a/activerecord/test/fixtures/post.rb b/activerecord/test/fixtures/post.rb index 44ac3c1053..4627da5206 100644 --- a/activerecord/test/fixtures/post.rb +++ b/activerecord/test/fixtures/post.rb @@ -16,6 +16,7 @@ class Post < ActiveRecord::Base has_one :very_special_comment has_one :very_special_comment_with_post, :class_name => "VerySpecialComment", :include => :post has_many :special_comments + has_many :nonexistant_comments, :class_name => 'Comment', :conditions => 'comments.id < 0' has_and_belongs_to_many :categories has_and_belongs_to_many :special_categories, :join_table => "categories_posts", :association_foreign_key => 'category_id' |