unbraindeadify addition to has_many :through

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

1 files changed, 13 insertions, 0 deletions

diff --git a/activerecord/test/associations_join_model_test.rb b/activerecord/test/associations_join_model_test.rb
index 0f6a5e76c2..1a0882fcfb 100644
--- a/activerecord/test/associations_join_model_test.rb
+++ b/activerecord/test/associations_join_model_test.rb
@@ -373,15 +373,28 @@ class AssociationsJoinModelTest < Test::Unit::TestCase
     count = posts(:thinking).tags.count
     push = Tag.create!(:name => 'pushme')
     assert_nothing_raised { posts(:thinking).tags << push }
+    assert_equal(count + 1, posts(:thinking).tags.size)
     assert_equal(count + 1, posts(:thinking).tags(true).size)
 
     assert_nothing_raised { posts(:thinking).tags.create!(:name => 'foo') }
+    assert_equal(count + 2, posts(:thinking).tags.size)
     assert_equal(count + 2, posts(:thinking).tags(true).size)
 
     assert_nothing_raised { posts(:thinking).tags.concat(Tag.create!(:name => 'abc'), Tag.create!(:name => 'def')) }
+    assert_equal(count + 4, posts(:thinking).tags.size)
     assert_equal(count + 4, posts(:thinking).tags(true).size)
   end
 
+  def test_adding_junk_to_has_many_through_should_raise_type_mismatch
+    assert_raise(ActiveRecord::AssociationTypeMismatch) { posts(:thinking).tags << "Uhh what now?" }
+  end
+
+  def test_adding_to_has_many_through_should_return_self
+    tags = posts(:thinking).tags
+    assert_equal tags, posts(:thinking).tags.push(tags(:general))
+  end
+
+
   def test_has_many_through_sum_uses_calculations
     assert_nothing_raised { authors(:david).comments.sum(:post_id) }
   end