Permalink
Browse files

Merge pull request #11153 from strzalek/remove-ar-deprecated-finders

Remove depreacted finders
  • Loading branch information...
2 parents 569227b + 3cc7223 commit 2ea71837991e40ed8a80f4ce1f6ccb6609891525 @jonleighton jonleighton committed Jun 28, 2013
@@ -1,3 +1,7 @@
+* Remove `activerecord-deprecated_finders` as a dependency
+
+ *Łukasz Strzałkowski*
+
* Remove Oracle / Sqlserver / Firebird database tasks that were deprecated in 4.0.
*kennyj*
@@ -25,5 +25,4 @@ Gem::Specification.new do |s|
s.add_dependency 'activemodel', version
s.add_dependency 'arel', '~> 4.0.0'
- s.add_dependency 'activerecord-deprecated_finders', '~> 1.0.2'
end
@@ -25,7 +25,6 @@
require 'active_support/rails'
require 'active_model'
require 'arel'
-require 'active_record/deprecated_finders'
require 'active_record/version'
@@ -554,9 +554,9 @@ def test_eager_with_has_many_and_limit_and_conditions_array_on_the_eagers
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
Oops, something went wrong.

0 comments on commit 2ea7183

Please sign in to comment.