Import CSV 3.1.2 (#2547)

1 files changed, 9 insertions, 7 deletions

diff --git a/test/csv/test_encodings.rb b/test/csv/test_encodings.rb
index 151ce7048c..acee03db45 100755
--- a/test/csv/test_encodings.rb
+++ b/test/csv/test_encodings.rb
@@ -268,11 +268,11 @@ class TestCSVEncodings < Test::Unit::TestCase
 
   private
 
-  def assert_parses(fields, encoding, options = { })
+  def assert_parses(fields, encoding, **options)
     encoding = Encoding.find(encoding) unless encoding.is_a? Encoding
     orig_fields = fields
     fields = encode_ary(fields, encoding)
-    data = ary_to_data(fields, options)
+    data = ary_to_data(fields, **options)
     parsed = CSV.parse(data, **options)
     assert_equal(fields, parsed)
     parsed.flatten.each_with_index do |field, i|
@@ -285,7 +285,9 @@ class TestCSVEncodings < Test::Unit::TestCase
       end
     end
     begin
-      CSV.open(@temp_csv_path, "rb:#{encoding}:#{__ENCODING__}", **options) do |csv|
+      CSV.open(@temp_csv_path,
+               "rb:#{encoding}:#{__ENCODING__}",
+               **options) do |csv|
         csv.each_with_index do |row, i|
           assert_equal(orig_fields[i], row)
         end
@@ -315,7 +317,7 @@ class TestCSVEncodings < Test::Unit::TestCase
     ary.map { |row| row.map { |field| field.encode(encoding) } }
   end
 
-  def ary_to_data(ary, options = { })
+  def ary_to_data(ary, **options)
     encoding   = ary.flatten.first.encoding
     quote_char = (options[:quote_char] || '"').encode(encoding)
     col_sep    = (options[:col_sep]    || ",").encode(encoding)
@@ -327,9 +329,9 @@ class TestCSVEncodings < Test::Unit::TestCase
     }.join('').encode(encoding)
   end
 
-  def encode_for_tests(data, options = { })
-    yield ary_to_data(encode_ary(data, "UTF-8"),    options)
-    yield ary_to_data(encode_ary(data, "UTF-16BE"), options)
+  def encode_for_tests(data, **options)
+    yield ary_to_data(encode_ary(data, "UTF-8"),    **options)
+    yield ary_to_data(encode_ary(data, "UTF-16BE"), **options)
   end
 
   def each_encoding