Merged rails-3.2 branch.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9528 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2012-04-25 17:17:49 +00:00
parent 34e20c4373
commit 5e57a1a9d9
457 changed files with 20215 additions and 5352 deletions
+7 -5
View File
@@ -90,11 +90,13 @@ class RoutingWikiTest < ActionController::IntegrationTest
{ :controller => 'wiki', :action => 'rename', :project_id => '22',
:id => 'ladida' }
)
assert_routing(
{ :method => 'post', :path => "/projects/567/wiki/CookBook_documentation/preview" },
{ :controller => 'wiki', :action => 'preview', :project_id => '567',
:id => 'CookBook_documentation' }
)
["post", "put"].each do |method|
assert_routing(
{ :method => method, :path => "/projects/567/wiki/CookBook_documentation/preview" },
{ :controller => 'wiki', :action => 'preview', :project_id => '567',
:id => 'CookBook_documentation' }
)
end
assert_routing(
{ :method => 'post', :path => "/projects/22/wiki/ladida/rename" },
{ :controller => 'wiki', :action => 'rename', :project_id => '22',