diff options
author | Michael Koziarski <michael@koziarski.com> | 2008-05-24 18:34:59 +1200 |
---|---|---|
committer | Michael Koziarski <michael@koziarski.com> | 2008-05-24 18:34:59 +1200 |
commit | 6277fd91133a3566333612857510d74de60d67f4 (patch) | |
tree | 50293bf7a9a2ced9d1bf275b6ff5bca160d98fec /activerecord/test/cases | |
parent | 6cba97d2a449faf21aec9fe9d4434067e414226f (diff) | |
download | rails-6277fd91133a3566333612857510d74de60d67f4.tar.gz rails-6277fd91133a3566333612857510d74de60d67f4.tar.bz2 rails-6277fd91133a3566333612857510d74de60d67f4.zip |
Fix faulty tests introduced in 8d0b4fa39
Diffstat (limited to 'activerecord/test/cases')
-rwxr-xr-x | activerecord/test/cases/associations/has_one_associations_test.rb | 2 | ||||
-rw-r--r-- | activerecord/test/cases/reflection_test.rb | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/activerecord/test/cases/associations/has_one_associations_test.rb b/activerecord/test/cases/associations/has_one_associations_test.rb index e7d4de8246..abc7ee7e9d 100755 --- a/activerecord/test/cases/associations/has_one_associations_test.rb +++ b/activerecord/test/cases/associations/has_one_associations_test.rb @@ -26,7 +26,7 @@ class HasOneAssociationsTest < ActiveRecord::TestCase def test_with_select assert_equal Firm.find(1).account_with_select.attributes.size, 2 - assert_equal Firm.find(1, :include => :account_with_select).attributes.size, 2 + assert_equal Firm.find(1, :include => :account_with_select).account_with_select.attributes.size, 2 end def test_can_marshal_has_one_association_with_nil_target diff --git a/activerecord/test/cases/reflection_test.rb b/activerecord/test/cases/reflection_test.rb index c8ee40ea09..8b4d232554 100644 --- a/activerecord/test/cases/reflection_test.rb +++ b/activerecord/test/cases/reflection_test.rb @@ -159,9 +159,10 @@ class ReflectionTest < ActiveRecord::TestCase end def test_reflection_of_all_associations - assert_equal 19, Firm.reflect_on_all_associations.size + # FIXME these assertions bust a lot + assert_equal 20, Firm.reflect_on_all_associations.size assert_equal 16, Firm.reflect_on_all_associations(:has_many).size - assert_equal 3, Firm.reflect_on_all_associations(:has_one).size + assert_equal 4, Firm.reflect_on_all_associations(:has_one).size assert_equal 0, Firm.reflect_on_all_associations(:belongs_to).size end |