From e9ec49a705dcc521517a5c7783efab282648d4f8 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Sat, 24 Dec 2011 01:40:30 +0000 Subject: [PATCH] test: route: move remaining calendars test in test_issues_extra_actions to routing/calendars_test.rb git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8335 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/integration/routing/calendars_test.rb | 5 +++++ test/integration/routing_test.rb | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/integration/routing/calendars_test.rb b/test/integration/routing/calendars_test.rb index c6aa5a6e3..fa142850e 100644 --- a/test/integration/routing/calendars_test.rb +++ b/test/integration/routing/calendars_test.rb @@ -23,5 +23,10 @@ class RoutingCalendarsTest < ActionController::IntegrationTest { :method => 'get', :path => "/issues/calendar" }, { :controller => 'calendars', :action => 'show' } ) + assert_routing( + { :method => 'get', :path => "/projects/project-name/issues/calendar" }, + { :controller => 'calendars', :action => 'show', + :project_id => 'project-name' } + ) end end diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb index 6aadcee10..e94c8be95 100644 --- a/test/integration/routing_test.rb +++ b/test/integration/routing_test.rb @@ -114,11 +114,6 @@ class RoutingTest < ActionController::IntegrationTest { :controller => 'issues', :action => 'new', :project_id => '23', :copy_from => '64' } ) - assert_routing( - { :method => 'get', :path => "/projects/project-name/issues/calendar" }, - { :controller => 'calendars', :action => 'show', - :project_id => 'project-name' } - ) assert_routing( { :method => 'get', :path => "/issues/gantt" }, { :controller => 'gantts', :action => 'show' }