From e0b4599bba6bea744e0e90b7640dcc21d695c434 Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Sun, 7 Apr 2019 16:55:34 -0700 Subject: Fix keyword argument separation warnings in test --- test/csv/parse/test_general.rb | 4 ++-- test/csv/test_encodings.rb | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'test/csv') diff --git a/test/csv/parse/test_general.rb b/test/csv/parse/test_general.rb index 49222c7159..f340921854 100644 --- a/test/csv/parse/test_general.rb +++ b/test/csv/parse/test_general.rb @@ -234,10 +234,10 @@ line,5,jkl end private - def assert_parse_errors_out(*args) + def assert_parse_errors_out(*args, **options) assert_raise(CSV::MalformedCSVError) do Timeout.timeout(0.2) do - CSV.parse(*args) + CSV.parse(*args, **options) fail("Parse didn't error out") end end diff --git a/test/csv/test_encodings.rb b/test/csv/test_encodings.rb index 64ea36a9a4..151ce7048c 100755 --- a/test/csv/test_encodings.rb +++ b/test/csv/test_encodings.rb @@ -273,19 +273,19 @@ class TestCSVEncodings < Test::Unit::TestCase orig_fields = fields fields = encode_ary(fields, encoding) data = ary_to_data(fields, options) - parsed = CSV.parse(data, options) + parsed = CSV.parse(data, **options) assert_equal(fields, parsed) parsed.flatten.each_with_index do |field, i| assert_equal(encoding, field.encoding, "Field[#{i + 1}] was transcoded.") end File.open(@temp_csv_path, "wb") {|f| f.print(data)} - CSV.open(@temp_csv_path, "rb:#{encoding}", options) do |csv| + CSV.open(@temp_csv_path, "rb:#{encoding}", **options) do |csv| csv.each_with_index do |row, i| assert_equal(fields[i], row) 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 @@ -293,7 +293,7 @@ class TestCSVEncodings < Test::Unit::TestCase rescue Encoding::ConverterNotFoundError end options[:encoding] = encoding.name - CSV.open(@temp_csv_path, options) do |csv| + CSV.open(@temp_csv_path, **options) do |csv| csv.each_with_index do |row, i| assert_equal(fields[i], row) end @@ -302,7 +302,7 @@ class TestCSVEncodings < Test::Unit::TestCase options[:external_encoding] = encoding.name options[:internal_encoding] = __ENCODING__.name begin - CSV.open(@temp_csv_path, options) do |csv| + CSV.open(@temp_csv_path, **options) do |csv| csv.each_with_index do |row, i| assert_equal(orig_fields[i], row) end -- cgit v1.2.3