Merge branch 'master' of git://github.com/rails/rails

1 files changed, 4 insertions, 8 deletions

diff --git a/activerecord/test/cases/attribute_methods/read_test.rb b/activerecord/test/cases/attribute_methods/read_test.rb
index 814476ce73..0df9ffc0c5 100644
--- a/activerecord/test/cases/attribute_methods/read_test.rb
+++ b/activerecord/test/cases/attribute_methods/read_test.rb
@@ -14,8 +14,11 @@ module ActiveRecord
 
       def setup
         @klass = Class.new do
+          def self.superclass; Base; end
+          def self.active_record_super; Base; end
+          def self.base_class; self; end
+
           include ActiveRecord::AttributeMethods
-          include ActiveRecord::AttributeMethods::Read
 
           def self.column_names
             %w{ one two three }
@@ -24,10 +27,6 @@ module ActiveRecord
           def self.primary_key
           end
 
-          def self.primary_key?
-            false
-          end
-
           def self.columns
             column_names.map { FakeColumn.new(name) }
           end
@@ -37,9 +36,6 @@ module ActiveRecord
               [name, FakeColumn.new(name)]
             }]
           end
-
-          def self.serialized_attributes; {}; end
-          def self.base_class; self; end
         end
       end