test: replace "should_route" of "wiki (singular, project's pages)" to "assert_routing" at integration/routing_test.rb

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

1 files changed, 87 insertions, 22 deletions

diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb
index d3cae288d..e7cada841 100644
--- a/test/integration/routing_test.rb
+++ b/test/integration/routing_test.rb
@@ -661,28 +661,93 @@ class RoutingTest < ActionController::IntegrationTest
       )
   end
 
-  context "wiki (singular, project's pages)" do
-    should_route :get, "/projects/567/wiki", :controller => 'wiki', :action => 'show', :project_id => '567'
-    should_route :get, "/projects/567/wiki/lalala", :controller => 'wiki', :action => 'show', :project_id => '567', :id => 'lalala'
-    should_route :get, "/projects/567/wiki/my_page/edit", :controller => 'wiki', :action => 'edit', :project_id => '567', :id => 'my_page'
-    should_route :get, "/projects/1/wiki/CookBook_documentation/history", :controller => 'wiki', :action => 'history', :project_id => '1', :id => 'CookBook_documentation'
-    should_route :get, "/projects/1/wiki/CookBook_documentation/diff", :controller => 'wiki', :action => 'diff', :project_id => '1', :id => 'CookBook_documentation'
-    should_route :get, "/projects/1/wiki/CookBook_documentation/diff/2", :controller => 'wiki', :action => 'diff', :project_id => '1', :id => 'CookBook_documentation', :version => '2'
-    should_route :get, "/projects/1/wiki/CookBook_documentation/diff/2/vs/1", :controller => 'wiki', :action => 'diff', :project_id => '1', :id => 'CookBook_documentation', :version => '2', :version_from => '1'
-    should_route :get, "/projects/1/wiki/CookBook_documentation/annotate/2", :controller => 'wiki', :action => 'annotate', :project_id => '1', :id => 'CookBook_documentation', :version => '2'
-    should_route :get, "/projects/22/wiki/ladida/rename", :controller => 'wiki', :action => 'rename', :project_id => '22', :id => 'ladida'
-    should_route :get, "/projects/567/wiki/index", :controller => 'wiki', :action => 'index', :project_id => '567'
-    should_route :get, "/projects/567/wiki/date_index", :controller => 'wiki', :action => 'date_index', :project_id => '567'
-    should_route :get, "/projects/567/wiki/export", :controller => 'wiki', :action => 'export', :project_id => '567'
-
-    should_route :post, "/projects/567/wiki/CookBook_documentation/preview", :controller => 'wiki', :action => 'preview', :project_id => '567', :id => 'CookBook_documentation'
-    should_route :post, "/projects/22/wiki/ladida/rename", :controller => 'wiki', :action => 'rename', :project_id => '22', :id => 'ladida'
-    should_route :post, "/projects/22/wiki/ladida/protect", :controller => 'wiki', :action => 'protect', :project_id => '22', :id => 'ladida'
-    should_route :post, "/projects/22/wiki/ladida/add_attachment", :controller => 'wiki', :action => 'add_attachment', :project_id => '22', :id => 'ladida'
-
-    should_route :put, "/projects/567/wiki/my_page", :controller => 'wiki', :action => 'update', :project_id => '567', :id => 'my_page'
-
-    should_route :delete, "/projects/22/wiki/ladida", :controller => 'wiki', :action => 'destroy', :project_id => '22', :id => 'ladida'
+  def test_wiki_singular_projects_pages
+    assert_routing(
+        { :method => 'get', :path => "/projects/567/wiki" },
+        { :controller => 'wiki', :action => 'show', :project_id => '567' }
+      )
+    assert_routing(
+        { :method => 'get', :path => "/projects/567/wiki/lalala" },
+        { :controller => 'wiki', :action => 'show', :project_id => '567',
+          :id => 'lalala' }
+      )
+    assert_routing(
+        { :method => 'get', :path => "/projects/567/wiki/my_page/edit" },
+        { :controller => 'wiki', :action => 'edit', :project_id => '567',
+          :id => 'my_page' }
+      )
+    assert_routing(
+        { :method => 'get', :path => "/projects/1/wiki/CookBook_documentation/history" },
+        { :controller => 'wiki', :action => 'history', :project_id => '1',
+          :id => 'CookBook_documentation' }
+      )
+    assert_routing(
+        { :method => 'get', :path => "/projects/1/wiki/CookBook_documentation/diff" },
+        { :controller => 'wiki', :action => 'diff', :project_id => '1',
+          :id => 'CookBook_documentation' }
+      )
+    assert_routing(
+        { :method => 'get', :path => "/projects/1/wiki/CookBook_documentation/diff/2" },
+        { :controller => 'wiki', :action => 'diff', :project_id => '1',
+          :id => 'CookBook_documentation', :version => '2' }
+      )
+    assert_routing(
+        { :method => 'get', :path => "/projects/1/wiki/CookBook_documentation/diff/2/vs/1" },
+        { :controller => 'wiki', :action => 'diff', :project_id => '1',
+          :id => 'CookBook_documentation', :version => '2', :version_from => '1' }
+      )
+    assert_routing(
+        { :method => 'get', :path => "/projects/1/wiki/CookBook_documentation/annotate/2" },
+        { :controller => 'wiki', :action => 'annotate', :project_id => '1',
+          :id => 'CookBook_documentation', :version => '2' }
+      )
+    assert_routing(
+        { :method => 'get', :path => "/projects/22/wiki/ladida/rename" },
+        { :controller => 'wiki', :action => 'rename', :project_id => '22',
+          :id => 'ladida' }
+      )
+    assert_routing(
+        { :method => 'get', :path => "/projects/567/wiki/index" },
+        { :controller => 'wiki', :action => 'index', :project_id => '567' }
+      )
+    assert_routing(
+        { :method => 'get', :path => "/projects/567/wiki/date_index" },
+        { :controller => 'wiki', :action => 'date_index', :project_id => '567' }
+      )
+    assert_routing(
+        { :method => 'get', :path => "/projects/567/wiki/export" },
+        { :controller => 'wiki', :action => 'export', :project_id => '567' }
+      )
+    assert_routing(
+        { :method => 'post', :path => "/projects/567/wiki/CookBook_documentation/preview" },
+        { :controller => 'wiki', :action => 'preview', :project_id => '567',
+          :id => 'CookBook_documentation' }
+      )
+    assert_routing(
+        { :method => 'post', :path => "/projects/22/wiki/ladida/rename" },
+        { :controller => 'wiki', :action => 'rename', :project_id => '22',
+          :id => 'ladida' }
+      )
+    assert_routing(
+        { :method => 'post', :path => "/projects/22/wiki/ladida/protect" },
+        { :controller => 'wiki', :action => 'protect', :project_id => '22',
+          :id => 'ladida' }
+      )
+    assert_routing(
+        { :method => 'post', :path => "/projects/22/wiki/ladida/add_attachment" },
+        { :controller => 'wiki', :action => 'add_attachment', :project_id => '22',
+          :id => 'ladida' }
+      )
+    assert_routing(
+        { :method => 'put', :path => "/projects/567/wiki/my_page" },
+        { :controller => 'wiki', :action => 'update', :project_id => '567',
+          :id => 'my_page' }
+      )
+    assert_routing(
+        { :method => 'delete', :path => "/projects/22/wiki/ladida" },
+        { :controller => 'wiki', :action => 'destroy', :project_id => '22',
+          :id => 'ladida' }
+      )
   end
 
   def test_wikis_plural_admin_setup