diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-23 14:05:30 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-23 14:07:54 -0800 |
| commit | f8d06e62a9084e0c862128bd9fcbb053676a007e (patch) | |
| tree | c2917547e19e4c4565bf0df549d3ab54958726fa /actionpack/test/controller | |
| parent | 35eda7d6d2ea13b4e42eeea9f11245e22c245fc2 (diff) | |
| download | rails-f8d06e62a9084e0c862128bd9fcbb053676a007e.tar.gz rails-f8d06e62a9084e0c862128bd9fcbb053676a007e.tar.bz2 rails-f8d06e62a9084e0c862128bd9fcbb053676a007e.zip | |
Pending test now passing
Diffstat (limited to 'actionpack/test/controller')
| -rw-r--r-- | actionpack/test/controller/routing_test.rb | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb index 6984ca9564..4eaf309c41 100644 --- a/actionpack/test/controller/routing_test.rb +++ b/actionpack/test/controller/routing_test.rb @@ -1419,15 +1419,13 @@ class RouteSetTest < ActiveSupport::TestCase :requirements => {:name => /(david|jamis)/i} end - pending do - url = set.generate({:controller => 'pages', :action => 'show', :name => 'david'}) - assert_equal "/page/david", url - assert_raise ActionController::RoutingError do - url = set.generate({:controller => 'pages', :action => 'show', :name => 'davidjamis'}) - end - url = set.generate({:controller => 'pages', :action => 'show', :name => 'JAMIS'}) - assert_equal "/page/JAMIS", url + url = set.generate({:controller => 'pages', :action => 'show', :name => 'david'}) + assert_equal "/page/david", url + assert_raise ActionController::RoutingError do + url = set.generate({:controller => 'pages', :action => 'show', :name => 'davidjamis'}) end + url = set.generate({:controller => 'pages', :action => 'show', :name => 'JAMIS'}) + assert_equal "/page/JAMIS", url end def test_route_requirement_recognize_with_extended_syntax |