aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/autosave_association_test.rb
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2013-01-18 09:15:19 -0500
committerGuillermo Iguaran <guilleiguaran@gmail.com>2013-01-18 09:15:19 -0500
commit8aebe30ef4d3d169bfb0900f4f4b396b74c8d20a (patch)
tree9406b572ea9d9fadcfabca94084834e1188f8c25 /activerecord/test/cases/autosave_association_test.rb
parent637a7d9d357a0f3f725b0548282ca8c5e7d4af4a (diff)
downloadrails-8aebe30ef4d3d169bfb0900f4f4b396b74c8d20a.tar.gz
rails-8aebe30ef4d3d169bfb0900f4f4b396b74c8d20a.tar.bz2
rails-8aebe30ef4d3d169bfb0900f4f4b396b74c8d20a.zip
Revert "Merge pull request #8989 from robertomiranda/use-rails-4-find-by"
This reverts commit 637a7d9d357a0f3f725b0548282ca8c5e7d4af4a, reversing changes made to 5937bd02dee112646469848d7fe8a8bfcef5b4c1.
Diffstat (limited to 'activerecord/test/cases/autosave_association_test.rb')
-rw-r--r--activerecord/test/cases/autosave_association_test.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/activerecord/test/cases/autosave_association_test.rb b/activerecord/test/cases/autosave_association_test.rb
index a138b579a3..e5cb4f8f7a 100644
--- a/activerecord/test/cases/autosave_association_test.rb
+++ b/activerecord/test/cases/autosave_association_test.rb
@@ -497,7 +497,7 @@ class TestDefaultAutosaveAssociationOnAHasManyAssociation < ActiveRecord::TestCa
assert firm.save
firm.reload
assert_equal 2, firm.clients.length
- assert firm.clients.include?(Client.find_by(name: "New Client"))
+ assert firm.clients.include?(Client.find_by_name("New Client"))
end
end
@@ -591,11 +591,11 @@ class TestDestroyAsPartOfAutosaveAssociation < ActiveRecord::TestCase
id = @pirate.ship.id
assert @pirate.ship.marked_for_destruction?
- assert Ship.find_by(id:id)
+ assert Ship.find_by_id(id)
@pirate.save
assert_nil @pirate.reload.ship
- assert_nil Ship.find_by(id: id)
+ assert_nil Ship.find_by_id(id)
end
def test_should_skip_validation_on_a_child_association_if_marked_for_destruction
@@ -638,11 +638,11 @@ class TestDestroyAsPartOfAutosaveAssociation < ActiveRecord::TestCase
id = @ship.pirate.id
assert @ship.pirate.marked_for_destruction?
- assert Pirate.find_by(id: id)
+ assert Pirate.find_by_id(id)
@ship.save
assert_nil @ship.reload.pirate
- assert_nil Pirate.find_by(id:id)
+ assert_nil Pirate.find_by_id(id)
end
def test_should_skip_validation_on_a_parent_association_if_marked_for_destruction
@@ -698,11 +698,11 @@ class TestDestroyAsPartOfAutosaveAssociation < ActiveRecord::TestCase
ids = @pirate.birds.map(&:id)
assert @pirate.birds.all? { |child| child.marked_for_destruction? }
- ids.each { |id| assert klass.find_by(id: id) }
+ ids.each { |id| assert klass.find_by_id(id) }
@pirate.save
assert @pirate.reload.birds.empty?
- ids.each { |id| assert_nil klass.find_by(id: id) }
+ ids.each { |id| assert_nil klass.find_by_id(id) }
end
def test_should_skip_validation_on_has_many_if_marked_for_destruction