From 08d99ac9e35ddcd22885303306116cb10c6a992c Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 25 Dec 2010 09:04:33 +0000 Subject: * lib/csv.rb (CSV.foreach): 'rb' mode is defaulted in open. * lib/csv.rb (CSV#init_separators): cannonicalize encoding options as Encoding objects. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30360 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/csv/test_encodings.rb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'test') diff --git a/test/csv/test_encodings.rb b/test/csv/test_encodings.rb index 59f43b1be9..46e992977a 100755 --- a/test/csv/test_encodings.rb +++ b/test/csv/test_encodings.rb @@ -260,6 +260,23 @@ class TestCSV::Encodings < TestCSV end unless encoding == __ENCODING__ rescue Encoding::ConverterNotFoundError end + options[:encoding] = encoding.name + CSV.open(@temp_csv_path, options) do |csv| + csv.each_with_index do |row, i| + assert_equal(fields[i], row) + end + end + options.delete(:encoding) + options[:external_encoding] = encoding.name + options[:internal_encoding] = __ENCODING__.name + begin + CSV.open(@temp_csv_path, options) do |csv| + csv.each_with_index do |row, i| + assert_equal(orig_fields[i], row) + end + end unless encoding == __ENCODING__ + rescue Encoding::ConverterNotFoundError + end end def encode_ary(ary, encoding) -- cgit v1.2.3