diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-01-28 07:16:55 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-01-28 07:16:55 +0000 |
| commit | 0eacdcf9a3e37e05f47a4ded7f0a4aff3b65fbe4 (patch) | |
| tree | 74705adf7f9a35c750f74657f0c4a29a6dcce5ff /actionpack/lib/action_controller/test_process.rb | |
| parent | 4ac332fa9a16ae86b948251e372999b9f4618dec (diff) | |
| download | rails-0eacdcf9a3e37e05f47a4ded7f0a4aff3b65fbe4.tar.gz rails-0eacdcf9a3e37e05f47a4ded7f0a4aff3b65fbe4.tar.bz2 rails-0eacdcf9a3e37e05f47a4ded7f0a4aff3b65fbe4.zip | |
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
Diffstat (limited to 'actionpack/lib/action_controller/test_process.rb')
| -rw-r--r-- | actionpack/lib/action_controller/test_process.rb | 6 |
1 files changed, 3 insertions, 3 deletions
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) |