Merge pull request #4829 from rafaelfranca/restrict-fix

Use human attribute name to show the dependent destroy message

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