summaryrefslogtreecommitdiffstats
path: root/test/unit/changeset_test.rb
diff options
context:
space:
mode:
Diffstat (limited to 'test/unit/changeset_test.rb')
-rw-r--r--test/unit/changeset_test.rb9
1 files changed, 7 insertions, 2 deletions
diff --git a/test/unit/changeset_test.rb b/test/unit/changeset_test.rb
index 508294fea..a0aaff78d 100644
--- a/test/unit/changeset_test.rb
+++ b/test/unit/changeset_test.rb
@@ -216,8 +216,13 @@ class ChangesetTest < ActiveSupport::TestCase
def test_invalid_utf8_sequences_in_comments_should_be_stripped
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
+ str = File.read("#{RAILS_ROOT}/test/fixtures/encoding/iso-8859-1.txt")
+ c.comments = str
+ if str.respond_to?(:force_encoding)
+ assert_equal "Texte encod? en ISO-8859-1.", c.comments
+ else
+ assert_equal "Texte encod en ISO-8859-1.", c.comments
+ end
end
end