Permalink
Browse files

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
  • Loading branch information...
1 parent c04b71a commit e96c08b1aaf1a03a22ec745914d975b6badf0e69 @dhh dhh committed Jan 10, 2005
Showing with 16 additions and 0 deletions.
  1. +16 −0 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.

0 comments on commit e96c08b

Please sign in to comment.