From 11946ecd876f14249508fb0ed3a8fd5e3071b2e5 Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Fri, 30 Dec 2011 10:07:56 +0000
Subject: [PATCH] test: route: split versions tests whether scoped under
 project or not

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8436 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/integration/routing/versions_test.rb | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/test/integration/routing/versions_test.rb b/test/integration/routing/versions_test.rb
index 01cf2e99f..932a9c5f5 100644
--- a/test/integration/routing/versions_test.rb
+++ b/test/integration/routing/versions_test.rb
@@ -18,12 +18,17 @@
 require File.expand_path('../../../test_helper', __FILE__)
 
 class RoutingVersionsTest < ActionController::IntegrationTest
-  def test_versions
+  def test_versions_scoped_under_project
     # /projects/foo/versions is /projects/foo/roadmap
     assert_routing(
         { :method => 'get', :path => "/projects/33/roadmap" },
         { :controller => 'versions', :action => 'index', :project_id => '33' }
       )
+    assert_routing(
+        { :method => 'put', :path => "/projects/foo/versions/close_completed" },
+        { :controller => 'versions', :action => 'close_completed',
+          :project_id => 'foo' }
+      )
     assert_routing(
         { :method => 'get', :path => "/projects/foo/versions.xml" },
         { :controller => 'versions', :action => 'index',
@@ -54,6 +59,9 @@ class RoutingVersionsTest < ActionController::IntegrationTest
         { :controller => 'versions', :action => 'create',
           :project_id => 'foo', :format => 'json' }
       )
+  end
+
+  def test_versions
     assert_routing(
         { :method => 'get', :path => "/versions/1" },
         { :controller => 'versions', :action => 'show', :id => '1' }
@@ -100,11 +108,6 @@ class RoutingVersionsTest < ActionController::IntegrationTest
         { :controller => 'versions', :action => 'destroy', :id => '1',
           :format => 'json' }
       )
-    assert_routing(
-        { :method => 'put', :path => "/projects/foo/versions/close_completed" },
-        { :controller => 'versions', :action => 'close_completed',
-          :project_id => 'foo' }
-      )
     assert_routing(
         { :method => 'post', :path => "/versions/1/status_by" },
         { :controller => 'versions', :action => 'status_by', :id => '1' }