diff --git a/test/integration/routing/activities_test.rb b/test/integration/routing/activities_test.rb index e0bfb6e4a..6fb63e351 100644 --- a/test/integration/routing/activities_test.rb +++ b/test/integration/routing/activities_test.rb @@ -27,5 +27,14 @@ class RoutingActivitiesTest < ActionController::IntegrationTest { :method => 'get', :path => "/activity.atom" }, { :controller => 'activities', :action => 'index', :id => nil, :format => 'atom' } ) + assert_routing( + { :method => 'get', :path => "/projects/33/activity" }, + { :controller => 'activities', :action => 'index', :id => '33' } + ) + assert_routing( + { :method => 'get', :path => "/projects/33/activity.atom" }, + { :controller => 'activities', :action => 'index', :id => '33', + :format => 'atom' } + ) end end diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb index 82be3b451..b11470025 100644 --- a/test/integration/routing_test.rb +++ b/test/integration/routing_test.rb @@ -346,15 +346,6 @@ class RoutingTest < ActionController::IntegrationTest { :method => 'get', :path => "/projects/33/roadmap" }, { :controller => 'versions', :action => 'index', :project_id => '33' } ) - assert_routing( - { :method => 'get', :path => "/projects/33/activity" }, - { :controller => 'activities', :action => 'index', :id => '33' } - ) - assert_routing( - { :method => 'get', :path => "/projects/33/activity.atom" }, - { :controller => 'activities', :action => 'index', :id => '33', - :format => 'atom' } - ) assert_routing( { :method => 'post', :path => "/projects" }, { :controller => 'projects', :action => 'create' }