From 79d227d34e847f571593dc5b8682de6d3dc4c4f4 Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sat, 24 Dec 2011 10:12:53 +0000
Subject: [PATCH] test: route: move activities test in projects test to
 integration/routing/activities_test.rb

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8346 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/integration/routing/activities_test.rb | 9 +++++++++
 test/integration/routing_test.rb            | 9 ---------
 2 files changed, 9 insertions(+), 9 deletions(-)

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' }