test: route: split news tests whether scoped under project or not

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

diff --git a/test/integration/routing/news_test.rb b/test/integration/routing/news_test.rb
index 08e1aeee1fb2613ee0021421d6ff53fb9d6b7b13..70c8b3afd879eba5c5854aa97527c1b6ccf6fc70 100644 (file)
--- a/test/integration/routing/news_test.rb
+++ b/test/integration/routing/news_test.rb
@@ -35,6 +35,29 @@ class RoutingNewsTest < ActionController::IntegrationTest
         { :method => 'get', :path => "/news.json" },
         { :controller => 'news', :action => 'index', :format => 'json' }
       )
+    assert_routing(
+        { :method => 'get', :path => "/news/2" },
+        { :controller => 'news', :action => 'show', :id => '2' }
+      )
+    assert_routing(
+        { :method => 'get', :path => "/news/234" },
+        { :controller => 'news', :action => 'show', :id => '234' }
+      )
+    assert_routing(
+        { :method => 'get', :path => "/news/567/edit" },
+        { :controller => 'news', :action => 'edit', :id => '567' }
+      )
+    assert_routing(
+        { :method => 'put', :path => "/news/567" },
+        { :controller => 'news', :action => 'update', :id => '567' }
+      )
+    assert_routing(
+        { :method => 'delete', :path => "/news/567" },
+        { :controller => 'news', :action => 'destroy', :id => '567' }
+      )
+  end
+
+  def test_news_scoped_under_project
     assert_routing(
         { :method => 'get', :path => "/projects/567/news" },
         { :controller => 'news', :action => 'index', :project_id => '567' }
@@ -54,33 +77,13 @@ class RoutingNewsTest < ActionController::IntegrationTest
         { :controller => 'news', :action => 'index', :format => 'json',
           :project_id => '567' }
       )
-    assert_routing(
-        { :method => 'get', :path => "/news/2" },
-        { :controller => 'news', :action => 'show', :id => '2' }
-      )
     assert_routing(
         { :method => 'get', :path => "/projects/567/news/new" },
         { :controller => 'news', :action => 'new', :project_id => '567' }
       )
-    assert_routing(
-        { :method => 'get', :path => "/news/234" },
-        { :controller => 'news', :action => 'show', :id => '234' }
-      )
-    assert_routing(
-        { :method => 'get', :path => "/news/567/edit" },
-        { :controller => 'news', :action => 'edit', :id => '567' }
-      )
     assert_routing(
         { :method => 'post', :path => "/projects/567/news" },
         { :controller => 'news', :action => 'create', :project_id => '567' }
       )
-    assert_routing(
-        { :method => 'put', :path => "/news/567" },
-        { :controller => 'news', :action => 'update', :id => '567' }
-      )
-    assert_routing(
-        { :method => 'delete', :path => "/news/567" },
-        { :controller => 'news', :action => 'destroy', :id => '567' }
-      )
   end
 end