test: route: move remaining calendars test in test_issues_extra_actions to routing...

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8335 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/test/integration/routing/calendars_test.rb b/test/integration/routing/calendars_test.rb
index c6aa5a6e30cb87c7dfabd196343cc020d2f5485b..fa142850e1ebd98907e2b300ae8f2b7eb16fc9f9 100644 (file)
--- 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 6aadcee1036de4538956e2c88d4eb7d1d2f7664c..e94c8be9501ee8e748ea1827557b81555b2baa74 100644 (file)
--- 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' }