aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/models
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/test/models')
-rw-r--r--activerecord/test/models/bulb.rb2
-rw-r--r--activerecord/test/models/company.rb1
-rw-r--r--activerecord/test/models/company_in_module.rb1
-rw-r--r--activerecord/test/models/person.rb12
-rw-r--r--activerecord/test/models/reader.rb2
-rw-r--r--activerecord/test/models/reply.rb2
6 files changed, 0 insertions, 20 deletions
diff --git a/activerecord/test/models/bulb.rb b/activerecord/test/models/bulb.rb
index 0dc2fdd8ae..967f733fe3 100644
--- a/activerecord/test/models/bulb.rb
+++ b/activerecord/test/models/bulb.rb
@@ -2,8 +2,6 @@ class Bulb < ActiveRecord::Base
default_scope { where(:name => 'defaulty') }
belongs_to :car
- attr_protected :car_id, :frickinawesome
-
attr_reader :scope_after_initialize, :attributes_after_initialize
after_initialize :record_scope_after_initialize
diff --git a/activerecord/test/models/company.rb b/activerecord/test/models/company.rb
index 9bdce6e729..17b17724e8 100644
--- a/activerecord/test/models/company.rb
+++ b/activerecord/test/models/company.rb
@@ -3,7 +3,6 @@ class AbstractCompany < ActiveRecord::Base
end
class Company < AbstractCompany
- attr_protected :rating
self.sequence_name = :companies_nonstd_seq
validates_presence_of :name
diff --git a/activerecord/test/models/company_in_module.rb b/activerecord/test/models/company_in_module.rb
index eb2aedc425..461bb0de09 100644
--- a/activerecord/test/models/company_in_module.rb
+++ b/activerecord/test/models/company_in_module.rb
@@ -3,7 +3,6 @@ require 'active_support/core_ext/object/with_options'
module MyApplication
module Business
class Company < ActiveRecord::Base
- attr_protected :rating
end
class Firm < Company
diff --git a/activerecord/test/models/person.rb b/activerecord/test/models/person.rb
index 6e6ff29f77..6ad0cf6987 100644
--- a/activerecord/test/models/person.rb
+++ b/activerecord/test/models/person.rb
@@ -59,9 +59,6 @@ class LoosePerson < ActiveRecord::Base
self.table_name = 'people'
self.abstract_class = true
- 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
belongs_to :best_friend_of, :class_name => 'LoosePerson', :foreign_key => :best_friend_of_id
has_many :best_friends, :class_name => 'LoosePerson', :foreign_key => :best_friend_id
@@ -74,11 +71,6 @@ class LooseDescendant < LoosePerson; end
class TightPerson < ActiveRecord::Base
self.table_name = 'people'
- attr_accessible :first_name, :gender
- attr_accessible :first_name, :gender, :comments, :as => :admin
- attr_accessible :best_friend_attributes, :best_friend_of_attributes, :best_friends_attributes
- attr_accessible :best_friend_attributes, :best_friend_of_attributes, :best_friends_attributes, :as => :admin
-
has_one :best_friend, :class_name => 'TightPerson', :foreign_key => :best_friend_id
belongs_to :best_friend_of, :class_name => 'TightPerson', :foreign_key => :best_friend_of_id
has_many :best_friends, :class_name => 'TightPerson', :foreign_key => :best_friend_id
@@ -97,10 +89,6 @@ 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
diff --git a/activerecord/test/models/reader.rb b/activerecord/test/models/reader.rb
index f5b6079bd2..f8fb9c573e 100644
--- a/activerecord/test/models/reader.rb
+++ b/activerecord/test/models/reader.rb
@@ -9,8 +9,6 @@ class SecureReader < ActiveRecord::Base
belongs_to :secure_post, :class_name => "Post", :foreign_key => "post_id"
belongs_to :secure_person, :inverse_of => :secure_readers, :class_name => "Person", :foreign_key => "person_id"
-
- attr_accessible nil
end
class LazyReader < ActiveRecord::Base
diff --git a/activerecord/test/models/reply.rb b/activerecord/test/models/reply.rb
index 53bc95e5f2..079e325aad 100644
--- a/activerecord/test/models/reply.rb
+++ b/activerecord/test/models/reply.rb
@@ -6,8 +6,6 @@ class Reply < Topic
belongs_to :topic, :foreign_key => "parent_id", :counter_cache => true
belongs_to :topic_with_primary_key, :class_name => "Topic", :primary_key => "title", :foreign_key => "parent_title", :counter_cache => "replies_count"
has_many :replies, :class_name => "SillyReply", :dependent => :destroy, :foreign_key => "parent_id"
-
- attr_accessible :title, :author_name, :author_email_address, :written_on, :content, :last_read, :parent_title
end
class UniqueReply < Reply