diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2013-06-28 02:13:06 -0700 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2013-06-28 02:13:06 -0700 |
| commit | 2ea71837991e40ed8a80f4ce1f6ccb6609891525 (patch) | |
| tree | cdb1774d4b2cc70b135a9f763a1c1137ceef0c5d /activerecord/test/cases/associations/eager_test.rb | |
| parent | 569227b0914f4592fbee897d9c97f5f740dd2637 (diff) | |
| parent | 3cc7223f3d57f31affdbabccc86cbc8b6589e2c8 (diff) | |
| download | rails-2ea71837991e40ed8a80f4ce1f6ccb6609891525.tar.gz rails-2ea71837991e40ed8a80f4ce1f6ccb6609891525.tar.bz2 rails-2ea71837991e40ed8a80f4ce1f6ccb6609891525.zip | |
Merge pull request #11153 from strzalek/remove-ar-deprecated-finders
Remove depreacted finders
Diffstat (limited to 'activerecord/test/cases/associations/eager_test.rb')
| -rw-r--r-- | activerecord/test/cases/associations/eager_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb index 1cfaf552af..846ef05c7d 100644 --- a/activerecord/test/cases/associations/eager_test.rb +++ b/activerecord/test/cases/associations/eager_test.rb @@ -554,9 +554,9 @@ class EagerAssociationTest < ActiveRecord::TestCase assert_equal 2, posts.size count = ActiveSupport::Deprecation.silence do - Post.count(:include => [ :author, :comments ], :limit => 2, :conditions => [ "authors.name = ?", 'David' ]) + Post.includes(:author, :comments).limit(2).references(:author).where("authors.name = ?", 'David').count end - assert_equal count, posts.size + assert_equal posts.size, count end def test_eager_with_has_many_and_limit_and_high_offset |