From 55a1869b86c85fb0cf150a39a093e7a6006d8a3b Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Wed, 18 Sep 2013 08:10:10 +0000 Subject: [PATCH] Merged r12142 from trunk to 2.3-stable (#14931) scm: git: change non ASCII user name variable to instance variable. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12145 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/unit/lib/redmine/scm/adapters/git_adapter_test.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb index 2b28a46d0..00837e7b7 100644 --- a/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb +++ b/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb @@ -61,8 +61,10 @@ begin ) assert @adapter @char_1 = CHAR_1_HEX.dup + @str_felix_hex = FELIX_HEX.dup if @char_1.respond_to?(:force_encoding) @char_1.force_encoding('UTF-8') + @str_felix_hex.force_encoding('ASCII-8BIT') end end @@ -396,14 +398,10 @@ begin def test_last_rev_with_spaces_in_filename last_rev = @adapter.lastrev("filemane with spaces.txt", "ed5bb786bbda2dee66a2d50faf51429dbc043a7b") - str_felix_hex = FELIX_HEX.dup last_rev_author = last_rev.author - if last_rev_author.respond_to?(:force_encoding) - str_felix_hex.force_encoding('ASCII-8BIT') - end assert_equal "ed5bb786bbda2dee66a2d50faf51429dbc043a7b", last_rev.scmid assert_equal "ed5bb786bbda2dee66a2d50faf51429dbc043a7b", last_rev.identifier - assert_equal "#{str_felix_hex} ", + assert_equal "#{@str_felix_hex} ", last_rev.author assert_equal "2010-09-18 19:59:46".to_time, last_rev.time end