aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-11-29 18:17:14 -0600
committerJoshua Peek <josh@joshpeek.com>2009-11-29 18:17:14 -0600
commit075f50d62cd02c2cc14b145cdb34bc9ee85cc83c (patch)
tree42ab729300acf823aa29abbfc7b9f38f2f94741a /actionpack/test
parentf69f9820ee84f32bb53d001efd6ebc79517fb0e1 (diff)
downloadrails-075f50d62cd02c2cc14b145cdb34bc9ee85cc83c.tar.gz
rails-075f50d62cd02c2cc14b145cdb34bc9ee85cc83c.tar.bz2
rails-075f50d62cd02c2cc14b145cdb34bc9ee85cc83c.zip
Fix some nested resource generation tests
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/dispatch/routing_test.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 496445fc34..b8bcdc2808 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -251,9 +251,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
get '/projects/1/companies/1/people'
assert_equal 'people#index', @response.body
- pending do
- assert_equal '/projects/1/companies/1/people', project_company_people_path(:project_id => '1', :company_id => '1')
- end
+ assert_equal '/projects/1/companies/1/people', project_company_people_path(:project_id => '1', :company_id => '1')
get '/projects/1/companies/1/avatar'
assert_equal 'avatars#show', @response.body
@@ -345,9 +343,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
get '/projects/1/posts/1/comments'
assert_equal 'comments#index', @response.body
- pending do
- assert_equal '/projects/1/posts/1/comments', project_post_comments_path(:project_id => '1', :post_id => '1')
- end
+ assert_equal '/projects/1/posts/1/comments', project_post_comments_path(:project_id => '1', :post_id => '1')
post '/projects/1/posts/1/comments/preview'
assert_equal 'comments#preview', @response.body