summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2013-12-20 17:46:11 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2013-12-20 17:46:11 +0000
commitd05042fbb52aeb1e872063fddab09fc23fee49a2 (patch)
tree0bf0e23ae7b6d13a70f844c2306e15147440b6b0
parent00ff3361d6779e949ab1508c739ee6bbaa4afe4b (diff)
downloadredmine-d05042fbb52aeb1e872063fddab09fc23fee49a2.tar.gz
redmine-d05042fbb52aeb1e872063fddab09fc23fee49a2.zip
Merged r12424 from trunk to 2.4-stable.
fix svn raw diff failure on svn version 1.6.17 (revision 1128011). git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12425 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--test/functional/repositories_subversion_controller_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/functional/repositories_subversion_controller_test.rb b/test/functional/repositories_subversion_controller_test.rb
index 9ca427549..076a2cb51 100644
--- a/test/functional/repositories_subversion_controller_test.rb
+++ b/test/functional/repositories_subversion_controller_test.rb
@@ -326,10 +326,10 @@ class RepositoriesSubversionControllerTest < ActionController::TestCase
@project.reload
assert_equal NUM_REV, @repository.changesets.count
- get :diff, :id => PRJ_ID, :rev => 3, :format => 'diff'
+ get :diff, :id => PRJ_ID, :rev => 5, :format => 'diff'
assert_response :success
assert_equal 'text/x-patch', @response.content_type
- assert_equal 'Index: subversion_test/textfile.txt', @response.body.split(/\r?\n/).first
+ assert_equal 'Index: subversion_test/folder/greeter.rb', @response.body.split(/\r?\n/).first
end
def test_directory_diff