aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/associations/eager_test.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-03-13 11:47:12 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2014-03-13 11:47:12 -0700
commitd35f0033c7dec2b8d8b52058fb8db495d49596f7 (patch)
tree4aa39f75ec80d4e0d16bc1bc80aff0c0df71673b /activerecord/test/cases/associations/eager_test.rb
parentd92ae6ccca3bcfd73546d612efaea011270bd270 (diff)
downloadrails-d35f0033c7dec2b8d8b52058fb8db495d49596f7.tar.gz
rails-d35f0033c7dec2b8d8b52058fb8db495d49596f7.tar.bz2
rails-d35f0033c7dec2b8d8b52058fb8db495d49596f7.zip
passing an instance of an AR object to `find` is deprecated
please pass the id of the AR object by calling `.id` on the model first.
Diffstat (limited to 'activerecord/test/cases/associations/eager_test.rb')
-rw-r--r--activerecord/test/cases/associations/eager_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb
index 5522a33b79..416a39ea4c 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/activerecord/test/cases/associations/eager_test.rb
@@ -407,19 +407,19 @@ class EagerAssociationTest < ActiveRecord::TestCase
end
def test_eager_load_has_one_quotes_table_and_column_names
- michael = Person.all.merge!(:includes => :favourite_reference).find(people(:michael))
+ michael = Person.all.merge!(:includes => :favourite_reference).find(people(:michael).id)
references(:michael_unicyclist)
assert_no_queries{ assert_equal references(:michael_unicyclist), michael.favourite_reference}
end
def test_eager_load_has_many_quotes_table_and_column_names
- michael = Person.all.merge!(:includes => :references).find(people(:michael))
+ michael = Person.all.merge!(:includes => :references).find(people(:michael).id)
references(:michael_magician,:michael_unicyclist)
assert_no_queries{ assert_equal references(:michael_magician,:michael_unicyclist), michael.references.sort_by(&:id) }
end
def test_eager_load_has_many_through_quotes_table_and_column_names
- michael = Person.all.merge!(:includes => :jobs).find(people(:michael))
+ michael = Person.all.merge!(:includes => :jobs).find(people(:michael).id)
jobs(:magician, :unicyclist)
assert_no_queries{ assert_equal jobs(:unicyclist, :magician), michael.jobs.sort_by(&:id) }
end