From 0eacdcf9a3e37e05f47a4ded7f0a4aff3b65fbe4 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Sun, 28 Jan 2007 07:16:55 +0000 Subject: Use a consistent load path to avoid double requires. Fix some scattered Ruby warnings. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6057 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/test_process.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'actionpack/lib/action_controller/test_process.rb') diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb index 49a8a4a0e3..beccec6f94 100644 --- a/actionpack/lib/action_controller/test_process.rb +++ b/actionpack/lib/action_controller/test_process.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/assertions' +require 'action_controller/assertions' module ActionController #:nodoc: class Base @@ -90,11 +90,11 @@ module ActionController #:nodoc: end def request_uri - @request_uri || super() + @request_uri || super end def path - @path || super() + @path || super end def assign_parameters(controller_path, action, parameters) -- cgit v1.2.3