Remove deprecated scope use without passing a callable object.

Removed tests from deprecated code.

activerecord/CHANGELOG.md

@@ -1,3 +1,7 @@
+*   Remove deprecated `scope` use without passing a callable object.
+
+    *Arun Agrawal*
+
 *   Remove deprecated `transaction_joinable=` in favor of `begin_transaction`
     with `:joinable` option.
 

activerecord/lib/active_record/scoping/named.rb

@@ -141,19 +141,6 @@ def scope_attributes? # :nodoc:
         def scope(name, body, &block)
           extension = Module.new(&block) if block
 
-          # Check body.is_a?(Relation) to prevent the relation actually being
-          # loaded by respond_to?
-          if body.is_a?(Relation) || !body.respond_to?(:call)
-            ActiveSupport::Deprecation.warn(
-              "Using #scope without passing a callable object is deprecated. For " \
-              "example `scope :red, where(color: 'red')` should be changed to " \
-              "`scope :red, -> { where(color: 'red') }`. There are numerous gotchas " \
-              "in the former usage and it makes the implementation more complicated " \
-              "and buggy. (If you prefer, you can just define a class method named " \
-              "`self.red`.)"
-            )
-          end
-
           singleton_class.send(:define_method, name) do |*args|
             if body.respond_to?(:call)
               scope = all.scoping { body.call(*args) }

activerecord/test/cases/scoping/named_scoping_test.rb

@@ -435,16 +435,6 @@ def test_scoped_are_lazy_loaded_if_table_still_does_not_exist
     end
   end
 
-  def test_eager_scopes_are_deprecated
-    klass = Class.new(ActiveRecord::Base)
-    klass.table_name = 'posts'
-
-    assert_deprecated do
-      klass.scope :welcome_2, klass.where(:id => posts(:welcome).id)
-    end
-    assert_equal [posts(:welcome).title], klass.welcome_2.map(&:title)
-  end
-
   def test_eager_default_scope_relations_are_remove
     klass = Class.new(ActiveRecord::Base)
     klass.table_name = 'posts'