Update to ruby/spec@7f69c86

12 files changed, 81 insertions, 36 deletions

diff --git a/spec/ruby/core/string/append_spec.rb b/spec/ruby/core/string/append_spec.rb
index e001257621..8497ce8262 100644
--- a/spec/ruby/core/string/append_spec.rb
+++ b/spec/ruby/core/string/append_spec.rb
@@ -5,6 +5,7 @@ require_relative 'shared/concat'
 describe "String#<<" do
   it_behaves_like :string_concat, :<<
   it_behaves_like :string_concat_encoding, :<<
+  it_behaves_like :string_concat_type_coercion, :<<
 
   it "raises an ArgumentError when given the incorrect number of arguments" do
     -> { "hello".send(:<<) }.should raise_error(ArgumentError)
diff --git a/spec/ruby/core/string/concat_spec.rb b/spec/ruby/core/string/concat_spec.rb
index 5f6daadad7..6f487eaa3a 100644
--- a/spec/ruby/core/string/concat_spec.rb
+++ b/spec/ruby/core/string/concat_spec.rb
@@ -5,6 +5,7 @@ require_relative 'shared/concat'
 describe "String#concat" do
   it_behaves_like :string_concat, :concat
   it_behaves_like :string_concat_encoding, :concat
+  it_behaves_like :string_concat_type_coercion, :concat
 
   it "takes multiple arguments" do
     str = "hello "
diff --git a/spec/ruby/core/string/plus_spec.rb b/spec/ruby/core/string/plus_spec.rb
index 5ff198f07e..9da17451c6 100644
--- a/spec/ruby/core/string/plus_spec.rb
+++ b/spec/ruby/core/string/plus_spec.rb
@@ -3,6 +3,9 @@ require_relative 'fixtures/classes'
 require_relative 'shared/concat'
 
 describe "String#+" do
+  it_behaves_like :string_concat_encoding, :+
+  it_behaves_like :string_concat_type_coercion, :+
+
   it "returns a new string containing the given string concatenated to self" do
     ("" + "").should == ""
     ("" + "Hello").should == "Hello"
@@ -31,6 +34,4 @@ describe "String#+" do
     ("hello" + StringSpecs::MyString.new("foo")).should be_an_instance_of(String)
     ("hello" + StringSpecs::MyString.new("")).should be_an_instance_of(String)
   end
-
-  it_behaves_like :string_concat_encoding, :+
 end
diff --git a/spec/ruby/core/string/shared/concat.rb b/spec/ruby/core/string/shared/concat.rb
index 54ac1035d3..ee5ef2a98f 100644
--- a/spec/ruby/core/string/shared/concat.rb
+++ b/spec/ruby/core/string/shared/concat.rb
@@ -5,18 +5,6 @@ describe :string_concat, shared: true do
     str.should == "hello world"
   end
 
-  it "converts the given argument to a String using to_str" do
-    obj = mock('world!')
-    obj.should_receive(:to_str).and_return("world!")
-    a = 'hello '.send(@method, obj)
-    a.should == 'hello world!'
-  end
-
-  it "raises a TypeError if the given argument can't be converted to a String" do
-    -> { 'hello '.send(@method, [])        }.should raise_error(TypeError)
-    -> { 'hello '.send(@method, mock('x')) }.should raise_error(TypeError)
-  end
-
   it "raises a FrozenError when self is frozen" do
     a = "hello"
     a.freeze
@@ -148,3 +136,23 @@ describe :string_concat_encoding, shared: true do
     end
   end
 end
+
+describe :string_concat_type_coercion, shared: true do
+  it "converts the given argument to a String using to_str" do
+    obj = mock('world!')
+    obj.should_receive(:to_str).and_return("world!")
+    a = 'hello '.send(@method, obj)
+    a.should == 'hello world!'
+  end
+
+  it "raises a TypeError if the given argument can't be converted to a String" do
+    -> { 'hello '.send(@method, [])        }.should raise_error(TypeError)
+    -> { 'hello '.send(@method, mock('x')) }.should raise_error(TypeError)
+  end
+
+  it "raises a NoMethodError if the given argument raises a NoMethodError during type coercion to a String" do
+    obj = mock('world!')
+    obj.should_receive(:to_str).and_raise(NoMethodError)
+    -> { 'hello '.send(@method, obj) }.should raise_error(NoMethodError)
+  end
+end
diff --git a/spec/ruby/core/string/try_convert_spec.rb b/spec/ruby/core/string/try_convert_spec.rb
index 84415c4a75..72ce5dd8b2 100644
--- a/spec/ruby/core/string/try_convert_spec.rb
+++ b/spec/ruby/core/string/try_convert_spec.rb
@@ -39,7 +39,7 @@ describe "String.try_convert" do
   it "sends #to_str to the argument and raises TypeError if it's not a kind of String" do
     obj = mock("to_str")
     obj.should_receive(:to_str).and_return(Object.new)
-    -> { String.try_convert obj }.should raise_error(TypeError)
+    -> { String.try_convert obj }.should raise_error(TypeError, "can't convert MockObject to String (MockObject#to_str gives Object)")
   end
 
   it "does not rescue exceptions raised by #to_str" do
diff --git a/spec/ruby/core/string/unpack/b_spec.rb b/spec/ruby/core/string/unpack/b_spec.rb
index 2cf5ebad34..5c53eff721 100644
--- a/spec/ruby/core/string/unpack/b_spec.rb
+++ b/spec/ruby/core/string/unpack/b_spec.rb
@@ -88,7 +88,9 @@ describe "String#unpack with format 'B'" do
 
   ruby_version_is ""..."3.3" do
     it "ignores NULL bytes between directives" do
-      "\x80\x00".unpack("B\x00B").should == ["1", "0"]
+      suppress_warning do
+        "\x80\x00".unpack("B\x00B").should == ["1", "0"]
+      end
     end
   end
 
@@ -194,7 +196,9 @@ describe "String#unpack with format 'b'" do
 
   ruby_version_is ""..."3.3" do
     it "ignores NULL bytes between directives" do
-      "\x01\x00".unpack("b\x00b").should == ["1", "0"]
+      suppress_warning do
+        "\x01\x00".unpack("b\x00b").should == ["1", "0"]
+      end
     end
   end
 
diff --git a/spec/ruby/core/string/unpack/c_spec.rb b/spec/ruby/core/string/unpack/c_spec.rb
index dbcbacc74d..c2bf813954 100644
--- a/spec/ruby/core/string/unpack/c_spec.rb
+++ b/spec/ruby/core/string/unpack/c_spec.rb
@@ -37,7 +37,9 @@ describe :string_unpack_8bit, shared: true do
 
   ruby_version_is ""..."3.3" do
     it "ignores NULL bytes between directives" do
-      "abc".unpack(unpack_format("\000", 2)).should == [97, 98]
+      suppress_warning do
+        "abc".unpack(unpack_format("\000", 2)).should == [97, 98]
+      end
     end
   end
 
diff --git a/spec/ruby/core/string/unpack/h_spec.rb b/spec/ruby/core/string/unpack/h_spec.rb
index ee08d20926..19c4d63664 100644
--- a/spec/ruby/core/string/unpack/h_spec.rb
+++ b/spec/ruby/core/string/unpack/h_spec.rb
@@ -58,7 +58,9 @@ describe "String#unpack with format 'H'" do
 
   ruby_version_is ""..."3.3" do
     it "ignores NULL bytes between directives" do
-      "\x01\x10".unpack("H\x00H").should == ["0", "1"]
+      suppress_warning do
+        "\x01\x10".unpack("H\x00H").should == ["0", "1"]
+      end
     end
   end
 
@@ -133,7 +135,9 @@ describe "String#unpack with format 'h'" do
 
   ruby_version_is ""..."3.3" do
     it "ignores NULL bytes between directives" do
-      "\x01\x10".unpack("h\x00h").should == ["1", "0"]
+      suppress_warning do
+        "\x01\x10".unpack("h\x00h").should == ["1", "0"]
+      end
     end
   end
 
diff --git a/spec/ruby/core/string/unpack/shared/float.rb b/spec/ruby/core/string/unpack/shared/float.rb
index ccddf94f99..93282bf4c9 100644
--- a/spec/ruby/core/string/unpack/shared/float.rb
+++ b/spec/ruby/core/string/unpack/shared/float.rb
@@ -58,8 +58,10 @@ describe :string_unpack_float_le, shared: true do
 
   ruby_version_is ""..."3.3" do
     it "ignores NULL bytes between directives" do
-      array = "\x9a\x999@33\xb3?".unpack(unpack_format("\000", 2))
-      array.should == [2.9000000953674316, 1.399999976158142]
+      suppress_warning do
+        array = "\x9a\x999@33\xb3?".unpack(unpack_format("\000", 2))
+        array.should == [2.9000000953674316, 1.399999976158142]
+      end
     end
   end
 
@@ -135,8 +137,10 @@ describe :string_unpack_float_be, shared: true do
 
   ruby_version_is ""..."3.3" do
     it "ignores NULL bytes between directives" do
-      array = "@9\x99\x9a?\xb333".unpack(unpack_format("\000", 2))
-      array.should == [2.9000000953674316, 1.399999976158142]
+      suppress_warning do
+        array = "@9\x99\x9a?\xb333".unpack(unpack_format("\000", 2))
+        array.should == [2.9000000953674316, 1.399999976158142]
+      end
     end
   end
 
@@ -215,7 +219,9 @@ describe :string_unpack_double_le, shared: true do
 
   ruby_version_is ""..."3.3" do
     it "ignores NULL bytes between directives" do
-      "333333\x07@ffffff\xf6?".unpack(unpack_format("\000", 2)).should == [2.9, 1.4]
+      suppress_warning do
+        "333333\x07@ffffff\xf6?".unpack(unpack_format("\000", 2)).should == [2.9, 1.4]
+      end
     end
   end
 
@@ -293,7 +299,9 @@ describe :string_unpack_double_be, shared: true do
 
   ruby_version_is ""..."3.3" do
     it "ignores NULL bytes between directives" do
-      "@\x07333333?\xf6ffffff".unpack(unpack_format("\000", 2)).should == [2.9, 1.4]
+      suppress_warning do
+        "@\x07333333?\xf6ffffff".unpack(unpack_format("\000", 2)).should == [2.9, 1.4]
+      end
     end
   end
 
diff --git a/spec/ruby/core/string/unpack/shared/integer.rb b/spec/ruby/core/string/unpack/shared/integer.rb
index ba4f149dad..d71a2cf00d 100644
--- a/spec/ruby/core/string/unpack/shared/integer.rb
+++ b/spec/ruby/core/string/unpack/shared/integer.rb
@@ -34,7 +34,9 @@ describe :string_unpack_16bit_le, shared: true do
 
   ruby_version_is ""..."3.3" do
     it "ignores NULL bytes between directives" do
-      "abcd".unpack(unpack_format("\000", 2)).should == [25185, 25699]
+      suppress_warning do
+        "abcd".unpack(unpack_format("\000", 2)).should == [25185, 25699]
+      end
     end
   end
 
@@ -97,7 +99,9 @@ describe :string_unpack_16bit_be, shared: true do
 
   ruby_version_is ""..."3.3" do
     it "ignores NULL bytes between directives" do
-      "badc".unpack(unpack_format("\000", 2)).should == [25185, 25699]
+      suppress_warning do
+        "badc".unpack(unpack_format("\000", 2)).should == [25185, 25699]
+      end
     end
   end
 
@@ -161,7 +165,9 @@ describe :string_unpack_32bit_le, shared: true do
 
   ruby_version_is ""..."3.3" do
     it "ignores NULL bytes between directives" do
-      "abcdefgh".unpack(unpack_format("\000", 2)).should == [1684234849, 1751606885]
+      suppress_warning do
+        "abcdefgh".unpack(unpack_format("\000", 2)).should == [1684234849, 1751606885]
+      end
     end
   end
 
@@ -225,7 +231,9 @@ describe :string_unpack_32bit_be, shared: true do
 
   ruby_version_is ""..."3.3" do
     it "ignores NULL bytes between directives" do
-      "dcbahgfe".unpack(unpack_format("\000", 2)).should == [1684234849, 1751606885]
+      suppress_warning do
+        "dcbahgfe".unpack(unpack_format("\000", 2)).should == [1684234849, 1751606885]
+      end
     end
   end
 
@@ -285,8 +293,10 @@ describe :string_unpack_64bit_le, shared: true do
 
   ruby_version_is ""..."3.3" do
     it "ignores NULL bytes between directives" do
-      array = "abcdefghabghefcd".unpack(unpack_format("\000", 2))
-      array.should == [7523094288207667809, 7233738012216484449]
+      suppress_warning do
+        array = "abcdefghabghefcd".unpack(unpack_format("\000", 2))
+        array.should == [7523094288207667809, 7233738012216484449]
+      end
     end
   end
 
@@ -357,8 +367,10 @@ describe :string_unpack_64bit_be, shared: true do
 
   ruby_version_is ""..."3.3" do
     it "ignores NULL bytes between directives" do
-      array = "hgfedcbadcfehgba".unpack(unpack_format("\000", 2))
-      array.should == [7523094288207667809, 7233738012216484449]
+      suppress_warning do
+        array = "hgfedcbadcfehgba".unpack(unpack_format("\000", 2))
+        array.should == [7523094288207667809, 7233738012216484449]
+      end
     end
   end
 
diff --git a/spec/ruby/core/string/unpack/shared/unicode.rb b/spec/ruby/core/string/unpack/shared/unicode.rb
index ce1f29fe87..9fe07f53ae 100644
--- a/spec/ruby/core/string/unpack/shared/unicode.rb
+++ b/spec/ruby/core/string/unpack/shared/unicode.rb
@@ -52,7 +52,9 @@ describe :string_unpack_unicode, shared: true do
 
   ruby_version_is ""..."3.3" do
     it "ignores NULL bytes between directives" do
-      "\x01\x02".unpack("U\x00U").should == [1, 2]
+      suppress_warning do
+        "\x01\x02".unpack("U\x00U").should == [1, 2]
+      end
     end
   end
 
diff --git a/spec/ruby/core/string/unpack/w_spec.rb b/spec/ruby/core/string/unpack/w_spec.rb
index b213b32921..6a1cff1965 100644
--- a/spec/ruby/core/string/unpack/w_spec.rb
+++ b/spec/ruby/core/string/unpack/w_spec.rb
@@ -17,7 +17,9 @@ describe "String#unpack with directive 'w'" do
 
   ruby_version_is ""..."3.3" do
     it "ignores NULL bytes between directives" do
-      "\x01\x02\x03".unpack("w\x00w").should == [1, 2]
+      suppress_warning do
+        "\x01\x02\x03".unpack("w\x00w").should == [1, 2]
+      end
     end
   end