summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-04-12 12:24:43 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-04-12 12:24:43 +0000
commitf0d32f65678e9be9e07c0928dd731c561290328c (patch)
tree40fe701e58e3a74c495b65e016585acd669604be
parent0ceeecc85461694688de5b00a0dd607a2b9080e3 (diff)
downloadredmine-f0d32f65678e9be9e07c0928dd731c561290328c.tar.gz
redmine-f0d32f65678e9be9e07c0928dd731c561290328c.zip
scm: cvs: fix unit model cat test fails on Windows.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5440 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--test/unit/repository_cvs_test.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/test/unit/repository_cvs_test.rb b/test/unit/repository_cvs_test.rb
index a8fc7d34c..c0f4a9a3c 100644
--- a/test/unit/repository_cvs_test.rb
+++ b/test/unit/repository_cvs_test.rb
@@ -122,12 +122,14 @@ class RepositoryCvsTest < ActiveSupport::TestCase
assert buf
lines = buf.split("\n")
assert_equal 2, lines.length
- assert_equal 'with one change', lines[1]
+ buf = lines[1].gsub(/\r$/, "")
+ assert_equal 'with one change', buf
buf = @repository.cat('README', '1')
assert buf
lines = buf.split("\n")
assert_equal 1, lines.length
- assert_equal 'CVS test repository', lines[0]
+ buf = lines[0].gsub(/\r$/, "")
+ assert_equal 'CVS test repository', buf
assert_nil @repository.cat('missing.rb')
# sources/welcome_controller.rb is removed at revision 5.