fixes a merge conflict
This commit is contained in:
parent
18439e28e0
commit
ce76cfc61f
@ -793,7 +793,6 @@ def destroy(*args)
|
|||||||
def test_should_destroy_habtm_as_part_of_the_save_transaction_if_they_were_marked_for_destruction
|
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}") }
|
2.times { |i| @pirate.parrots.create!(:name => "parrots_#{i}") }
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
assert !@pirate.parrots.any? { |parrot| parrot.marked_for_destruction? }
|
assert !@pirate.parrots.any? { |parrot| parrot.marked_for_destruction? }
|
||||||
@pirate.parrots.each { |parrot| parrot.mark_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
|
def test_should_skip_validation_on_habtm_if_marked_for_destruction
|
||||||
2.times { |i| @pirate.parrots.create!(:name => "parrots_#{i}") }
|
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 = '' }
|
@pirate.parrots.each { |parrot| parrot.name = '' }
|
||||||
assert !@pirate.valid?
|
assert !@pirate.valid?
|
||||||
|
Loading…
Reference in New Issue
Block a user