removed deprecation warnings #6029

Merged
merged 1 commit into from Apr 28, 2012
@@ -478,7 +478,7 @@ def test_singular_table_name_guesses_for_individual_table
if current_adapter?(:MysqlAdapter) or current_adapter?(:Mysql2Adapter)
def test_update_all_with_order_and_limit
- assert_equal 1, Topic.update_all("content = 'bulk updated!'", nil, :limit => 1, :order => 'id DESC')
+ assert_equal 1, Topic.limit(1).order('id DESC').update_all(:content => 'bulk updated!')
end
end
@@ -358,7 +358,7 @@ def setup
def test_sane_find_with_lock
assert_nothing_raised do
Person.transaction do
- Person.find 1, :lock => true
+ Person.lock.find(1)
end
end
end
@@ -369,7 +369,7 @@ def test_sane_find_with_lock
def test_eager_find_with_lock
assert_nothing_raised do
Person.transaction do
- Person.find 1, :include => :readers, :lock => true
+ Person.includes(:readers).lock.find(1)
end
end
end