From a2091c3023a6741049d20beffbe8c94c2d5f4732 Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Thu, 27 Jun 2019 21:21:33 +0200 Subject: [PATCH] Update to ruby/spec@94d98ff --- spec/ruby/core/array/pack/b_spec.rb | 4 ++-- spec/ruby/core/array/pack/h_spec.rb | 4 ++-- spec/ruby/core/array/pack/shared/numeric_basic.rb | 2 +- spec/ruby/core/array/pack/w_spec.rb | 2 +- spec/ruby/core/integer/chr_spec.rb | 4 ++-- spec/ruby/core/proc/shared/to_s.rb | 10 +++++----- spec/ruby/core/random/shared/bytes.rb | 2 +- spec/ruby/core/random/shared/urandom.rb | 2 +- spec/ruby/core/string/b_spec.rb | 2 +- spec/ruby/optional/capi/string_spec.rb | 4 ++-- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/spec/ruby/core/array/pack/b_spec.rb b/spec/ruby/core/array/pack/b_spec.rb index 759aec13d1..872c1b88d5 100644 --- a/spec/ruby/core/array/pack/b_spec.rb +++ b/spec/ruby/core/array/pack/b_spec.rb @@ -47,7 +47,7 @@ describe "Array#pack with format 'B'" do ].should be_computed_by(:pack, "B*") end - it "returns an BINARY string" do + it "returns a binary string" do ["1"].pack("B").encoding.should == Encoding::BINARY end @@ -98,7 +98,7 @@ describe "Array#pack with format 'b'" do ].should be_computed_by(:pack, "b*") end - it "returns an BINARY string" do + it "returns a binary string" do ["1"].pack("b").encoding.should == Encoding::BINARY end diff --git a/spec/ruby/core/array/pack/h_spec.rb b/spec/ruby/core/array/pack/h_spec.rb index 81fca7d989..85a875fc8b 100644 --- a/spec/ruby/core/array/pack/h_spec.rb +++ b/spec/ruby/core/array/pack/h_spec.rb @@ -97,7 +97,7 @@ describe "Array#pack with format 'H'" do ].should be_computed_by(:pack, "H") end - it "returns an BINARY string" do + it "returns a binary string" do ["41"].pack("H").encoding.should == Encoding::BINARY end end @@ -194,7 +194,7 @@ describe "Array#pack with format 'h'" do ].should be_computed_by(:pack, "h") end - it "returns an BINARY string" do + it "returns a binary string" do ["41"].pack("h").encoding.should == Encoding::BINARY end end diff --git a/spec/ruby/core/array/pack/shared/numeric_basic.rb b/spec/ruby/core/array/pack/shared/numeric_basic.rb index 632d259ab8..3ebdbc4c1a 100644 --- a/spec/ruby/core/array/pack/shared/numeric_basic.rb +++ b/spec/ruby/core/array/pack/shared/numeric_basic.rb @@ -15,7 +15,7 @@ describe :array_pack_numeric_basic, shared: true do lambda { [false].pack(pack_format) }.should raise_error(TypeError) end - it "returns an BINARY string" do + it "returns a binary string" do [0xFF].pack(pack_format).encoding.should == Encoding::BINARY [0xE3, 0x81, 0x82].pack(pack_format(3)).encoding.should == Encoding::BINARY end diff --git a/spec/ruby/core/array/pack/w_spec.rb b/spec/ruby/core/array/pack/w_spec.rb index ac37a0e1c0..889f42bdf7 100644 --- a/spec/ruby/core/array/pack/w_spec.rb +++ b/spec/ruby/core/array/pack/w_spec.rb @@ -36,7 +36,7 @@ describe "Array#pack with format 'w'" do lambda { [-1].pack("w") }.should raise_error(ArgumentError) end - it "returns an BINARY string" do + it "returns a binary string" do [1].pack('w').encoding.should == Encoding::BINARY end end diff --git a/spec/ruby/core/integer/chr_spec.rb b/spec/ruby/core/integer/chr_spec.rb index a519961d7c..02d0283182 100644 --- a/spec/ruby/core/integer/chr_spec.rb +++ b/spec/ruby/core/integer/chr_spec.rb @@ -30,7 +30,7 @@ describe "Integer#chr without argument" do end describe "and self is between 128 and 255 (inclusive)" do - it "returns an BINARY String" do + it "returns a binary String" do (128..255).each do |c| c.chr.encoding.should == Encoding::BINARY end @@ -81,7 +81,7 @@ describe "Integer#chr without argument" do end describe "and self is between 128 and 255 (inclusive)" do - it "returns an BINARY String" do + it "returns a binary String" do (128..255).each do |c| Encoding.default_internal = Encoding::UTF_8 c.chr.encoding.should == Encoding::BINARY diff --git a/spec/ruby/core/proc/shared/to_s.rb b/spec/ruby/core/proc/shared/to_s.rb index de021692e2..59fcf5bef0 100644 --- a/spec/ruby/core/proc/shared/to_s.rb +++ b/spec/ruby/core/proc/shared/to_s.rb @@ -4,7 +4,7 @@ describe :proc_to_s, shared: true do Proc.new { "hello" }.send(@method).should =~ /^#$/ end - it "has an BINARY encoding" do + it "has a binary encoding" do Proc.new { "hello" }.send(@method).encoding.should == Encoding::BINARY end end @@ -14,7 +14,7 @@ describe :proc_to_s, shared: true do lambda { "hello" }.send(@method).should =~ /^#$/ end - it "has an BINARY encoding" do + it "has a binary encoding" do lambda { "hello" }.send(@method).encoding.should == Encoding::BINARY end end @@ -24,7 +24,7 @@ describe :proc_to_s, shared: true do proc { "hello" }.send(@method).should =~ /^#$/ end - it "has an BINARY encoding" do + it "has a binary encoding" do proc { "hello" }.send(@method).encoding.should == Encoding::BINARY end end @@ -35,7 +35,7 @@ describe :proc_to_s, shared: true do method("hello").to_proc.send(@method).should =~ /^#$/ end - it "has an BINARY encoding" do + it "has a binary encoding" do def hello; end method("hello").to_proc.send(@method).encoding.should == Encoding::BINARY end @@ -47,7 +47,7 @@ describe :proc_to_s, shared: true do proc.send(@method).should =~ /^#$/ end - it "has an BINARY encoding" do + it "has a binary encoding" do proc = :foobar.to_proc proc.send(@method).encoding.should == Encoding::BINARY end diff --git a/spec/ruby/core/random/shared/bytes.rb b/spec/ruby/core/random/shared/bytes.rb index 54b6b0e4df..fe8cd8d683 100644 --- a/spec/ruby/core/random/shared/bytes.rb +++ b/spec/ruby/core/random/shared/bytes.rb @@ -7,7 +7,7 @@ describe :random_bytes, shared: true do @object.bytes(15).length.should == 15 end - it "returns an BINARY String" do + it "returns a binary String" do @object.bytes(15).encoding.should == Encoding::BINARY end diff --git a/spec/ruby/core/random/shared/urandom.rb b/spec/ruby/core/random/shared/urandom.rb index e5ffcffca6..316167b63f 100644 --- a/spec/ruby/core/random/shared/urandom.rb +++ b/spec/ruby/core/random/shared/urandom.rb @@ -13,7 +13,7 @@ describe :random_urandom, shared: true do }.should raise_error(ArgumentError) end - it "returns an BINARY String" do + it "returns a binary String" do Random.send(@method, 15).encoding.should == Encoding::BINARY end diff --git a/spec/ruby/core/string/b_spec.rb b/spec/ruby/core/string/b_spec.rb index 8555dd8dc7..b43cb5393a 100644 --- a/spec/ruby/core/string/b_spec.rb +++ b/spec/ruby/core/string/b_spec.rb @@ -2,7 +2,7 @@ require_relative '../../spec_helper' describe "String#b" do - it "returns an BINARY encoded string" do + it "returns a binary encoded string" do "Hello".b.should == "Hello".force_encoding(Encoding::BINARY) "こんちには".b.should == "こんちには".force_encoding(Encoding::BINARY) end diff --git a/spec/ruby/optional/capi/string_spec.rb b/spec/ruby/optional/capi/string_spec.rb index 2c8263d22a..432008e825 100644 --- a/spec/ruby/optional/capi/string_spec.rb +++ b/spec/ruby/optional/capi/string_spec.rb @@ -676,7 +676,7 @@ describe :rb_external_str_new, shared: true do @s.send(@method, "abc").encoding.should == Encoding::UTF_8 end - it "returns an BINARY encoded string if any non-ascii bytes are present and default external is US-ASCII" do + it "returns a binary encoded string if any non-ascii bytes are present and default external is US-ASCII" do Encoding.default_external = "US-ASCII" x80 = [0x80].pack('C') @s.send(@method, "#{x80}abc").encoding.should == Encoding::BINARY @@ -735,7 +735,7 @@ describe "C-API String function" do s.encoding.should == Encoding::UTF_8 end - it "returns an BINARY encoded String if any non-ascii bytes are present and the specified encoding is US-ASCII" do + it "returns a binary encoded String if any non-ascii bytes are present and the specified encoding is US-ASCII" do x80 = [0x80].pack('C') s = @s.rb_external_str_new_with_enc("#{x80}abc", 4, Encoding::US_ASCII) s.encoding.should == Encoding::BINARY