diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-17 05:56:35 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-17 05:56:35 +0000 |
| commit | 58ff66b18b676293108a625f161342a7a4755df9 (patch) | |
| tree | 5c9048e3d392cce71cf2133b2e5e77086e0b5741 /test | |
| parent | 9f67424dc97e2b99d98b71d08178681f0240ee86 (diff) | |
merge revision(s) 46391,46395: [Backport #9766]
* lib/csv.rb (CSV#<<): honor explicity given encoding. based on
the patch by DAISUKE TANIWAKI <daisuketaniwaki AT gmail.com> at
[ruby-core:62113]. [Bug #9766]
* lib/csv.rb (CSV#<<): honor explicitly given encoding. based on
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47608 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rwxr-xr-x | test/csv/test_encodings.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/test/csv/test_encodings.rb b/test/csv/test_encodings.rb index 85ed21a9d6..4e2c60545d 100755 --- a/test/csv/test_encodings.rb +++ b/test/csv/test_encodings.rb @@ -257,6 +257,14 @@ class TestCSV::Encodings < TestCSV assert_equal("UTF-8", data.to_csv.encoding.name) end + def test_explicit_encoding + bug9766 = '[ruby-core:62113] [Bug #9766]' + s = CSV.generate(encoding: "Windows-31J") do |csv| + csv << ["foo".force_encoding("ISO-8859-1"), "\u3042"] + end + assert_equal(["foo,\u3042\n".encode(Encoding::Windows_31J), Encoding::Windows_31J], [s, s.encoding], bug9766) + end + private def assert_parses(fields, encoding, options = { }) |