Fix CollectionAssociation#replace to return new target (closes #6231)

Conflicts: activerecord/test/cases/associations/has_many_associations_test.rb
rails · May 17, 2012 · 0f43592 · 0f43592
1 parent e3033e3
commit 0f43592
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb
@@ -481,6 +481,8 @@ def replace_records(new_target, original_target)
             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
@@ -1686,4 +1686,16 @@ def test_replace
     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