summaryrefslogtreecommitdiffstats
path: root/test/integration/routing/wiki_test.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-04-25 17:17:49 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-04-25 17:17:49 +0000
commit5e57a1a9d9478162ac4f27ae96b2ccaf55a1aba7 (patch)
tree93e57765139714bd82dede475725516c448c0d55 /test/integration/routing/wiki_test.rb
parent34e20c4373b7f5a20ab3a132feae3f70f21ec477 (diff)
downloadredmine-5e57a1a9d9478162ac4f27ae96b2ccaf55a1aba7.tar.gz
redmine-5e57a1a9d9478162ac4f27ae96b2ccaf55a1aba7.zip
Merged rails-3.2 branch.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9528 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/integration/routing/wiki_test.rb')
-rw-r--r--test/integration/routing/wiki_test.rb12
1 files changed, 7 insertions, 5 deletions
diff --git a/test/integration/routing/wiki_test.rb b/test/integration/routing/wiki_test.rb
index 35ee4310c..ef652e260 100644
--- a/test/integration/routing/wiki_test.rb
+++ b/test/integration/routing/wiki_test.rb
@@ -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',