remove deprecated #first calls

3 files changed, 3 insertions, 28 deletions

diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb
index 321dae4143..43251a12e3 100644
--- a/activerecord/test/cases/associations/has_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_associations_test.rb
@@ -805,7 +805,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
   end
 
   def test_deleting_updates_counter_cache
-    topic = Topic.first(:order => "id ASC")
+    topic = Topic.order("id ASC").first
     assert_equal topic.replies.to_a.size, topic.replies_count
 
     topic.replies.delete(topic.replies.first)
@@ -1491,17 +1491,6 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     end
   end
 
-  def test_calling_first_or_last_with_find_options_on_loaded_association_should_fetch_with_query
-    firm = companies(:first_firm)
-    firm.clients.class # force load target
-
-    assert_queries 2 do
-      assert firm.clients.loaded?
-      firm.clients.first(:order => 'name')
-      firm.clients.last(:order => 'name')
-    end
-  end
-
   def test_calling_first_or_last_with_integer_on_association_should_load_association
     firm = companies(:first_firm)
 
diff --git a/activerecord/test/cases/named_scope_test.rb b/activerecord/test/cases/named_scope_test.rb
index d4a495487d..1aa0c7ec25 100644
--- a/activerecord/test/cases/named_scope_test.rb
+++ b/activerecord/test/cases/named_scope_test.rb
@@ -146,11 +146,6 @@ class NamedScopeTest < ActiveRecord::TestCase
     assert_equal scope, Topic.scoped(where: "content LIKE '%Have%'")
   end
 
-  def test_first_and_last_should_support_find_options
-    assert_equal Topic.base.first(:order => 'title'), Topic.base.find(:first, :order => 'title')
-    assert_equal Topic.base.last(:order => 'title'), Topic.base.find(:last, :order => 'title')
-  end
-
   def test_first_and_last_should_allow_integers_for_limit
     assert_equal Topic.base.first(2), Topic.base.to_a.first(2)
     assert_equal Topic.base.last(2), Topic.base.order("id").to_a.last(2)
@@ -165,15 +160,6 @@ class NamedScopeTest < ActiveRecord::TestCase
     end
   end
 
-  def test_first_and_last_find_options_should_use_query_when_results_are_loaded
-    topics = Topic.base
-    topics.reload # force load
-    assert_queries(2) do
-      topics.first(:order => 'title')
-      topics.last(:order => 'title')
-    end
-  end
-
   def test_empty_should_not_load_results
     topics = Topic.base
     assert_queries(2) do
diff --git a/activerecord/test/cases/relation_scoping_test.rb b/activerecord/test/cases/relation_scoping_test.rb
index 7216282892..187ff3457e 100644
--- a/activerecord/test/cases/relation_scoping_test.rb
+++ b/activerecord/test/cases/relation_scoping_test.rb
@@ -53,8 +53,8 @@ class RelationScopingTest < ActiveRecord::TestCase
   end
 
   def test_scoped_find_last_preserves_scope
-    lowest_salary  = Developer.first :order => "salary ASC"
-    highest_salary = Developer.first :order => "salary DESC"
+    lowest_salary  = Developer.order("salary ASC").first
+    highest_salary = Developer.order("salary DESC").first
 
     Developer.order("salary").scoping do
       assert_equal highest_salary, Developer.last