Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-07 13:55:52 +01:00
Code Issues Packages Projects Releases Activity

fix tests (#13120)

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@13910 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2015-01-18 18:00:38 +00:00
parent d1aba7984c
commit 98683d0097
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/functional/time_entry_reports_controller_test.rb
View File

@@ -341,7 +341,7 @@ class TimeEntryReportsControllerTest < ActionController::TestCase
assert_equal "#{user.firstname} #{user.lastname};7,30;7,30", lines[1] assert_equal "#{user.firstname} #{user.lastname};7,30;7,30", lines[1]
assert_equal "#{s2};7,30;7,30", lines[2] 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 str_fr, l(:general_lang_name)
assert_equal 'ISO-8859-1', l(:general_csv_encoding) assert_equal 'ISO-8859-1', l(:general_csv_encoding)
assert_equal ';', l(:general_csv_separator) assert_equal ';', l(:general_csv_separator)

2
test/unit/lib/redmine/i18n_test.rb
View File

@@ -258,7 +258,7 @@ class Redmine::I18nTest < ActiveSupport::TestCase
def test_french_locale def test_french_locale
set_language_if_valid 'fr' 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) assert_equal str_fr, l(:general_lang_name)
end end
end end