From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Tue, 22 Feb 2011 12:16:08 +0000 (+0000)
Subject: scm: fix unit changeset_test.rb test methods calls randomly.
X-Git-Tag: 1.2.0~899
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4257b1d9adbcdc277ce29562dd9d879473ffa4c2;p=redmine.git

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
---

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