From 1c938a72aa9378f982dbc55327e86150c47b8707 Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Sun, 29 Sep 2019 16:03:58 +0200 Subject: Update to ruby/spec@519df35 --- spec/ruby/core/encoding/converter/convpath_spec.rb | 4 ++-- spec/ruby/core/encoding/converter/new_spec.rb | 2 +- spec/ruby/core/encoding/converter/primitive_convert_spec.rb | 2 +- spec/ruby/core/encoding/converter/search_convpath_spec.rb | 6 ++---- 4 files changed, 6 insertions(+), 8 deletions(-) (limited to 'spec/ruby/core/encoding') diff --git a/spec/ruby/core/encoding/converter/convpath_spec.rb b/spec/ruby/core/encoding/converter/convpath_spec.rb index 473f2db91e..23f1e5dc33 100644 --- a/spec/ruby/core/encoding/converter/convpath_spec.rb +++ b/spec/ruby/core/encoding/converter/convpath_spec.rb @@ -15,10 +15,10 @@ describe "Encoding::Converter#convpath" do end it "indicates if crlf_newline conversion would occur" do - ec = Encoding::Converter.new("ISo-8859-1", "EUC-JP", {crlf_newline: true}) + ec = Encoding::Converter.new("ISo-8859-1", "EUC-JP", crlf_newline: true) ec.convpath.last.should == "crlf_newline" - ec = Encoding::Converter.new("ASCII", "UTF-8", {crlf_newline: false}) + ec = Encoding::Converter.new("ASCII", "UTF-8", crlf_newline: false) ec.convpath.last.should_not == "crlf_newline" end end diff --git a/spec/ruby/core/encoding/converter/new_spec.rb b/spec/ruby/core/encoding/converter/new_spec.rb index 6a6343012c..9fc97263fe 100644 --- a/spec/ruby/core/encoding/converter/new_spec.rb +++ b/spec/ruby/core/encoding/converter/new_spec.rb @@ -50,7 +50,7 @@ describe "Encoding::Converter.new" do it "calls #to_hash to convert the options argument to a Hash if not a Fixnum" do opts = mock("encoding converter options") opts.should_receive(:to_hash).and_return({ replace: "fubar" }) - conv = Encoding::Converter.new("us-ascii", "utf-8", opts) + conv = Encoding::Converter.new("us-ascii", "utf-8", **opts) conv.replacement.should == "fubar" end diff --git a/spec/ruby/core/encoding/converter/primitive_convert_spec.rb b/spec/ruby/core/encoding/converter/primitive_convert_spec.rb index 4a22606375..802d8e7cb1 100644 --- a/spec/ruby/core/encoding/converter/primitive_convert_spec.rb +++ b/spec/ruby/core/encoding/converter/primitive_convert_spec.rb @@ -85,7 +85,7 @@ describe "Encoding::Converter#primitive_convert" do end it "accepts an options hash" do - @ec.primitive_convert("","",nil,nil, {after_output: true}).should == :finished + @ec.primitive_convert("","",nil,nil, after_output: true).should == :finished end it "sets the destination buffer's encoding to the destination encoding if the conversion succeeded" do diff --git a/spec/ruby/core/encoding/converter/search_convpath_spec.rb b/spec/ruby/core/encoding/converter/search_convpath_spec.rb index 0535e7bdc3..0882af5539 100644 --- a/spec/ruby/core/encoding/converter/search_convpath_spec.rb +++ b/spec/ruby/core/encoding/converter/search_convpath_spec.rb @@ -15,12 +15,10 @@ describe "Encoding::Converter.search_convpath" do end it "indicates if crlf_newline conversion would occur" do - cp = Encoding::Converter.search_convpath( - "ISO-8859-1", "EUC-JP", {crlf_newline: true}) + cp = Encoding::Converter.search_convpath("ISO-8859-1", "EUC-JP", crlf_newline: true) cp.last.should == "crlf_newline" - cp = Encoding::Converter.search_convpath( - "ASCII", "UTF-8", {crlf_newline: false}) + cp = Encoding::Converter.search_convpath("ASCII", "UTF-8", crlf_newline: false) cp.last.should_not == "crlf_newline" end -- cgit v1.2.3