mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
remove deprecate #all usage
This commit is contained in:
parent
58663218e8
commit
b30996307d
4 changed files with 3 additions and 7 deletions
|
@ -123,7 +123,7 @@ class EagerLoadNestedIncludeWithMissingDataTest < ActiveRecord::TestCase
|
|||
assert_nothing_raised do
|
||||
# @davey_mcdave doesn't have any author_favorites
|
||||
includes = {:posts => :comments, :categorizations => :category, :author_favorites => :favorite_author }
|
||||
Author.all :include => includes, :conditions => {:authors => {:name => @davey_mcdave.name}}, :order => 'categories.name'
|
||||
Author.scoped(:includes => includes, :where => {:authors => {:name => @davey_mcdave.name}}, :order => 'categories.name').to_a
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -335,7 +335,7 @@ class FinderTest < ActiveRecord::TestCase
|
|||
end
|
||||
|
||||
def test_find_with_hash_conditions_on_joined_table_and_with_range
|
||||
firms = DependentFirm.all :joins => :account, :conditions => {:name => 'RailsCore', :accounts => { :credit_limit => 55..60 }}
|
||||
firms = DependentFirm.scoped :joins => :account, :where => {:name => 'RailsCore', :accounts => { :credit_limit => 55..60 }}
|
||||
assert_equal 1, firms.size
|
||||
assert_equal companies(:rails_core), firms.first
|
||||
end
|
||||
|
|
|
@ -120,7 +120,7 @@ class PersistencesTest < ActiveRecord::TestCase
|
|||
|
||||
def test_destroy_all
|
||||
conditions = "author_name = 'Mary'"
|
||||
topics_by_mary = Topic.all(:conditions => conditions, :order => 'id')
|
||||
topics_by_mary = Topic.scoped(:where => conditions, :order => 'id').to_a
|
||||
assert ! topics_by_mary.empty?
|
||||
|
||||
assert_difference('Topic.count', -topics_by_mary.size) do
|
||||
|
|
|
@ -1126,10 +1126,6 @@ class RelationTest < ActiveRecord::TestCase
|
|||
assert_equal [rails_author], relation & [rails_author]
|
||||
end
|
||||
|
||||
def test_removing_limit_with_options
|
||||
assert_not_equal 1, Post.limit(1).all(:limit => nil).count
|
||||
end
|
||||
|
||||
def test_primary_key
|
||||
assert_equal "id", Post.scoped.primary_key
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue