0
@@ -2145,6 +2145,7 @@ module ActiveRecord #:nodoc:
0
         if options.nil?
0
           attributes
0
         else
0
+          ActiveSupport::Deprecation.warn "Passing options to Base#attributes is deprecated and will be removed in Rails 2.1. Please use Hash#slice or Hash#except instead"
0
           if except = options[:except]
0
             except = Array(except).collect { |attribute| attribute.to_s }
0
             except.each { |attribute_name| attributes.delete(attribute_name) }

0
@@ -1706,20 +1706,24 @@ class BasicsTest < Test::Unit::TestCase
0
   end
0
   
0
   def test_except_attributes
0
-    assert_equal(
0
-      %w( author_name type id approved replies_count bonus_time written_on content author_email_address parent_id last_read), 
0
-      topics(:first).attributes(:except => :title).keys
0
-    )
0
+    assert_deprecated do
0
+      assert_equal(
0
+        %w( author_name type id approved replies_count bonus_time written_on content author_email_address parent_id last_read),
0
+        topics(:first).attributes(:except => :title).keys
0
+      )
0
 
0
-    assert_equal(
0
-      %w( replies_count bonus_time written_on content author_email_address parent_id last_read), 
0
-      topics(:first).attributes(:except => [ :title, :id, :type, :approved, :author_name ]).keys
0
-    )
0
+      assert_equal(
0
+        %w( replies_count bonus_time written_on content author_email_address parent_id last_read),
0
+        topics(:first).attributes(:except => [ :title, :id, :type, :approved, :author_name ]).keys
0
+      )
0
+    end
0
   end
0
   
0
   def test_include_attributes
0
-    assert_equal(%w( title ), topics(:first).attributes(:only => :title).keys)
0
-    assert_equal(%w( title author_name type id approved ), topics(:first).attributes(:only => [ :title, :id, :type, :approved, :author_name ]).keys)
0
+    assert_deprecated do
0
+      assert_equal(%w( title ), topics(:first).attributes(:only => :title).keys)
0
+      assert_equal(%w( title author_name type id approved ), topics(:first).attributes(:only => [ :title, :id, :type, :approved, :author_name ]).keys)
0
+    end
0
   end
0
   
0
   def test_type_name_with_module_should_handle_beginning