diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-05-28 19:15:21 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-05-28 19:15:21 -0700 |
| commit | 6f1d9d00ffd9d411b2bd488da4eb92b7e2fd972e (patch) | |
| tree | 3b25684731afaefe9d72bf1a0380b4a5c62a570a /activerecord/test/cases | |
| parent | ef3e696d1fbfde7a77592bc1fd24586a214c505d (diff) | |
| parent | 39f0698405f8d52984f614d2aecafc514da9a3c5 (diff) | |
| download | rails-6f1d9d00ffd9d411b2bd488da4eb92b7e2fd972e.tar.gz rails-6f1d9d00ffd9d411b2bd488da4eb92b7e2fd972e.tar.bz2 rails-6f1d9d00ffd9d411b2bd488da4eb92b7e2fd972e.zip | |
Merge pull request #6511 from frodsan/add_fixnum_string_support_for_delete
Add support for CollectionAssociation#delete by Fixnum or String
Diffstat (limited to 'activerecord/test/cases')
| -rw-r--r-- | activerecord/test/cases/associations/has_many_associations_test.rb | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb index 8b384c2513..0d8f311117 100644 --- a/activerecord/test/cases/associations/has_many_associations_test.rb +++ b/activerecord/test/cases/associations/has_many_associations_test.rb @@ -936,10 +936,24 @@ class HasManyAssociationsTest < ActiveRecord::TestCase assert_equal 2, summit.client_of end - def test_deleting_type_mismatch + def test_deleting_by_fixnum_id david = Developer.find(1) - david.projects.reload - assert_raise(ActiveRecord::AssociationTypeMismatch) { david.projects.delete(1) } + + assert_difference 'david.projects.count', -1 do + assert_equal 1, david.projects.delete(1).size + end + + assert_equal 1, david.projects.size + end + + def test_deleting_by_string_id + david = Developer.find(1) + + assert_difference 'david.projects.count', -1 do + assert_equal 1, david.projects.delete('1').size + end + + assert_equal 1, david.projects.size end def test_deleting_self_type_mismatch |