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 22:37:04 -0300 |
| commit | f604a6368b3a39b0035d6fe964802a4c35eb958a (patch) | |
| tree | bd89cd48b48c6adf3965c689a2de5e6cda17f076 /railties/test/isolation | |
| parent | 06a3a8a458e70c1b6531ac53c57a302b162fd736 (diff) | |
| download | rails-f604a6368b3a39b0035d6fe964802a4c35eb958a.tar.gz rails-f604a6368b3a39b0035d6fe964802a4c35eb958a.tar.bz2 rails-f604a6368b3a39b0035d6fe964802a4c35eb958a.zip | |
Only add the whitelist_attributes option if ActiveRecord is present
Conflicts:
railties/test/generators/app_generator_test.rb
railties/test/isolation/abstract_unit.rb
Diffstat (limited to 'railties/test/isolation')
| -rw-r--r-- | railties/test/isolation/abstract_unit.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb index 06b658e7bd..d7e3dbe76e 100644 --- a/railties/test/isolation/abstract_unit.rb +++ b/railties/test/isolation/abstract_unit.rb @@ -260,7 +260,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.whitelist_attributes = true" if to_remove.include? :activerecord $:.reject! {|path| path =~ %r'/(#{to_remove.join('|')})/' } end |