github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Never end generated paths with a '/' #683

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@717 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson
2005-02-20 20:54:40 +00:00
parent d8739bd8cb
commit f153f42469
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
actionpack/test/controller/routing_tests.rb
View File

@@ -137,12 +137,12 @@ class RouteTests < Test::Unit::TestCase
verify_recognize('admin/user', {:controller => 'admin/user', :action => 'index'})
end
def test_generate_default_nested_no_extras
verify_generate('admin/user/', {}, {:controller => 'admin/user'}, @defaults)
verify_generate('admin/user/', {}, {:controller => 'admin/user'}, @defaults)
verify_generate('admin/user', {}, {:controller => 'admin/user'}, @defaults)
verify_generate('admin/user', {}, {:controller => 'admin/user'}, @defaults)
end
def test_generate_default_nested
verify_generate('admin/user/', {:a => 'a'}, {:controller => 'admin/user', :a => 'a'}, @defaults)
verify_generate('admin/user/', {:a => 'a'}, {:controller => 'admin/user', :a => 'a'}, @defaults)
verify_generate('admin/user', {:a => 'a'}, {:controller => 'admin/user', :a => 'a'}, @defaults)
verify_generate('admin/user', {:a => 'a'}, {:controller => 'admin/user', :a => 'a'}, @defaults)
end
# Test generate with a default controller set.
@@ -429,16 +429,16 @@ class RouteSetTests < Test::Unit::TestCase
end
def test_generate_typical_controller_index_path_explicit_index
typical_request
verify_generate('content/', {:controller => 'content', :action => 'index'})
verify_generate('content', {:controller => 'content', :action => 'index'})
end
def test_generate_typical_controller_index_path_explicit_index
typical_request
verify_generate('content/', {:controller => 'content', :action => 'index'})
verify_generate('content', {:controller => 'content', :action => 'index'})
end
def test_generate_typical_controller_index_path_implicit_index
typical_request
@request.path_parameters[:controller] = 'resource'
verify_generate('content/', {:controller => 'content'})
verify_generate('content', {:controller => 'content'})
end
def test_generate_no_perfect_route
@@ -480,6 +480,6 @@ end
class AssertionRoutingTests < Test::Unit::TestCase
def test_assert_routing
ActionController::Routing::Routes.reload rescue nil
assert_routing('content/', {:controller => 'content', :action => 'index'})
assert_routing('content', {:controller => 'content', :action => 'index'})
end
end