aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-10-27 03:26:47 -0700
committerJosé Valim <jose.valim@gmail.com>2011-10-27 03:26:47 -0700
commita9863d672bd2c875357cf87ac27b416bd65a24e3 (patch)
tree7803a42bd8ecb096f16cc337aa9f73ca9af94b3e /activerecord/test/cases
parent30c0a0023b34d1991cd52532cdcf1a28059bd670 (diff)
parent80fc29f36f0410c3beabe54c54823f1f335f96f3 (diff)
downloadrails-a9863d672bd2c875357cf87ac27b416bd65a24e3.tar.gz
rails-a9863d672bd2c875357cf87ac27b416bd65a24e3.tar.bz2
rails-a9863d672bd2c875357cf87ac27b416bd65a24e3.zip
Merge pull request #3448 from arunagw/instance_disable_fix
Test fix Allow instances to disable record_timestamps
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r--activerecord/test/cases/mass_assignment_security_test.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/test/cases/mass_assignment_security_test.rb b/activerecord/test/cases/mass_assignment_security_test.rb
index ef35f3341e..23961918f4 100644
--- a/activerecord/test/cases/mass_assignment_security_test.rb
+++ b/activerecord/test/cases/mass_assignment_security_test.rb
@@ -231,7 +231,8 @@ class MassAssignmentSecurityTest < ActiveRecord::TestCase
def test_protection_against_class_attribute_writers
[:logger, :configurations, :primary_key_prefix_type, :table_name_prefix, :table_name_suffix, :pluralize_table_names,
- :default_timezone, :schema_format, :lock_optimistically, :record_timestamps].each do |method|
+ :default_timezone, :schema_format, :lock_optimistically, :timestamped_migrations, :default_scopes,
+ :connection_handler, :nested_attributes_options].each do |method|
assert_respond_to Task, method
assert_respond_to Task, "#{method}="
assert_respond_to Task.new, method