diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-10 01:17:53 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-10 01:17:53 +0000 |
commit | e96c08b1aaf1a03a22ec745914d975b6badf0e69 (patch) | |
tree | 9168bb84c44206e9f96d10b6a9cb7334ece4877c /actionpack/lib/action_controller/test_process.rb | |
parent | c04b71a4b1e05167d20da12f2de92d81e4d38c8e (diff) | |
download | rails-e96c08b1aaf1a03a22ec745914d975b6badf0e69.tar.gz rails-e96c08b1aaf1a03a22ec745914d975b6badf0e69.tar.bz2 rails-e96c08b1aaf1a03a22ec745914d975b6badf0e69.zip |
Apparently the temp hack for functional tests was still needed
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@363 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/test_process.rb')
-rw-r--r-- | actionpack/lib/action_controller/test_process.rb | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb index 550b8a340d..f49b2dd3bf 100644 --- a/actionpack/lib/action_controller/test_process.rb +++ b/actionpack/lib/action_controller/test_process.rb @@ -1,6 +1,22 @@ require File.dirname(__FILE__) + '/assertions/action_pack_assertions' require File.dirname(__FILE__) + '/assertions/active_record_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. |