diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2009-02-07 14:44:50 +0000 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2009-02-22 15:34:01 +1300 |
| commit | f7a0a394f48a0f21e686f891546d17ce33c7840e (patch) | |
| tree | 0bf8a188b9c297ef004b49ad4f9b312bb00f62fc /actionpack/test | |
| parent | fc09ebc669bd58f415f7d3ef932ef02dab821ab5 (diff) | |
| download | rails-f7a0a394f48a0f21e686f891546d17ce33c7840e.tar.gz rails-f7a0a394f48a0f21e686f891546d17ce33c7840e.tar.bz2 rails-f7a0a394f48a0f21e686f891546d17ce33c7840e.zip | |
Remove hardcoded number_of_capturesin ControllerSegment to allow regexp requirements with capturing parentheses
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1887 state:committed]
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/controller/routing_test.rb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb index 1caed33c59..d3fe62e28e 100644 --- a/actionpack/test/controller/routing_test.rb +++ b/actionpack/test/controller/routing_test.rb @@ -852,6 +852,15 @@ class LegacyRouteSetTests < Test::Unit::TestCase assert_equal '/content/foo', rs.generate(:controller => "content", :action => "foo") end + def test_route_with_regexp_and_captures_for_controller + rs.draw do |map| + map.connect ':controller/:action/:id', :controller => /admin\/(accounts|users)/ + end + assert_equal({:controller => "admin/accounts", :action => "index"}, rs.recognize_path("/admin/accounts")) + assert_equal({:controller => "admin/users", :action => "index"}, rs.recognize_path("/admin/users")) + assert_raises(ActionController::RoutingError) { rs.recognize_path("/admin/products") } + end + def test_route_with_regexp_and_dot rs.draw do |map| map.connect ':controller/:action/:file', |