diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-23 15:32:41 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-23 15:32:41 -0800 |
| commit | ada895e8cac855a2f248aafdb92457365f062d07 (patch) | |
| tree | d3981be951783a72551a440b626ecd70cf7a1bf1 /actionpack | |
| parent | 671538cd6ea0bd4c463e7bf7d238a55924a8af53 (diff) | |
| parent | f8d06e62a9084e0c862128bd9fcbb053676a007e (diff) | |
| download | rails-ada895e8cac855a2f248aafdb92457365f062d07.tar.gz rails-ada895e8cac855a2f248aafdb92457365f062d07.tar.bz2 rails-ada895e8cac855a2f248aafdb92457365f062d07.zip | |
Merge branch 'master' into mail
Diffstat (limited to 'actionpack')
| -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 |