diff options
| author | Jamis Buck <jamis@37signals.com> | 2005-06-14 16:17:56 +0000 |
|---|---|---|
| committer | Jamis Buck <jamis@37signals.com> | 2005-06-14 16:17:56 +0000 |
| commit | ac1fa98bb90d551b472b33a24a92ca8e7723ba42 (patch) | |
| tree | 1549d633a1b016d0371c65128f78c01fa85bec07 | |
| parent | ed7bfc96625d47ba5905628d458c2daef238f32a (diff) | |
| download | rails-ac1fa98bb90d551b472b33a24a92ca8e7723ba42.tar.gz rails-ac1fa98bb90d551b472b33a24a92ca8e7723ba42.tar.bz2 rails-ac1fa98bb90d551b472b33a24a92ca8e7723ba42.zip | |
Removed the require hack used in functional tests that worked around an earlier bug in rake.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1421 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/test_process.rb | 16 |
2 files changed, 2 insertions, 16 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index f38f64c1ff..d968acd2f3 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Removed the require hack used by functional testing to work around an earlier bug in rake. + * Allow distance_of_time_in_words to work with any value that responds to #to_time (like dates) #969 * Support :render option for :verify #1440 [TobiasLuetke] diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb index 1872cacd10..0480d50f57 100644 --- a/actionpack/lib/action_controller/test_process.rb +++ b/actionpack/lib/action_controller/test_process.rb @@ -1,22 +1,6 @@ require File.dirname(__FILE__) + '/assertions' require File.dirname(__FILE__) + '/deprecated_assertions' -if defined?(RAILS_ROOT) - # Temporary hack for getting functional tests in Rails running under 1.8.2 - class Object #:nodoc: - alias_method :require_without_load_path_reloading, :require - def require(file_name) - begin - require_without_load_path_reloading(file_name) - rescue Object => e - ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) } - require_without_load_path_reloading(file_name) - end - end - end -end - - module ActionController #:nodoc: class Base # Process a test request called with a +TestRequest+ object. |