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.rb9
1 files changed, 8 insertions, 1 deletions
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index daf2c8e5ed..b570909641 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -643,7 +643,7 @@ class RouteSetTests < Test::Unit::TestCase
assert_equal ['/admin/stuff', []], rs.generate({:controller => 'stuff'}, {:controller => 'admin/user', :action => 'list', :id => '10'})
assert_equal ['/stuff', []], rs.generate({:controller => '/stuff'}, {:controller => 'admin/user', :action => 'list', :id => '10'})
end
-
+
def test_ignores_leading_slash
@rs.draw {|m| m.connect '/:controller/:action/:id'}
test_default_setup
@@ -802,6 +802,13 @@ class RouteSetTests < Test::Unit::TestCase
assert results, "Recognition should have succeeded"
assert_equal [], results['path']
end
+
+ def test_non_controllers_cannot_be_matched
+ rs.draw do
+ rs.connect ':controller/:action/:id'
+ end
+ assert_nil rs.recognize_path(%w(not_a show 10)), "Shouldn't recognize non-controllers as controllers!"
+ end
def test_paths_do_not_accept_defaults
assert_raises(ActionController::RoutingError) do