From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Thu, 15 Dec 2011 08:12:42 +0000 (+0000)
Subject: test: replace "should_route" of "issues" form update to "assert_routing" at integrati... 
X-Git-Tag: 1.4.0~1064
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=64129a68cd7f8a17abc9d9d815086b8bdbbf73bd;p=redmine.git

test: replace "should_route" of "issues" form update to "assert_routing" at integration/routing_test.rb

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

diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb
index 01e858a67..e6ccfaca1 100644
--- a/test/integration/routing_test.rb
+++ b/test/integration/routing_test.rb
@@ -240,17 +240,36 @@ class RoutingTest < ActionController::IntegrationTest
       )
   end
 
-  context "issues" do
-    # issue form update
-    should_route :post, "/projects/23/issues/new", :controller => 'issues', :action => 'new', :project_id => '23'
-    should_route :post, "/projects/23/issues", :controller => 'issues', :action => 'create', :project_id => '23'
-    should_route :post, "/issues.xml", :controller => 'issues', :action => 'create', :format => 'xml'
-
-    should_route :get, "/issues/64/edit", :controller => 'issues', :action => 'edit', :id => '64'
-    should_route :put, "/issues/1.xml", :controller => 'issues', :action => 'update', :id => '1', :format => 'xml'
-
-    should_route :delete, "/issues/1.xml", :controller => 'issues', :action => 'destroy', :id => '1', :format => 'xml'
+  def test_issues_form_update
+    assert_routing(
+        { :method => 'post', :path => "/projects/23/issues/new" },
+        { :controller => 'issues', :action => 'new', :project_id => '23' }
+      )
+    assert_routing(
+        { :method => 'post', :path => "/projects/23/issues" },
+        { :controller => 'issues', :action => 'create', :project_id => '23' }
+      )
+    assert_routing(
+        { :method => 'post', :path => "/issues.xml" },
+        { :controller => 'issues', :action => 'create', :format => 'xml' }
+      )
+    assert_routing(
+        { :method => 'get', :path => "/issues/64/edit" },
+        { :controller => 'issues', :action => 'edit', :id => '64' }
+      )
+    assert_routing(
+        { :method => 'put', :path => "/issues/1.xml" },
+        { :controller => 'issues', :action => 'update', :id => '1',
+          :format => 'xml' }
+      )
+    assert_routing(
+        { :method => 'delete', :path => "/issues/1.xml" },
+        { :controller => 'issues', :action => 'destroy', :id => '1',
+          :format => 'xml' }
+      )
+  end
 
+  context "issues" do
     # Extra actions
     should_route :get, "/projects/23/issues/64/copy", :controller => 'issues', :action => 'new', :project_id => '23', :copy_from => '64'