aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/routing_test.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/test/controller/routing_test.rb')
-rw-r--r--actionpack/test/controller/routing_test.rb7
1 files changed, 3 insertions, 4 deletions
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)