1 files changed, 27 insertions, 6 deletions
diff --git a/activerecord/test/models/person.rb b/activerecord/test/models/person.rb
index d5c0b351aa..6e6ff29f77 100644
--- a/activerecord/test/models/person.rb
+++ b/activerecord/test/models/person.rb
@@ -5,14 +5,16 @@ class Person < ActiveRecord::Base
 
   has_many :posts, :through => :readers
   has_many :secure_posts, :through => :secure_readers
-  has_many :posts_with_no_comments, :through => :readers, :source => :post, :include => :comments,
-                                    :conditions => 'comments.id is null', :references => :comments
+  has_many :posts_with_no_comments, -> { includes(:comments).where('comments.id is null').references(:comments) },
+                                    :through => :readers, :source => :post
+
+  has_many :followers, foreign_key: 'friend_id', class_name: 'Friendship'
 
   has_many :references
   has_many :bad_references
-  has_many :fixed_bad_references, :conditions => { :favourite => true }, :class_name => 'BadReference'
-  has_one  :favourite_reference, :class_name => 'Reference', :conditions => ['favourite=?', true]
-  has_many :posts_with_comments_sorted_by_comment_id, :through => :readers, :source => :post, :include => :comments, :order => 'comments.id'
+  has_many :fixed_bad_references, -> { where :favourite => true }, :class_name => 'BadReference'
+  has_one  :favourite_reference, -> { where 'favourite=?', true }, :class_name => 'Reference'
+  has_many :posts_with_comments_sorted_by_comment_id, -> { includes(:comments).order('comments.id') }, :through => :readers, :source => :post
 
   has_many :jobs, :through => :references
   has_many :jobs_with_dependent_destroy,    :source => :job, :through => :references, :dependent => :destroy
@@ -88,6 +90,25 @@ class TightDescendant < TightPerson; end
 
 class RichPerson < ActiveRecord::Base
   self.table_name = 'people'
-  
+
   has_and_belongs_to_many :treasures, :join_table => 'peoples_treasures'
 end
+
+class NestedPerson < ActiveRecord::Base
+  self.table_name = 'people'
+
+  attr_accessible :first_name, :best_friend_first_name, :best_friend_attributes
+  attr_accessible :first_name, :gender, :comments, :as => :admin
+  attr_accessible :best_friend_attributes, :best_friend_first_name, :as => :admin
+
+  has_one :best_friend, :class_name => 'NestedPerson', :foreign_key => :best_friend_id
+  accepts_nested_attributes_for :best_friend, :update_only => true
+
+  def comments=(new_comments)
+    raise RuntimeError
+  end
+
+  def best_friend_first_name=(new_name)
+    assign_attributes({ :best_friend_attributes => { :first_name => new_name } })
+  end
+end