Permalink
Browse files

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

Conflicts:

	activerecord/test/cases/associations/has_many_associations_test.rb
  • Loading branch information...
1 parent e3033e3 commit 0f4359252fa08dfc30de21aca329cb27eddfaee5 @drogus drogus committed May 10, 2012
@@ -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)
@@ -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

0 comments on commit 0f43592

Please sign in to comment.