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

Add more tests and docs to uncountable routes. [#3930 state:resolved]

Browse Source
This commit is contained in:
Rizwan Reza
2010-03-29 05:45:32 +04:30
committed by wycats
parent 72074aac33
commit cf6734fdf9
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
actionpack/lib/action_dispatch/routing/mapper.rb
View File

@@ -425,10 +425,11 @@ module ActionDispatch
singular
end
# Checks for uncountable plurals, and appends "_index" if they're.
def collection_name
uncountable? ? "#{plural}_index" : plural
end
def uncountable?
singular == plural
end

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

@@ -113,7 +113,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
resources :posts, :only => [:index, :show] do
resources :comments, :except => :destroy
end
resources :sheep
match 'sprockets.js' => ::TestRoutingMapper::SprocketsApp
@@ -532,11 +532,13 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
assert_raise(ActionController::RoutingError) { delete '/posts/1/comments' }
end
end
def test_resources_for_uncountable_names
with_test_routes do
assert_equal '/sheep', sheep_index_path
assert_equal '/sheep/1', sheep_path(1)
assert_equal '/sheep/new', new_sheep_path
assert_equal '/sheep/1/edit', edit_sheep_path(1)
end
end