mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Remove the dependent_restrict_raises configuration if activerecord is
not preset
This commit is contained in:
parent
a73662f3d8
commit
e778e22812
2 changed files with 1 additions and 2 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue