Permalink
Browse files

Add more cases to previous commit [#4394 state:resolved]

  • Loading branch information...
1 parent 4560385 commit 5c9f27abaabba0d008ccd710ed1af5f6caa4e371 @josevalim josevalim committed Jun 8, 2010
Showing with 10 additions and 3 deletions.
  1. +1 −1 actionpack/lib/action_dispatch/routing/mapper.rb
  2. +9 −2 actionpack/test/dispatch/routing_test.rb
@@ -680,7 +680,7 @@ def nested
end
def namespace(path)
- if @scope[:scope_level] == :resources
+ if resource_scope?
nested { super }
else
super
@@ -146,7 +146,11 @@ def self.matches?(request)
resources :clients do
namespace :google do
- resource :account
+ resource :account do
+ namespace :secret do
+ resource :info
+ end
+ end
end
end
@@ -824,8 +828,11 @@ def test_namespace_nested_in_resources
with_test_routes do
get '/clients/1/google/account'
assert_equal '/clients/1/google/account', client_google_account_path(1)
-
assert_equal 'google/accounts#show', @response.body
+
+ get '/clients/1/google/account/secret/info'
+ assert_equal '/clients/1/google/account/secret/info', client_google_account_secret_info_path(1)
+ assert_equal 'google/secret/infos#show', @response.body
end
end

0 comments on commit 5c9f27a

Please sign in to comment.