From 4620f6b2fa06f2510f56279f973d807dfc2c1a90 Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Tue, 22 Feb 2011 12:16:08 +0000
Subject: [PATCH] scm: fix unit changeset_test.rb test methods calls randomly.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4924 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/unit/changeset_test.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/unit/changeset_test.rb b/test/unit/changeset_test.rb
index 2f0415d3a..cb4d64042 100644
--- a/test/unit/changeset_test.rb
+++ b/test/unit/changeset_test.rb
@@ -214,9 +214,11 @@ class ChangesetTest < ActiveSupport::TestCase
   end
   
   def test_invalid_utf8_sequences_in_comments_should_be_stripped
-    c = Changeset.new
-    c.comments = File.read("#{RAILS_ROOT}/test/fixtures/encoding/iso-8859-1.txt")
-    assert_equal "Texte encod en ISO-8859-1.", c.comments
+    with_settings :commit_logs_encoding => 'UTF-8' do
+      c = Changeset.new
+      c.comments = File.read("#{RAILS_ROOT}/test/fixtures/encoding/iso-8859-1.txt")
+      assert_equal "Texte encod en ISO-8859-1.", c.comments
+    end
   end
 
   def test_identifier
-- 
GitLab