diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
| commit | 2d1866d966d94c688f9cb87c5bf3f096dffac844 (patch) | |
| tree | 7a733c1cc51448ab69b3f892285305dbfb0ae15e /test/unit/repository_git_test.rb | |
| parent | a6ec78a4dc658e3517ed682792016b6530458696 (diff) | |
| download | redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.tar.gz redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.zip | |
Merged rails-4.1 branch (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/unit/repository_git_test.rb')
| -rw-r--r-- | test/unit/repository_git_test.rb | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/test/unit/repository_git_test.rb b/test/unit/repository_git_test.rb index c7836fe06..94e5747cc 100644 --- a/test/unit/repository_git_test.rb +++ b/test/unit/repository_git_test.rb @@ -28,8 +28,8 @@ class RepositoryGitTest < ActiveSupport::TestCase NUM_REV = 28 NUM_HEAD = 6 - FELIX_HEX = "Felix Sch\xC3\xA4fer" - CHAR_1_HEX = "\xc3\x9c" + FELIX_HEX = "Felix Sch\xC3\xA4fer".force_encoding('UTF-8') + CHAR_1_HEX = "\xc3\x9c".force_encoding('UTF-8') ## Git, Mercurial and CVS path encodings are binary. ## Subversion supports URL encoding for path. @@ -47,10 +47,6 @@ class RepositoryGitTest < ActiveSupport::TestCase :path_encoding => 'ISO-8859-1' ) assert @repository - @char_1 = CHAR_1_HEX.dup - if @char_1.respond_to?(:force_encoding) - @char_1.force_encoding('UTF-8') - end end def test_blank_path_to_repository_error_message @@ -66,8 +62,7 @@ class RepositoryGitTest < ActiveSupport::TestCase def test_blank_path_to_repository_error_message_fr set_language_if_valid 'fr' - str = "Chemin du d\xc3\xa9p\xc3\xb4t doit \xc3\xaatre renseign\xc3\xa9(e)" - str.force_encoding('UTF-8') if str.respond_to?(:force_encoding) + str = "Chemin du d\xc3\xa9p\xc3\xb4t doit \xc3\xaatre renseign\xc3\xa9(e)".force_encoding('UTF-8') repo = Repository::Git.new( :project => @project, :url => "", @@ -450,14 +445,14 @@ class RepositoryGitTest < ActiveSupport::TestCase else # latin-1 encoding path changesets = @repository.latest_changesets( - "latin-1-dir/test-#{@char_1}-2.txt", '64f1f3e89') + "latin-1-dir/test-#{CHAR_1_HEX}-2.txt", '64f1f3e89') assert_equal [ '64f1f3e89ad1cb57976ff0ad99a107012ba3481d', '4fc55c43bf3d3dc2efb66145365ddc17639ce81e', ], changesets.collect(&:revision) changesets = @repository.latest_changesets( - "latin-1-dir/test-#{@char_1}-2.txt", '64f1f3e89', 1) + "latin-1-dir/test-#{CHAR_1_HEX}-2.txt", '64f1f3e89', 1) assert_equal [ '64f1f3e89ad1cb57976ff0ad99a107012ba3481d', ], changesets.collect(&:revision) @@ -475,7 +470,7 @@ class RepositoryGitTest < ActiveSupport::TestCase @project.reload assert_equal NUM_REV, @repository.changesets.count changesets = @repository.latest_changesets( - "latin-1-dir/test-#{@char_1}-subdir", '1ca7f5ed') + "latin-1-dir/test-#{CHAR_1_HEX}-subdir", '1ca7f5ed') assert_equal [ '1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127', ], changesets.collect(&:revision) @@ -538,13 +533,9 @@ class RepositoryGitTest < ActiveSupport::TestCase @repository.fetch_changesets @project.reload assert_equal NUM_REV, @repository.changesets.count - str_felix_hex = FELIX_HEX.dup - if str_felix_hex.respond_to?(:force_encoding) - str_felix_hex.force_encoding('UTF-8') - end c = @repository.changesets.find_by_revision( 'ed5bb786bbda2dee66a2d50faf51429dbc043a7b') - assert_equal "#{str_felix_hex} <felix@fachschaften.org>", c.committer + assert_equal "#{FELIX_HEX} <felix@fachschaften.org>", c.committer end def test_previous |