2 files changed, 9 insertions, 3 deletions
diff --git a/activerecord/test/models/reference.rb b/activerecord/test/models/reference.rb
index 561b431766..1636c118a2 100644
--- a/activerecord/test/models/reference.rb
+++ b/activerecord/test/models/reference.rb
@@ -4,9 +4,8 @@ class Reference < ActiveRecord::Base
 
   has_many :agents_posts_authors, :through => :person
 
-  class << self
-    attr_accessor :make_comments
-  end
+  class << self; attr_accessor :make_comments; end
+  self.make_comments = false
 
   before_destroy :make_comments
 
diff --git a/activerecord/test/models/topic.rb b/activerecord/test/models/topic.rb
index 4b27c16681..f7f4cebc5a 100644
--- a/activerecord/test/models/topic.rb
+++ b/activerecord/test/models/topic.rb
@@ -33,6 +33,7 @@ class Topic < ActiveRecord::Base
   end
 
   has_many :replies, :dependent => :destroy, :foreign_key => "parent_id"
+  has_many :approved_replies, -> { approved }, class_name: 'Reply', foreign_key: "parent_id", counter_cache: 'replies_count'
   has_many :replies_with_primary_key, :class_name => "Reply", :dependent => :destroy, :primary_key => "title", :foreign_key => "parent_title"
 
   has_many :unique_replies, :dependent => :destroy, :foreign_key => "parent_id"
@@ -106,6 +107,12 @@ class ImportantTopic < Topic
   serialize :important, Hash
 end
 
+class BlankTopic < Topic
+  def blank?
+    true
+  end
+end
+
 module Web
   class Topic < ActiveRecord::Base
     has_many :replies, :dependent => :destroy, :foreign_key => "parent_id", :class_name => 'Web::Reply'