summaryrefslogtreecommitdiffstats
path: root/test/integration
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-10-21 18:46:26 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-10-21 18:46:26 +0000
commitd66b3452db773e2d9faf2452595ab3e8d136d843 (patch)
tree38ce910cf45c26789fdb1009f381aa1243e3d814 /test/integration
parent9ec142713d5eb4c2f45fec02d6062165efe312c7 (diff)
downloadredmine-d66b3452db773e2d9faf2452595ab3e8d136d843.tar.gz
redmine-d66b3452db773e2d9faf2452595ab3e8d136d843.zip
Wiki page versions routes cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10687 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/integration')
-rw-r--r--test/integration/routing/wiki_test.rb9
1 files changed, 2 insertions, 7 deletions
diff --git a/test/integration/routing/wiki_test.rb b/test/integration/routing/wiki_test.rb
index 36f5f2c09..2afc29eea 100644
--- a/test/integration/routing/wiki_test.rb
+++ b/test/integration/routing/wiki_test.rb
@@ -39,17 +39,12 @@ class RoutingWikiTest < ActionController::IntegrationTest
:id => 'CookBook_documentation' }
)
assert_routing(
- { :method => 'get', :path => "/projects/1/wiki/CookBook_documentation/diff/2" },
+ { :method => 'get', :path => "/projects/1/wiki/CookBook_documentation/2/diff" },
{ :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" },
+ { :method => 'get', :path => "/projects/1/wiki/CookBook_documentation/2/annotate" },
{ :controller => 'wiki', :action => 'annotate', :project_id => '1',
:id => 'CookBook_documentation', :version => '2' }
)