6 files changed, 3 insertions, 42 deletions
diff --git a/activerecord/test/models/author.rb b/activerecord/test/models/author.rb
index 6935cfb0ea..83904cd850 100644
--- a/activerecord/test/models/author.rb
+++ b/activerecord/test/models/author.rb
@@ -9,17 +9,7 @@ class Author < ActiveRecord::Base
   has_many :posts_with_categories, -> { includes(:categories) }, :class_name => "Post"
   has_many :posts_with_comments_and_categories, -> { includes(:comments, :categories).order("posts.id") }, :class_name => "Post"
   has_many :posts_containing_the_letter_a, :class_name => "Post"
-  has_many :posts_with_extension, :class_name => "Post" do #, :extend => ProxyTestExtension
-    def testing_proxy_owner
-      proxy_owner
-    end
-    def testing_proxy_reflection
-      proxy_reflection
-    end
-    def testing_proxy_target
-      proxy_target
-    end
-  end
+  has_many :posts_with_extension, :class_name => "Post"
   has_one  :post_about_thinking, -> { where("posts.title like '%thinking%'") }, :class_name => 'Post'
   has_one  :post_about_thinking_with_last_comment, -> { where("posts.title like '%thinking%'").includes(:last_comment) }, :class_name => 'Post'
   has_many :comments, :through => :posts
diff --git a/activerecord/test/models/category.rb b/activerecord/test/models/category.rb
index f8c8ebb70c..7da39a8e33 100644
--- a/activerecord/test/models/category.rb
+++ b/activerecord/test/models/category.rb
@@ -31,9 +31,4 @@ class Category < ActiveRecord::Base
 end
 
 class SpecialCategory < Category
-
-  def self.what_are_you
-    'a special category...'
-  end
-
 end
diff --git a/activerecord/test/models/comment.rb b/activerecord/test/models/comment.rb
index 4b2015fe01..ede5fbd0c6 100644
--- a/activerecord/test/models/comment.rb
+++ b/activerecord/test/models/comment.rb
@@ -29,16 +29,10 @@ class Comment < ActiveRecord::Base
 end
 
 class SpecialComment < Comment
-  def self.what_are_you
-    'a special comment...'
-  end
 end
 
 class SubSpecialComment < SpecialComment
 end
 
 class VerySpecialComment < Comment
-  def self.what_are_you
-    'a very special comment...'
-  end
 end
diff --git a/activerecord/test/models/post.rb b/activerecord/test/models/post.rb
index 603f1f2555..73ffc0de38 100644
--- a/activerecord/test/models/post.rb
+++ b/activerecord/test/models/post.rb
@@ -16,11 +16,7 @@ class Post < ActiveRecord::Base
 
   scope :limit_by, lambda {|l| limit(l) }
 
-  belongs_to :author do
-    def greeting
-      "hello"
-    end
-  end
+  belongs_to :author
 
   belongs_to :author_with_posts, -> { includes(:posts) }, :class_name => "Author", :foreign_key => :author_id
   belongs_to :author_with_address, -> { includes(:author_address) }, :class_name => "Author", :foreign_key => :author_id
@@ -168,18 +164,6 @@ class SubStiPost < StiPost
   self.table_name = Post.table_name
 end
 
-ActiveSupport::Deprecation.silence do
-  class DeprecatedPostWithComment < ActiveRecord::Base
-    self.table_name = 'posts'
-    default_scope where("posts.comments_count > 0").order("posts.comments_count ASC")
-  end
-end
-
-class PostForAuthor < ActiveRecord::Base
-  self.table_name = 'posts'
-  cattr_accessor :selected_author
-end
-
 class FirstPost < ActiveRecord::Base
   self.table_name = 'posts'
   default_scope { where(:id => 1) }
diff --git a/activerecord/test/models/project.rb b/activerecord/test/models/project.rb
index af3ec4be83..90273adafc 100644
--- a/activerecord/test/models/project.rb
+++ b/activerecord/test/models/project.rb
@@ -40,7 +40,4 @@ class Project < ActiveRecord::Base
 end
 
 class SpecialProject < Project
-  def hello_world
-    "hello there!"
-  end
 end
diff --git a/activerecord/test/models/topic.rb b/activerecord/test/models/topic.rb
index f7f4cebc5a..17035bf338 100644
--- a/activerecord/test/models/topic.rb
+++ b/activerecord/test/models/topic.rb
@@ -108,6 +108,7 @@ class ImportantTopic < Topic
 end
 
 class BlankTopic < Topic
+  # declared here to make sure that dynamic finder with a bang can find a model that responds to `blank?`
   def blank?
     true
   end