diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-02-01 11:07:05 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-02-01 11:07:05 -0800 |
commit | 33d8b62c527b16851db7d7ea79f1269db325d1aa (patch) | |
tree | 7debae34d185fa9beb3780af391402f993853771 /railties/test | |
parent | 403cce77f19bc6c2a3d8acaf547991078a540eaf (diff) | |
parent | e778e22812893c5ac09634ace83a4af168d66a3b (diff) | |
download | rails-33d8b62c527b16851db7d7ea79f1269db325d1aa.tar.gz rails-33d8b62c527b16851db7d7ea79f1269db325d1aa.tar.bz2 rails-33d8b62c527b16851db7d7ea79f1269db325d1aa.zip |
Merge pull request #4829 from rafaelfranca/restrict-fix
Use human attribute name to show the dependent destroy message
Diffstat (limited to 'railties/test')
-rw-r--r-- | railties/test/application/paths_test.rb | 1 | ||||
-rw-r--r-- | railties/test/isolation/abstract_unit.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/railties/test/application/paths_test.rb b/railties/test/application/paths_test.rb index 55f5a349de..4029984ce9 100644 --- a/railties/test/application/paths_test.rb +++ b/railties/test/application/paths_test.rb @@ -15,7 +15,6 @@ module ApplicationTests app.config.session_store nil end RUBY - use_frameworks [:action_controller, :action_view, :action_mailer, :active_record] require "#{app_path}/config/environment" @paths = Rails.application.config.paths end diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb index 72588af631..4fb5e6a4eb 100644 --- a/railties/test/isolation/abstract_unit.rb +++ b/railties/test/isolation/abstract_unit.rb @@ -247,7 +247,7 @@ module TestHelpers :activemodel, :activerecord, :activeresource] - arr - remove_from_config "config.active_record.identity_map = true" if to_remove.include? :activerecord + remove_from_config "config.active_record.dependent_restrict_raises = false" if to_remove.include? :activerecord $:.reject! {|path| path =~ %r'/(#{to_remove.join('|')})/' } end |