aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-12-08 16:15:25 -0600
committerJoshua Peek <josh@joshpeek.com>2009-12-08 16:15:25 -0600
commitac711043ecec0dd15a159eff8081be8f10584be0 (patch)
tree66fc67fc3a435df2141bc19ca90518634164bf2b
parentce5f27b04b1ff25eed520a3d06b3b9c150536e21 (diff)
downloadrails-ac711043ecec0dd15a159eff8081be8f10584be0.tar.gz
rails-ac711043ecec0dd15a159eff8081be8f10584be0.tar.bz2
rails-ac711043ecec0dd15a159eff8081be8f10584be0.zip
Fix ambiguous access_token scoping example
-rw-r--r--actionpack/test/dispatch/routing_test.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 029bec2124..97cacc4a02 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -58,8 +58,10 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
end
resources :people do
- namespace ":access_token" do
- resource :avatar
+ nested do
+ namespace ":access_token" do
+ resource :avatar
+ end
end
member do
@@ -280,9 +282,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
get '/projects/1/people/1/7a2dec8/avatar'
assert_equal 'avatars#show', @response.body
- pending do
- assert_equal '/projects/1/people/1/7a2dec8/avatar', project_person_avatar_path(:project_id => '1', :person_id => '1', :access_token => '7a2dec8')
- end
+ assert_equal '/projects/1/people/1/7a2dec8/avatar', project_person_avatar_path(:project_id => '1', :person_id => '1', :access_token => '7a2dec8')
put '/projects/1/people/1/accessible_projects'
assert_equal 'people#accessible_projects', @response.body