From 0f4359252fa08dfc30de21aca329cb27eddfaee5 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Wed, 9 May 2012 19:35:34 -0700 Subject: Fix CollectionAssociation#replace to return new target (closes #6231) Conflicts: activerecord/test/cases/associations/has_many_associations_test.rb --- .../lib/active_record/associations/collection_association.rb | 2 ++ .../test/cases/associations/has_many_associations_test.rb | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb index 0f32ce7bd4..3e853454a8 100644 --- a/activerecord/lib/active_record/associations/collection_association.rb +++ b/activerecord/lib/active_record/associations/collection_association.rb @@ -481,6 +481,8 @@ module ActiveRecord raise RecordNotSaved, "Failed to replace #{reflection.name} because one or more of the " \ "new records could not be saved." end + + new_target end def concat_records(records) diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb index f7b2b42959..a28b8e6651 100644 --- a/activerecord/test/cases/associations/has_many_associations_test.rb +++ b/activerecord/test/cases/associations/has_many_associations_test.rb @@ -1686,4 +1686,16 @@ class HasManyAssociationsTest < ActiveRecord::TestCase assert_equal [bulb2], car.bulbs assert_equal [bulb2], car.reload.bulbs end + + def test_replace_returns_new_target + car = Car.create(:name => 'honda') + bulb1 = car.bulbs.create + bulb2 = car.bulbs.create + bulb3 = Bulb.create + + assert_equal [bulb1, bulb2], car.bulbs + result = car.bulbs.replace([bulb1, bulb3]) + assert_equal [bulb1, bulb3], car.bulbs + assert_equal [bulb1, bulb3], result + end end -- cgit v1.2.3