Don't remove scheduled destroys when loading an association. [#4642 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>

activerecord/lib/active_record/associations/association_collection.rb

@@ -393,7 +393,12 @@ module ActiveRecord
                   @target = find_target.map do |f|
                     i = @target.index(f)
                     t = @target.delete_at(i) if i
-                    (t && t.changed?) ? t : f
+                    if t && t.changed?
+                      t
+                    else
+                      f.mark_for_destruction if t && t.marked_for_destruction?
+                      f
+                    end
                   end + @target
                 else
                   @target = find_target

activerecord/test/cases/nested_attributes_test.rb

@@ -489,6 +489,12 @@ module NestedAttributesOnACollectionAssociationTests
     assert_equal 'Polly', @pirate.send(@association_name).send(:load_target).last.name
   end
 
+  def test_should_not_remove_scheduled_destroys_when_loading_association
+    @pirate.reload
+    @pirate.send(association_setter, [{ :id => @child_1.id, :_destroy => '1' }])
+    assert @pirate.send(@association_name).send(:load_target).find { |r| r.id == @child_1.id }.marked_for_destruction?
+  end
+
   def test_should_take_a_hash_with_composite_id_keys_and_assign_the_attributes_to_the_associated_models
     @child_1.stubs(:id).returns('ABC1X')
     @child_2.stubs(:id).returns('ABC2X')