diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-05-11 13:56:05 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-05-11 19:00:35 -0300 |
| commit | 36dd1857dc097b6fbc65396bfabaa152da9c899f (patch) | |
| tree | 3be886c3c090fc05d783d73b2709ec9d94c841e6 /railties | |
| parent | a00228c1a35578c4bf4d462eec977a50120288da (diff) | |
| download | rails-36dd1857dc097b6fbc65396bfabaa152da9c899f.tar.gz rails-36dd1857dc097b6fbc65396bfabaa152da9c899f.tar.bz2 rails-36dd1857dc097b6fbc65396bfabaa152da9c899f.zip | |
Remove useless load path modifications
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/Rakefile | 3 | ||||
| -rw-r--r-- | railties/test/isolation/abstract_unit.rb | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/railties/Rakefile b/railties/Rakefile index 108413235a..993ba840ff 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -20,7 +20,8 @@ namespace :test do 'test', 'lib', "#{File.dirname(__FILE__)}/../activesupport/lib", - "#{File.dirname(__FILE__)}/../actionpack/lib" + "#{File.dirname(__FILE__)}/../actionpack/lib", + "#{File.dirname(__FILE__)}/../activemodel/lib" ] ruby "-I#{dash_i.join ':'}", file end 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" |