aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/isolation/abstract_unit.rb
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-05-11 13:56:05 -0300
committerSantiago Pastorino <santiago@wyeworks.com>2012-05-11 19:00:35 -0300
commit36dd1857dc097b6fbc65396bfabaa152da9c899f (patch)
tree3be886c3c090fc05d783d73b2709ec9d94c841e6 /railties/test/isolation/abstract_unit.rb
parenta00228c1a35578c4bf4d462eec977a50120288da (diff)
downloadrails-36dd1857dc097b6fbc65396bfabaa152da9c899f.tar.gz
rails-36dd1857dc097b6fbc65396bfabaa152da9c899f.tar.bz2
rails-36dd1857dc097b6fbc65396bfabaa152da9c899f.zip
Remove useless load path modifications
Diffstat (limited to 'railties/test/isolation/abstract_unit.rb')
-rw-r--r--railties/test/isolation/abstract_unit.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index f2dc0c71b1..03be81e59f 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -17,8 +17,8 @@ RAILS_FRAMEWORK_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../..")
# These files do not require any others and are needed
# to run the tests
-require "#{RAILS_FRAMEWORK_ROOT}/activesupport/lib/active_support/testing/isolation"
-require "#{RAILS_FRAMEWORK_ROOT}/activesupport/lib/active_support/core_ext/kernel/reporting"
+require "active_support/testing/isolation"
+require "active_support/core_ext/kernel/reporting"
module TestHelpers
module Paths
@@ -248,7 +248,6 @@ module TestHelpers
def use_frameworks(arr)
to_remove = [:actionmailer,
- :activemodel,
:activerecord] - arr
if to_remove.include? :activerecord
remove_from_config "config.active_record.whitelist_attributes = true"