diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-07-05 15:31:51 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-07-05 15:31:51 +0000 |
| commit | 4fe0248f57f98d7b3c9095bd5843fb5b10320c06 (patch) | |
| tree | a2b7c343db1262ddde5eb368da7bc705aa5a5496 /actionpack/test/controller | |
| parent | 3b1d271e02e3f5b468b2a1ed3fc2a8bd2f228bd4 (diff) | |
| download | rails-4fe0248f57f98d7b3c9095bd5843fb5b10320c06.tar.gz rails-4fe0248f57f98d7b3c9095bd5843fb5b10320c06.tar.bz2 rails-4fe0248f57f98d7b3c9095bd5843fb5b10320c06.zip | |
Fixed routing regression on index exception
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1713 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/controller')
| -rw-r--r-- | actionpack/test/controller/routing_test.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb index 1243b0a6a9..16e9baf6e8 100644 --- a/actionpack/test/controller/routing_test.rb +++ b/actionpack/test/controller/routing_test.rb @@ -689,10 +689,14 @@ class RouteSetTests < Test::Unit::TestCase rs.connect ':controller/:action/:id' end - assert_equal ['/page/20', {}], rs.generate(:controller => 'pages', :id => 20) + assert_equal ['/page/20', {}], rs.generate({:id => 20}, {:controller => 'pages'}) assert_equal ['/page/20', {}], rs.generate(:controller => 'pages', :id => 20, :action => 'show') assert_equal ['/pages/boo', {}], rs.generate(:controller => 'pages', :action => 'boo') end + + def test_action_expiry + assert_equal ['/content', {}], rs.generate({:controller => 'content'}, {:controller => 'content', :action => 'show'}) + end end end |