extract deprecated code

3 files changed, 4 insertions, 11 deletions

diff --git a/activerecord/lib/active_record/scoping/named.rb b/activerecord/lib/active_record/scoping/named.rb
index 5943baf93b..2af476c1ba 100644
--- a/activerecord/lib/active_record/scoping/named.rb
+++ b/activerecord/lib/active_record/scoping/named.rb
@@ -171,7 +171,7 @@ module ActiveRecord
         #   Article.published.featured.latest_article
         #   Article.featured.titles
 
-        def scope(name, body = {}, &block)
+        def scope(name, body, &block)
           extension = Module.new(&block) if block
 
           # Check body.is_a?(Relation) to prevent the relation actually being
@@ -188,9 +188,7 @@ module ActiveRecord
           end
 
           singleton_class.send(:define_method, name) do |*args|
-            options = body.respond_to?(:call) ? unscoped { body.call(*args) } : body
-            options = scoped.apply_finder_options(options) if options.is_a?(Hash)
-
+            options  = body.respond_to?(:call) ? unscoped { body.call(*args) } : body
             relation = scoped.merge(options)
 
             extension ? relation.extending(extension) : relation
diff --git a/activerecord/test/cases/named_scope_test.rb b/activerecord/test/cases/named_scope_test.rb
index 2f4eb489ab..06d076943e 100644
--- a/activerecord/test/cases/named_scope_test.rb
+++ b/activerecord/test/cases/named_scope_test.rb
@@ -460,11 +460,6 @@ class NamedScopeTest < ActiveRecord::TestCase
     klass.table_name = 'posts'
 
     assert_deprecated do
-      klass.scope :welcome, { :conditions => { :id => posts(:welcome).id } }
-    end
-    assert_equal [posts(:welcome).title], klass.welcome.map(&:title)
-
-    assert_deprecated do
       klass.scope :welcome_2, klass.where(:id => posts(:welcome).id)
     end
     assert_equal [posts(:welcome).title], klass.welcome_2.map(&:title)
diff --git a/activerecord/test/models/topic.rb b/activerecord/test/models/topic.rb
index 785839be75..0625b8d296 100644
--- a/activerecord/test/models/topic.rb
+++ b/activerecord/test/models/topic.rb
@@ -45,8 +45,8 @@ class Topic < ActiveRecord::Base
       2
     end
   end
-  scope :named_extension, -> { { :extend => NamedExtension } }
-  scope :multiple_extensions, -> { { :extend => [MultipleExtensionTwo, MultipleExtensionOne] } }
+  scope :named_extension, :extend => NamedExtension
+  scope :multiple_extensions, :extend => [MultipleExtensionTwo, MultipleExtensionOne]
 
   has_many :replies, :dependent => :destroy, :foreign_key => "parent_id"
   has_many :replies_with_primary_key, :class_name => "Reply", :dependent => :destroy, :primary_key => "title", :foreign_key => "parent_title"