Changeset 362

Timestamp:

01/10/05 00:40:27 (4 years ago)

Author:

david

Message:

Removed temporary hack for test/unit problems that only worked for functional tests

Files:

• trunk/actionpack/lib/action_controller/test_process.rb (modified) (1 diff)

trunk/actionpack/lib/action_controller/test_process.rb

@@ -1 +1 @@
-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: