TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fixes a merge conflict

Browse Source
This commit is contained in:
Xavier Noria 2011-02-19 00:42:15 +01:00
parent 18439e28e0
commit ce76cfc61f
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
activerecord/test/cases/autosave_association_test.rb
View File

@ -793,7 +793,6 @@ def destroy(*args)
def test_should_destroy_habtm_as_part_of_the_save_transaction_if_they_were_marked_for_destruction
2.times { |i| @pirate.parrots.create!(:name => "parrots_#{i}") }
<<<<<<< HEAD
assert !@pirate.parrots.any? { |parrot| parrot.marked_for_destruction? }
@pirate.parrots.each { |parrot| parrot.mark_for_destruction }
@ -809,15 +808,6 @@ def test_should_destroy_habtm_as_part_of_the_save_transaction_if_they_were_marke
def test_should_skip_validation_on_habtm_if_marked_for_destruction
2.times { |i| @pirate.parrots.create!(:name => "parrots_#{i}") }
=======
# Stub the destroy method of the second child to raise an exception
class << before.last
def destroy(*args)
super
raise 'Oh noes!'
end
end
>>>>>>> 220cb107b672d65fdc0488d4ff310ab04b62b463
@pirate.parrots.each { |parrot| parrot.name = '' }
assert !@pirate.valid?