]> source.dussan.org Git - redmine.git/commitdiff
use "UTF-16LE" instead of "UTF-16" on Ruby 1.9.2 due to test failure (#12787)
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Sun, 13 Jan 2013 01:50:14 +0000 (01:50 +0000)
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Sun, 13 Jan 2013 01:50:14 +0000 (01:50 +0000)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11181 e93f8b46-1217-0410-a6f0-8f06a7374b81

test/functional/repositories_filesystem_controller_test.rb

index 8330d64c9d10cfab9b14aed2f764fe757acd2d5f..ca49099590b838927908925b4222a852a4efbc66 100644 (file)
@@ -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