aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/models
diff options
context:
space:
mode:
authorJakub Kuźma <qoobaa@gmail.com>2011-12-21 15:28:24 +0100
committerJakub Kuźma <qoobaa@gmail.com>2011-12-21 21:10:15 +0100
commit1ad0a5363bcf44da9ed51e30c5c47a83c3516c24 (patch)
tree1c1a9464c3e7f58e812c0cb1352f58d68fce4ae9 /activerecord/test/models
parent618cb4429191290b957391c314a55b4d59f381f3 (diff)
downloadrails-1ad0a5363bcf44da9ed51e30c5c47a83c3516c24.tar.gz
rails-1ad0a5363bcf44da9ed51e30c5c47a83c3516c24.tar.bz2
rails-1ad0a5363bcf44da9ed51e30c5c47a83c3516c24.zip
added failing tests for has_many, has_one and belongs_to associations with strict mass assignment sanitizer, fixed build_record to not merge creation_attributes, removed failing nested attributes tests (that feature was broken anyway) #4051
Diffstat (limited to 'activerecord/test/models')
-rw-r--r--activerecord/test/models/person.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/models/person.rb b/activerecord/test/models/person.rb
index 967a3625aa..36eb08d02f 100644
--- a/activerecord/test/models/person.rb
+++ b/activerecord/test/models/person.rb
@@ -54,7 +54,7 @@ class LoosePerson < ActiveRecord::Base
self.table_name = 'people'
self.abstract_class = true
- attr_protected :comments
+ attr_protected :comments, :best_friend_id, :best_friend_of_id
attr_protected :as => :admin
has_one :best_friend, :class_name => 'LoosePerson', :foreign_key => :best_friend_id
@@ -81,4 +81,4 @@ class TightPerson < ActiveRecord::Base
accepts_nested_attributes_for :best_friend, :best_friend_of, :best_friends
end
-class TightDescendant < TightPerson; end \ No newline at end of file
+class TightDescendant < TightPerson; end