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, 58 insertions, 58 deletions

diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 1ee02afeff..9c64cb35e4 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -34,7 +34,7 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_bind_values
-    relation = Post.scoped
+    relation = Post.all
     assert_equal [], relation.bind_values
 
     relation2 = relation.bind 'foo'
@@ -59,34 +59,34 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_scoped
-    topics = Topic.scoped
+    topics = Topic.all
     assert_kind_of ActiveRecord::Relation, topics
     assert_equal 4, topics.size
   end
 
   def test_to_json
-    assert_nothing_raised  { Bird.scoped.to_json }
-    assert_nothing_raised  { Bird.scoped.to_a.to_json }
+    assert_nothing_raised  { Bird.all.to_json }
+    assert_nothing_raised  { Bird.all.to_a.to_json }
   end
 
   def test_to_yaml
-    assert_nothing_raised  { Bird.scoped.to_yaml }
-    assert_nothing_raised  { Bird.scoped.to_a.to_yaml }
+    assert_nothing_raised  { Bird.all.to_yaml }
+    assert_nothing_raised  { Bird.all.to_a.to_yaml }
   end
 
   def test_to_xml
-    assert_nothing_raised  { Bird.scoped.to_xml }
-    assert_nothing_raised  { Bird.scoped.to_a.to_xml }
+    assert_nothing_raised  { Bird.all.to_xml }
+    assert_nothing_raised  { Bird.all.to_a.to_xml }
   end
 
   def test_scoped_all
-    topics = Topic.scoped.to_a
+    topics = Topic.all.to_a
     assert_kind_of Array, topics
     assert_no_queries { assert_equal 4, topics.size }
   end
 
   def test_loaded_all
-    topics = Topic.scoped
+    topics = Topic.all
 
     assert_queries(1) do
       2.times { assert_equal 4, topics.to_a.size }
@@ -96,7 +96,7 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_scoped_first
-    topics = Topic.scoped.order('id ASC')
+    topics = Topic.all.order('id ASC')
 
     assert_queries(1) do
       2.times { assert_equal "The First Topic", topics.first.title }
@@ -106,7 +106,7 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_loaded_first
-    topics = Topic.scoped.order('id ASC')
+    topics = Topic.all.order('id ASC')
 
     assert_queries(1) do
       topics.to_a # force load
@@ -117,7 +117,7 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_reload
-    topics = Topic.scoped
+    topics = Topic.all
 
     assert_queries(1) do
       2.times { topics.to_a }
@@ -218,14 +218,14 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_select_with_block
-    even_ids = Developer.scoped.select {|d| d.id % 2 == 0 }.map(&:id)
+    even_ids = Developer.all.select {|d| d.id % 2 == 0 }.map(&:id)
     assert_equal [2, 4, 6, 8, 10], even_ids.sort
   end
 
   def test_none
     assert_no_queries do
       assert_equal [], Developer.none
-      assert_equal [], Developer.scoped.none
+      assert_equal [], Developer.all.none
     end
   end
 
@@ -294,7 +294,7 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_find_on_hash_conditions
-    assert_equal Topic.scoped(:where => {:approved => false}).to_a, Topic.where({ :approved => false }).to_a
+    assert_equal Topic.all.merge!(:where => {:approved => false}).to_a, Topic.where({ :approved => false }).to_a
   end
 
   def test_joins_with_string_array
@@ -307,15 +307,15 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_scoped_responds_to_delegated_methods
-    relation = Topic.scoped
+    relation = Topic.all
 
     ["map", "uniq", "sort", "insert", "delete", "update"].each do |method|
-      assert_respond_to relation, method, "Topic.scoped should respond to #{method.inspect}"
+      assert_respond_to relation, method, "Topic.all should respond to #{method.inspect}"
     end
   end
 
   def test_respond_to_delegates_to_relation
-    relation = Topic.scoped
+    relation = Topic.all
     fake_arel = Struct.new(:responds) {
       def respond_to? method, access = false
         responds << [method, access]
@@ -334,20 +334,20 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_respond_to_dynamic_finders
-    relation = Topic.scoped
+    relation = Topic.all
 
     ["find_by_title", "find_by_title_and_author_name", "find_or_create_by_title", "find_or_initialize_by_title_and_author_name"].each do |method|
-      assert_respond_to relation, method, "Topic.scoped should respond to #{method.inspect}"
+      assert_respond_to relation, method, "Topic.all should respond to #{method.inspect}"
     end
   end
 
   def test_respond_to_class_methods_and_scopes
-    assert Topic.scoped.respond_to?(:by_lifo)
+    assert Topic.all.respond_to?(:by_lifo)
   end
 
   def test_find_with_readonly_option
-    Developer.scoped.each { |d| assert !d.readonly? }
-    Developer.scoped.readonly.each { |d| assert d.readonly? }
+    Developer.all.each { |d| assert !d.readonly? }
+    Developer.all.readonly.each { |d| assert d.readonly? }
   end
 
   def test_eager_association_loading_of_stis_with_multiple_references
@@ -396,7 +396,7 @@ class RelationTest < ActiveRecord::TestCase
     end
 
     assert_queries(2) do
-      posts = Post.scoped.includes(:comments).order('posts.id')
+      posts = Post.all.includes(:comments).order('posts.id')
       assert posts.first.comments.first
     end
 
@@ -413,12 +413,12 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_default_scope_with_conditions_string
-    assert_equal Developer.where(name: 'David').map(&:id).sort, DeveloperCalledDavid.scoped.map(&:id).sort
+    assert_equal Developer.where(name: 'David').map(&:id).sort, DeveloperCalledDavid.all.map(&:id).sort
     assert_nil DeveloperCalledDavid.create!.name
   end
 
   def test_default_scope_with_conditions_hash
-    assert_equal Developer.where(name: 'Jamis').map(&:id).sort, DeveloperCalledJamis.scoped.map(&:id).sort
+    assert_equal Developer.where(name: 'Jamis').map(&:id).sort, DeveloperCalledJamis.all.map(&:id).sort
     assert_equal 'Jamis', DeveloperCalledJamis.create!.name
   end
 
@@ -457,20 +457,20 @@ class RelationTest < ActiveRecord::TestCase
       assert_equal expected_taggings, author.taggings.uniq.sort_by { |t| t.id }
     end
 
-    authors = Author.scoped
+    authors = Author.all
     assert_equal david, authors.find_by_id_and_name(david.id, david.name)
     assert_equal david, authors.find_by_id_and_name!(david.id, david.name)
   end
 
   def test_dynamic_find_by_attributes_bang
-    author = Author.scoped.find_by_id!(authors(:david).id)
+    author = Author.all.find_by_id!(authors(:david).id)
     assert_equal "David", author.name
 
-    assert_raises(ActiveRecord::RecordNotFound) { Author.scoped.find_by_id_and_name!(20, 'invalid') }
+    assert_raises(ActiveRecord::RecordNotFound) { Author.all.find_by_id_and_name!(20, 'invalid') }
   end
 
   def test_find_id
-    authors = Author.scoped
+    authors = Author.all
 
     david = authors.find(authors(:david).id)
     assert_equal 'David', david.name
@@ -493,13 +493,13 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_find_in_empty_array
-    authors = Author.scoped.where(:id => [])
+    authors = Author.all.where(:id => [])
     assert_blank authors.to_a
   end
 
   def test_where_with_ar_object
     author = Author.first
-    authors = Author.scoped.where(:id => author)
+    authors = Author.all.where(:id => author)
     assert_equal 1, authors.to_a.length
   end
 
@@ -615,7 +615,7 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_last
-    authors = Author.scoped
+    authors = Author.all
     assert_equal authors(:bob), authors.last
   end
 
@@ -670,8 +670,8 @@ class RelationTest < ActiveRecord::TestCase
 
   def test_relation_merging_with_eager_load
     relations = []
-    relations << Post.order('comments.id DESC').merge(Post.eager_load(:last_comment)).merge(Post.scoped)
-    relations << Post.eager_load(:last_comment).merge(Post.order('comments.id DESC')).merge(Post.scoped)
+    relations << Post.order('comments.id DESC').merge(Post.eager_load(:last_comment)).merge(Post.all)
+    relations << Post.eager_load(:last_comment).merge(Post.order('comments.id DESC')).merge(Post.all)
 
     relations.each do |posts|
       post = posts.find { |p| p.id == 1 }
@@ -685,7 +685,7 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_relation_merging_with_preload
-    [Post.scoped.merge(Post.preload(:author)), Post.preload(:author).merge(Post.scoped)].each do |posts|
+    [Post.all.merge(Post.preload(:author)), Post.preload(:author).merge(Post.all)].each do |posts|
       assert_queries(2) { assert posts.first.author }
     end
   end
@@ -704,7 +704,7 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_count
-    posts = Post.scoped
+    posts = Post.all
 
     assert_equal 11, posts.count
     assert_equal 11, posts.count(:all)
@@ -715,7 +715,7 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_count_with_distinct
-    posts = Post.scoped
+    posts = Post.all
 
     assert_equal 3, posts.count(:comments_count, :distinct => true)
     assert_equal 11, posts.count(:comments_count, :distinct => false)
@@ -726,7 +726,7 @@ class RelationTest < ActiveRecord::TestCase
 
   def test_count_explicit_columns
     Post.update_all(:comments_count => nil)
-    posts = Post.scoped
+    posts = Post.all
 
     assert_equal [0], posts.select('comments_count').where('id is not null').group('id').order('id').count.values.uniq
     assert_equal 0, posts.where('id is not null').select('comments_count').count
@@ -738,13 +738,13 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_multiple_selects
-    post = Post.scoped.select('comments_count').select('title').order("id ASC").first
+    post = Post.all.select('comments_count').select('title').order("id ASC").first
     assert_equal "Welcome to the weblog", post.title
     assert_equal 2, post.comments_count
   end
 
   def test_size
-    posts = Post.scoped
+    posts = Post.all
 
     assert_queries(1) { assert_equal 11, posts.size }
     assert ! posts.loaded?
@@ -790,7 +790,7 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_empty
-    posts = Post.scoped
+    posts = Post.all
 
     assert_queries(1) { assert_equal false, posts.empty? }
     assert ! posts.loaded?
@@ -816,7 +816,7 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_any
-    posts = Post.scoped
+    posts = Post.all
 
     # This test was failing when run on its own (as opposed to running the entire suite).
     # The second line in the assert_queries block was causing visit_Arel_Attributes_Attribute
@@ -838,7 +838,7 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_many
-    posts = Post.scoped
+    posts = Post.all
 
     assert_queries(2) do
       assert posts.many? # Uses COUNT()
@@ -850,14 +850,14 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_many_with_limits
-    posts = Post.scoped
+    posts = Post.all
 
     assert posts.many?
     assert ! posts.limit(1).many?
   end
 
   def test_build
-    posts = Post.scoped
+    posts = Post.all
 
     post = posts.new
     assert_kind_of Post, post
@@ -872,7 +872,7 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_create
-    birds = Bird.scoped
+    birds = Bird.all
 
     sparrow = birds.create
     assert_kind_of Bird, sparrow
@@ -884,7 +884,7 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_create_bang
-    birds = Bird.scoped
+    birds = Bird.all
 
     assert_raises(ActiveRecord::RecordInvalid) { birds.create! }
 
@@ -1074,12 +1074,12 @@ class RelationTest < ActiveRecord::TestCase
 
   def test_order_using_scoping
     car1 = CoolCar.order('id DESC').scoping do
-      CoolCar.scoped(:order => 'id asc').first
+      CoolCar.all.merge!(:order => 'id asc').first
     end
     assert_equal 'zyke', car1.name
 
     car2 = FastCar.order('id DESC').scoping do
-      FastCar.scoped(:order => 'id asc').first
+      FastCar.all.merge!(:order => 'id asc').first
     end
     assert_equal 'zyke', car2.name
   end
@@ -1098,7 +1098,7 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_primary_key
-    assert_equal "id", Post.scoped.primary_key
+    assert_equal "id", Post.all.primary_key
   end
 
   def test_eager_loading_with_conditions_on_joins
@@ -1222,7 +1222,7 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_presence
-    topics = Topic.scoped
+    topics = Topic.all
 
     # the first query is triggered because there are no topics yet.
     assert_queries(1) { assert topics.present? }
@@ -1256,7 +1256,7 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   test "find_by returns nil if the record is missing" do
-    assert_equal nil, Post.scoped.find_by("1 = 0")
+    assert_equal nil, Post.all.find_by("1 = 0")
   end
 
   test "find_by doesn't have implicit ordering" do
@@ -1281,12 +1281,12 @@ class RelationTest < ActiveRecord::TestCase
 
   test "find_by! raises RecordNotFound if the record is missing" do
     assert_raises(ActiveRecord::RecordNotFound) do
-      Post.scoped.find_by!("1 = 0")
+      Post.all.find_by!("1 = 0")
     end
   end
 
   test "loaded relations cannot be mutated by multi value methods" do
-    relation = Post.scoped
+    relation = Post.all
     relation.to_a
 
     assert_raises(ActiveRecord::ImmutableRelation) do
@@ -1295,7 +1295,7 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   test "loaded relations cannot be mutated by single value methods" do
-    relation = Post.scoped
+    relation = Post.all
     relation.to_a
 
     assert_raises(ActiveRecord::ImmutableRelation) do
@@ -1304,7 +1304,7 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   test "loaded relations cannot be mutated by merge!" do
-    relation = Post.scoped
+    relation = Post.all
     relation.to_a
 
     assert_raises(ActiveRecord::ImmutableRelation) do