diff options
author | José Valim <jose.valim@gmail.com> | 2012-03-13 14:04:03 -0700 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2012-03-13 14:04:03 -0700 |
commit | ae67a63fe9c5be4b8e2ef74239ec340e99d231ac (patch) | |
tree | 41674ee21bc537f1bf4de9beca2efc0533a3ed02 /railties/test | |
parent | 663b66fd538fc2f637f09bb27aad65449585f226 (diff) | |
parent | f1637bf2bb00490203503fbd943b73406e043d1d (diff) | |
download | rails-ae67a63fe9c5be4b8e2ef74239ec340e99d231ac.tar.gz rails-ae67a63fe9c5be4b8e2ef74239ec340e99d231ac.tar.bz2 rails-ae67a63fe9c5be4b8e2ef74239ec340e99d231ac.zip |
Merge pull request #572 from sikachu/remove_activeresource
Remove Active Resource source files from the repository.
Diffstat (limited to 'railties/test')
-rw-r--r-- | railties/test/isolation/abstract_unit.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb index b0be555c4c..dc52c79fb5 100644 --- a/railties/test/isolation/abstract_unit.rb +++ b/railties/test/isolation/abstract_unit.rb @@ -245,8 +245,7 @@ module TestHelpers def use_frameworks(arr) to_remove = [:actionmailer, :activemodel, - :activerecord, - :activeresource] - arr + :activerecord] - arr if to_remove.include? :activerecord remove_from_config "config.active_record.whitelist_attributes = true" remove_from_config "config.active_record.dependent_restrict_raises = false" |