meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

add test to UnifiedDiffTest to keep similar git footer line (#33357)

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@19734 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2020-04-30 02:07:17 +00:00
parent 8374ae8513
commit d94226dd4c
1 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
test/unit/lib/redmine/unified_diff_test.rb
View File

@ -375,6 +375,46 @@ class Redmine::UnifiedDiffTest < ActiveSupport::TestCase
end
end
def test_keep_similar_git_footer_line
raw = <<~DIFF
diff --git a/test1.txt b/test1.txt
--- a/test1.txt
+++ b/test1.txt
@@ -1,11 +1,6 @@
$ git init --bare git_utf8_repository
$ hg init git_utf8_repository_hg
$ cd git_utf8_repository_hg
--
-Next line has white space after '-'
--
---
--
$ touch test.txt
$ hg add test.txt
$ hg commit -m `echo -e "U+1F603\U1F603"` -u `echo -e "U+1F603\U1F603"`
diff --git a/test2.txt b/test2.txt
--- a/test2.txt
+++ b/test2.txt
@@ -5,9 +5,4 @@
$ hg add test.txt
$ hg commit -m `echo -e "U+1F603\U1F603"` -u `echo -e "U+1F603\U1F603"`
$ hg bookmark master
--
-Next line has white space after '-'
--
---
--
$ hg push ../git_utf8_repository
DIFF
lines = raw.split("\n")
assert_equal '-- ', lines[9]
assert_equal '-- ', lines[24]
diff = Redmine::UnifiedDiff.new(raw, :type => 'sbs')
assert_equal 2, diff.size
assert_equal 11, diff[0].size
assert_equal 9, diff[1].size
end
private
def read_diff_fixture(filename)