diff options
Diffstat (limited to 'actionpack')
-rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
-rw-r--r-- | actionpack/lib/action_controller/test_process.rb | 16 |
2 files changed, 18 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index d504b59e23..90db91610f 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed problems with running multiple functional tests in Rails under 1.8.2 by including hack for test/unit weirdness + * Added thread-safety to the DRbStore #66, #389 [Ben Stiglitz] * Added DateHelper#select_time and DateHelper#select_second #373 [Scott Baron] 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. |