Skip to content
Browse files

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
  • Loading branch information...
1 parent ed7bfc9 commit ac1fa98bb90d551b472b33a24a92ca8e7723ba42 @jamis jamis committed Jun 14, 2005
Showing with 2 additions and 16 deletions.
  1. +2 −0 actionpack/CHANGELOG
  2. +0 −16 actionpack/lib/action_controller/test_process.rb
View
2 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]
View
16 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.

0 comments on commit ac1fa98

Please sign in to comment.
Something went wrong with that request. Please try again.