aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-11-03 19:51:52 -0200
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-11-03 19:56:18 -0200
commit66bcaff0620e0b4ba1c7cc711f356007a65d12ec (patch)
tree7e5ec6ecf05ec4b29760e41c85432868c8eac83a /activerecord
parent51b901408e09e8c501261df6e2a0a4d0607af3b7 (diff)
downloadrails-66bcaff0620e0b4ba1c7cc711f356007a65d12ec.tar.gz
rails-66bcaff0620e0b4ba1c7cc711f356007a65d12ec.tar.bz2
rails-66bcaff0620e0b4ba1c7cc711f356007a65d12ec.zip
Simplify query conditions a bit in nested attributes test
Also refactor the test a bit.
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/nested_attributes_test.rb8
1 files changed, 3 insertions, 5 deletions
diff --git a/activerecord/test/cases/nested_attributes_test.rb b/activerecord/test/cases/nested_attributes_test.rb
index fe9eddbdec..533920fe8c 100644
--- a/activerecord/test/cases/nested_attributes_test.rb
+++ b/activerecord/test/cases/nested_attributes_test.rb
@@ -464,17 +464,15 @@ class TestNestedAttributesOnABelongsToAssociation < ActiveRecord::TestCase
end
def test_should_unset_association_when_an_existing_record_is_destroyed
- @ship.reload
original_pirate_id = @ship.pirate.id
- @ship.attributes = {:pirate_attributes => {:id => @ship.pirate.id, :_destroy => true}}
- @ship.save!
+ @ship.update_attributes! pirate_attributes: { id: @ship.pirate.id, _destroy: true }
- assert_empty Pirate.where(["id = ?", original_pirate_id])
+ assert_empty Pirate.where(id: original_pirate_id)
assert_nil @ship.pirate_id
assert_nil @ship.pirate
@ship.reload
- assert_empty Pirate.where(["id = ?", original_pirate_id])
+ assert_empty Pirate.where(id: original_pirate_id)
assert_nil @ship.pirate_id
assert_nil @ship.pirate
end