Deprecate ActiveRecord::Base.scoped.

It doesn't serve much purpose now that ActiveRecord::Base.all returns a
Relation.

The code is moved to active_record_deprecated_finders.

1 files changed, 4 insertions, 4 deletions

diff --git a/activerecord/test/cases/modules_test.rb b/activerecord/test/cases/modules_test.rb
index a03c4f552e..08b3408665 100644
--- a/activerecord/test/cases/modules_test.rb
+++ b/activerecord/test/cases/modules_test.rb
@@ -39,7 +39,7 @@ class ModulesTest < ActiveRecord::TestCase
   end
 
   def test_associations_spanning_cross_modules
-    account = MyApplication::Billing::Account.scoped(:order => 'id').first
+    account = MyApplication::Billing::Account.all.merge!(:order => 'id').first
     assert_kind_of MyApplication::Business::Firm, account.firm
     assert_kind_of MyApplication::Billing::Firm, account.qualified_billing_firm
     assert_kind_of MyApplication::Billing::Firm, account.unqualified_billing_firm
@@ -48,7 +48,7 @@ class ModulesTest < ActiveRecord::TestCase
   end
 
   def test_find_account_and_include_company
-    account = MyApplication::Billing::Account.scoped(:includes => :firm).find(1)
+    account = MyApplication::Billing::Account.all.merge!(:includes => :firm).find(1)
     assert_kind_of MyApplication::Business::Firm, account.firm
   end
 
@@ -72,8 +72,8 @@ class ModulesTest < ActiveRecord::TestCase
     clients = []
 
     assert_nothing_raised NameError, "Should be able to resolve all class constants via reflection" do
-      clients << MyApplication::Business::Client.references(:accounts).scoped(:includes => {:firm => :account}, :where => 'accounts.id IS NOT NULL').find(3)
-      clients << MyApplication::Business::Client.scoped(:includes => {:firm => :account}).find(3)
+      clients << MyApplication::Business::Client.references(:accounts).merge!(:includes => {:firm => :account}, :where => 'accounts.id IS NOT NULL').find(3)
+      clients << MyApplication::Business::Client.includes(:firm => :account).find(3)
     end
 
     clients.each do |client|