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/test/controller | |
| 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/test/controller')
| -rw-r--r-- | actionpack/test/controller/assert_select_test.rb | 4 | ||||
| -rw-r--r-- | actionpack/test/controller/raw_post_test.rb | 4 | ||||
| -rw-r--r-- | actionpack/test/controller/routing_test.rb | 7 | ||||
| -rw-r--r-- | actionpack/test/controller/selector_test.rb | 4 |
4 files changed, 9 insertions, 10 deletions
diff --git a/actionpack/test/controller/assert_select_test.rb b/actionpack/test/controller/assert_select_test.rb index 92da967acd..7056bfa08b 100644 --- a/actionpack/test/controller/assert_select_test.rb +++ b/actionpack/test/controller/assert_select_test.rb @@ -3,8 +3,8 @@ # Under MIT and/or CC By license. #++ -require File.dirname(__FILE__) + '/../abstract_unit' -require File.dirname(__FILE__) + '/fake_controllers' +require "#{File.dirname(__FILE__)}/../abstract_unit" +require "#{File.dirname(__FILE__)}/fake_controllers" unless defined?(ActionMailer) diff --git a/actionpack/test/controller/raw_post_test.rb b/actionpack/test/controller/raw_post_test.rb index c9816484b7..6fdeafb8f1 100644 --- a/actionpack/test/controller/raw_post_test.rb +++ b/actionpack/test/controller/raw_post_test.rb @@ -1,7 +1,7 @@ -require 'test/unit' +require "#{File.dirname(__FILE__)}/../abstract_unit" require 'cgi' require 'stringio' -require File.dirname(__FILE__) + '/../../lib/action_controller/cgi_ext/raw_post_data_fix' +require 'action_controller/cgi_ext/raw_post_data_fix' class RawPostDataTest < Test::Unit::TestCase def setup diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb index b7d63db5a0..2c59217868 100644 --- a/actionpack/test/controller/routing_test.rb +++ b/actionpack/test/controller/routing_test.rb @@ -1,6 +1,5 @@ -require File.dirname(__FILE__) + '/../abstract_unit' -require 'test/unit' -require File.dirname(__FILE__) + '/fake_controllers' +require "#{File.dirname(__FILE__)}/../abstract_unit" +require "#{File.dirname(__FILE__)}/fake_controllers" require 'action_controller/routing' RunTimeTests = ARGV.include? 'time' @@ -789,7 +788,7 @@ class RouteTest < Test::Unit::TestCase end def default_route - unless @default_route + unless defined?(@default_route) @default_route = ROUTING::Route.new @default_route.segments << (s = ROUTING::StaticSegment.new) diff --git a/actionpack/test/controller/selector_test.rb b/actionpack/test/controller/selector_test.rb index d004290097..aa91de294e 100644 --- a/actionpack/test/controller/selector_test.rb +++ b/actionpack/test/controller/selector_test.rb @@ -3,8 +3,8 @@ # Under MIT and/or CC By license. #++ -require File.dirname(__FILE__) + '/../abstract_unit' -require File.dirname(__FILE__) + '/fake_controllers' +require "#{File.dirname(__FILE__)}/../abstract_unit" +require "#{File.dirname(__FILE__)}/fake_controllers" class SelectorTest < Test::Unit::TestCase # |