]> source.dussan.org Git - redmine.git/commitdiff
Merged r12424 from trunk to 2.4-stable.
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Fri, 20 Dec 2013 17:46:11 +0000 (17:46 +0000)
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Fri, 20 Dec 2013 17:46:11 +0000 (17:46 +0000)
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

test/functional/repositories_subversion_controller_test.rb

index 9ca4275498565ddb037d61c3d92b9ffc28e55f0a..076a2cb51fef24197de3f73dabf78d2b42b3a424 100644 (file)
@@ -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