mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
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
This commit is contained in:
parent
c04b71a4b1
commit
e96c08b1aa
1 changed files with 16 additions and 0 deletions
|
@ -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.
|
||||
|
|
Loading…
Reference in a new issue