diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-03-04 20:53:59 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-03-04 21:02:28 -0300 |
| commit | 5afb2f7b40d1712f2e9ec1a69062d6e9b175e639 (patch) | |
| tree | eca429afb9f067a72f22a4fa997d62894f36723d /railties/test/isolation/abstract_unit.rb | |
| parent | 641a4f62405cc2765424320932902ed8076b5d38 (diff) | |
| download | rails-5afb2f7b40d1712f2e9ec1a69062d6e9b175e639.tar.gz rails-5afb2f7b40d1712f2e9ec1a69062d6e9b175e639.tar.bz2 rails-5afb2f7b40d1712f2e9ec1a69062d6e9b175e639.zip | |
Only add the whitelist_attributes option if ActiveRecord is present
Diffstat (limited to 'railties/test/isolation/abstract_unit.rb')
| -rw-r--r-- | railties/test/isolation/abstract_unit.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb index 4fb5e6a4eb..b0be555c4c 100644 --- a/railties/test/isolation/abstract_unit.rb +++ b/railties/test/isolation/abstract_unit.rb @@ -247,7 +247,10 @@ module TestHelpers :activemodel, :activerecord, :activeresource] - arr - remove_from_config "config.active_record.dependent_restrict_raises = false" if to_remove.include? :activerecord + 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 |