aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-01-10 00:40:27 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-01-10 00:40:27 +0000
commitc04b71a4b1e05167d20da12f2de92d81e4d38c8e (patch)
tree41b890823ab5f04ff74b9927dd55d73325a44bf6
parent590ea2930dd3ba504c899a8e6cc41dcc290c7a47 (diff)
downloadrails-c04b71a4b1e05167d20da12f2de92d81e4d38c8e.tar.gz
rails-c04b71a4b1e05167d20da12f2de92d81e4d38c8e.tar.bz2
rails-c04b71a4b1e05167d20da12f2de92d81e4d38c8e.zip
Removed temporary hack for test/unit problems that only worked for functional tests
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@362 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--actionpack/lib/action_controller/test_process.rb16
1 files changed, 0 insertions, 16 deletions
diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb
index f49b2dd3bf..550b8a340d 100644
--- a/actionpack/lib/action_controller/test_process.rb
+++ b/actionpack/lib/action_controller/test_process.rb
@@ -1,22 +1,6 @@
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.