1 files changed, 2 insertions, 7 deletions
diff --git a/activerecord/test/cases/named_scope_test.rb b/activerecord/test/cases/named_scope_test.rb
index 0d3c0b20a4..06d076943e 100644
--- a/activerecord/test/cases/named_scope_test.rb
+++ b/activerecord/test/cases/named_scope_test.rb
@@ -460,21 +460,16 @@ 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)
   end
 
-  def test_eager_default_scope_hashes_are_deprecated
+  def test_eager_default_scope_hashes_are_not_deprecated
     klass = Class.new(ActiveRecord::Base)
     klass.table_name = 'posts'
 
-    assert_deprecated do
+    assert_not_deprecated do
       klass.send(:default_scope, :conditions => { :id => posts(:welcome).id })
     end
     assert_equal [posts(:welcome).title], klass.all.map(&:title)