kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

Fixed routing regression on index exception 

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1713 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson 2005-07-05 15:31:51 +00:00
parent 3b1d271e02
commit 4fe0248f57
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
actionpack/lib/action_controller/routing.rb
View File

@ -363,6 +363,7 @@ module ActionController
use_recall = true
controller = options[:controller]
options[:action] ||= 'index' if controller
recall_controller = recall[:controller]
if (recall_controller && recall_controller.include?(?/)) || (controller && controller.include?(?/))
recall = {} if controller && controller[0] == ?/

6
actionpack/test/controller/routing_test.rb
View File

@ -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