diff options
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 1 | ||||
| -rw-r--r-- | railties/test/isolation/abstract_unit.rb | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 0924d26041..c294bfb238 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -213,7 +213,6 @@ class AppGeneratorTest < Rails::Generators::TestCase assert_no_file "config/database.yml" assert_file "config/application.rb", /#\s+require\s+["']active_record\/railtie["']/ assert_file "config/application.rb", /#\s+config\.active_record\.whitelist_attributes = true/ - assert_file "config/application.rb", /#\s+config\.active_record\.dependent_restrict_raises = false/ assert_file "test/test_helper.rb" do |helper_content| assert_no_match(/fixtures :all/, helper_content) end diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb index 6071cd3f39..8f04692aef 100644 --- a/railties/test/isolation/abstract_unit.rb +++ b/railties/test/isolation/abstract_unit.rb @@ -253,7 +253,6 @@ module TestHelpers :activerecord] - arr if to_remove.include? :activerecord remove_from_config "config.active_record.whitelist_attributes = true" - remove_from_config "config.active_record.dependent_restrict_raises = false" end $:.reject! {|path| path =~ %r'/(#{to_remove.join('|')})/' } end |