From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sun, 13 Jan 2013 01:50:14 +0000 (+0000)
Subject: use "UTF-16LE" instead of "UTF-16" on Ruby 1.9.2 due to test failure (#12787)
X-Git-Tag: 2.3.0~306
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c8bef6d2d37263ab160e2223a15e87956af38fac;p=redmine.git

use "UTF-16LE" instead of "UTF-16" on Ruby 1.9.2 due to test failure (#12787)

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11181 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/test/functional/repositories_filesystem_controller_test.rb b/test/functional/repositories_filesystem_controller_test.rb
index 8330d64c9..ca4909959 100644
--- a/test/functional/repositories_filesystem_controller_test.rb
+++ b/test/functional/repositories_filesystem_controller_test.rb
@@ -109,7 +109,8 @@ class RepositoriesFilesystemControllerTest < ActionController::TestCase
     end
 
     def test_show_utf16
-      with_settings :repositories_encodings => 'UTF-16' do
+      enc = (RUBY_VERSION == "1.9.2" ? 'UTF-16LE' : 'UTF-16')
+      with_settings :repositories_encodings => enc do
         get :entry, :id => PRJ_ID,
             :path => repository_path_hash(['japanese', 'utf-16.txt'])[:param]
         assert_response :success