From e96c08b1aaf1a03a22ec745914d975b6badf0e69 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Mon, 10 Jan 2005 01:17:53 +0000
Subject: [PATCH] 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
---
 actionpack/lib/action_controller/test_process.rb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

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.