aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/dispatch/routing_test.rb
diff options
context:
space:
mode:
authorJan De Poorter <jan@defv.be>2010-02-12 11:39:19 +0100
committerJeremy Kemper <jeremy@bitsweat.net>2010-03-07 14:36:26 -0800
commitdfc7ff64298e1a0656639a630cc0ddbf93c1eeb9 (patch)
treeda8cdf63e2e9378be320d0711d327221a929d8aa /actionpack/test/dispatch/routing_test.rb
parentaa758b93889ea879f084948c71dcd47c0275fb30 (diff)
downloadrails-dfc7ff64298e1a0656639a630cc0ddbf93c1eeb9.tar.gz
rails-dfc7ff64298e1a0656639a630cc0ddbf93c1eeb9.tar.bz2
rails-dfc7ff64298e1a0656639a630cc0ddbf93c1eeb9.zip
Make sure nested singular resources get the correct name
[#3911 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'actionpack/test/dispatch/routing_test.rb')
-rw-r--r--actionpack/test/dispatch/routing_test.rb10
1 files changed, 10 insertions, 0 deletions
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 37c2f1421b..b46276c453 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -24,6 +24,8 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
resource :session do
get :create
+
+ resource :info
end
match 'account/logout' => redirect("/logout"), :as => :logout_redirect
@@ -234,6 +236,14 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
end
end
+ def test_session_info_nested_singleton_resource
+ with_test_routes do
+ get '/session/info'
+ assert_equal 'infos#show', @response.body
+ assert_equal '/session/info', session_info_path
+ end
+ end
+
def test_redirect_modulo
with_test_routes do
get '/account/modulo/name'