From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sun, 18 Jan 2015 18:00:38 +0000 (+0000)
Subject: fix tests (#13120)
X-Git-Tag: 3.0.0~112
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=98683d009787cd42f257f28c559442ff8697f740;p=redmine.git

fix tests (#13120)

git-svn-id: http://svn.redmine.org/redmine/trunk@13910 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/test/functional/time_entry_reports_controller_test.rb b/test/functional/time_entry_reports_controller_test.rb
index 6faadd2df..33df12e1d 100644
--- a/test/functional/time_entry_reports_controller_test.rb
+++ b/test/functional/time_entry_reports_controller_test.rb
@@ -341,7 +341,7 @@ class TimeEntryReportsControllerTest < ActionController::TestCase
       assert_equal "#{user.firstname} #{user.lastname};7,30;7,30", lines[1]
       assert_equal "#{s2};7,30;7,30", lines[2]
 
-      str_fr = "Fran\xc3\xa7ais".force_encoding('UTF-8')
+      str_fr = "French (Fran\xc3\xa7ais)".force_encoding('UTF-8')
       assert_equal str_fr, l(:general_lang_name)
       assert_equal 'ISO-8859-1', l(:general_csv_encoding)
       assert_equal ';', l(:general_csv_separator)
diff --git a/test/unit/lib/redmine/i18n_test.rb b/test/unit/lib/redmine/i18n_test.rb
index 6f3d21cde..bf94e14af 100644
--- a/test/unit/lib/redmine/i18n_test.rb
+++ b/test/unit/lib/redmine/i18n_test.rb
@@ -258,7 +258,7 @@ class Redmine::I18nTest < ActiveSupport::TestCase
 
   def test_french_locale
     set_language_if_valid 'fr'
-    str_fr = "Fran\xc3\xa7ais".force_encoding('UTF-8')
+    str_fr = "French (Fran\xc3\xa7ais)".force_encoding('UTF-8')
     assert_equal str_fr, l(:general_lang_name)
   end
 end