From 2d1866d966d94c688f9cb87c5bf3f096dffac844 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Wed, 22 Oct 2014 17:37:16 +0000 Subject: Merged rails-4.1 branch (#14534). git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/unit/repository_subversion_test.rb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'test/unit/repository_subversion_test.rb') diff --git a/test/unit/repository_subversion_test.rb b/test/unit/repository_subversion_test.rb index d9b9a15f4..2fe50da14 100644 --- a/test/unit/repository_subversion_test.rb +++ b/test/unit/repository_subversion_test.rb @@ -202,13 +202,7 @@ class RepositorySubversionTest < ActiveSupport::TestCase def test_log_encoding_ignore_setting with_settings :commit_logs_encoding => 'windows-1252' do - s1 = "\xC2\x80" - s2 = "\xc3\x82\xc2\x80" - if s1.respond_to?(:force_encoding) - s1.force_encoding('ISO-8859-1') - s2.force_encoding('UTF-8') - assert_equal s1.encode('UTF-8'), s2 - end + s2 = "\xc3\x82\xc2\x80".force_encoding('UTF-8') c = Changeset.new(:repository => @repository, :comments => s2, :revision => '123', -- cgit v1.2.3