summaryrefslogtreecommitdiffstats
path: root/test/integration
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-07-04 19:17:43 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-07-04 19:17:43 +0000
commit1d1aef9d61beec2504b2efedce99c8a8b7869835 (patch)
tree593aaf117a4bc2f102040d6e47263bc1575dc7e9 /test/integration
parentd00ba6d2bb7cd76edf2cd1e75584f9dfd336ea72 (diff)
downloadredmine-1d1aef9d61beec2504b2efedce99c8a8b7869835.tar.gz
redmine-1d1aef9d61beec2504b2efedce99c8a8b7869835.zip
Fixed: unified diff link broken on specific file/revision diff (#11325).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9909 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/integration')
-rw-r--r--test/integration/routing/repositories_test.rb28
1 files changed, 24 insertions, 4 deletions
diff --git a/test/integration/routing/repositories_test.rb b/test/integration/routing/repositories_test.rb
index 2351721bb..fc4b54c6c 100644
--- a/test/integration/routing/repositories_test.rb
+++ b/test/integration/routing/repositories_test.rb
@@ -140,9 +140,11 @@ class RoutingRepositoriesTest < ActionController::IntegrationTest
)
assert_routing(
{ :method => 'get',
- :path => "/projects/redmine/repository/revisions/2457/diff.diff" },
+ :path => "/projects/redmine/repository/revisions/2457/diff" },
{ :controller => 'repositories', :action => 'diff', :id => 'redmine',
- :rev => '2457', :format => 'diff' }
+ :rev => '2457', :format => 'diff' },
+ {},
+ { :format => 'diff' }
)
assert_routing(
{ :method => 'get',
@@ -152,6 +154,14 @@ class RoutingRepositoriesTest < ActionController::IntegrationTest
)
assert_routing(
{ :method => 'get',
+ :path => "/projects/redmine/repository/revisions/2/diff/#{@path_hash[:path]}" },
+ { :controller => 'repositories', :action => 'diff', :id => 'redmine',
+ :path => @path_hash[:param], :rev => '2', :format => 'diff' },
+ {},
+ { :format => 'diff' }
+ )
+ assert_routing(
+ { :method => 'get',
:path => "/projects/redmine/repository/revisions/2/entry/#{@path_hash[:path]}" },
{ :controller => 'repositories', :action => 'entry', :id => 'redmine',
:path => @path_hash[:param], :rev => '2' }
@@ -209,9 +219,11 @@ class RoutingRepositoriesTest < ActionController::IntegrationTest
)
assert_routing(
{ :method => 'get',
- :path => "/projects/redmine/repository/foo/revisions/2457/diff.diff" },
+ :path => "/projects/redmine/repository/foo/revisions/2457/diff" },
{ :controller => 'repositories', :action => 'diff', :id => 'redmine', :repository_id => 'foo',
- :rev => '2457', :format => 'diff' }
+ :rev => '2457', :format => 'diff' },
+ {},
+ { :format => 'diff' }
)
assert_routing(
{ :method => 'get',
@@ -221,6 +233,14 @@ class RoutingRepositoriesTest < ActionController::IntegrationTest
)
assert_routing(
{ :method => 'get',
+ :path => "/projects/redmine/repository/foo/revisions/2/diff/#{@path_hash[:path]}" },
+ { :controller => 'repositories', :action => 'diff', :id => 'redmine', :repository_id => 'foo',
+ :path => @path_hash[:param], :rev => '2', :format => 'diff' },
+ {},
+ { :format => 'diff' }
+ )
+ assert_routing(
+ { :method => 'get',
:path => "/projects/redmine/repository/foo/revisions/2/entry/#{@path_hash[:path]}" },
{ :controller => 'repositories', :action => 'entry', :id => 'redmine', :repository_id => 'foo',
:path => @path_hash[:param], :rev => '2' }