Update to ruby/spec@7f69c86

author: Benoit Daloze <[email protected]> 2023-04-25 17:04:25 +0200
committer: Benoit Daloze <[email protected]> 2023-04-25 17:09:53 +0200
commit: d562663e4098801c1d7fa7c64a335ea71231a598 (patch)
tree: 5b2ab2c9fbb86b4223263485fc5a3224562ae78d /spec/ruby/core/array
parent: d3da01cd110ca99dd0249ee9af92e12cf845998c (diff)
11 files changed, 96 insertions, 24 deletions
diff --git a/spec/ruby/core/array/fixtures/classes.rb b/spec/ruby/core/array/fixtures/classes.rb
index aa5fecd96b..8596245fb8 100644
--- a/spec/ruby/core/array/fixtures/classes.rb
+++ b/spec/ruby/core/array/fixtures/classes.rb
@@ -160,6 +160,16 @@ module ArraySpecs
     end
   end
 
+  class ArrayMethodMissing
+    def initialize(*values, &block)
+      @values = values;
+    end
+
+    def method_missing(name, *args)
+      @values
+    end
+  end
+
   class SortSame
     def <=>(other); 0; end
     def ==(other); true; end
diff --git a/spec/ruby/core/array/pack/c_spec.rb b/spec/ruby/core/array/pack/c_spec.rb
index be03551629..ac133ff9b6 100644
--- a/spec/ruby/core/array/pack/c_spec.rb
+++ b/spec/ruby/core/array/pack/c_spec.rb
@@ -47,7 +47,9 @@ describe :array_pack_8bit, shared: true do
 
   ruby_version_is ""..."3.3" do
     it "ignores NULL bytes between directives" do
-      [1, 2, 3].pack(pack_format("\000", 2)).should == "\x01\x02"
+      suppress_warning do
+        [1, 2, 3].pack(pack_format("\000", 2)).should == "\x01\x02"
+      end
     end
   end
 
diff --git a/spec/ruby/core/array/pack/shared/float.rb b/spec/ruby/core/array/pack/shared/float.rb
index 9510cffed7..1780d7635e 100644
--- a/spec/ruby/core/array/pack/shared/float.rb
+++ b/spec/ruby/core/array/pack/shared/float.rb
@@ -27,7 +27,9 @@ describe :array_pack_float_le, shared: true do
 
   ruby_version_is ""..."3.3" do
     it "ignores NULL bytes between directives" do
-      [5.3, 9.2].pack(pack_format("\000", 2)).should == "\x9a\x99\xa9@33\x13A"
+      suppress_warning do
+        [5.3, 9.2].pack(pack_format("\000", 2)).should == "\x9a\x99\xa9@33\x13A"
+      end
     end
   end
 
@@ -105,7 +107,9 @@ describe :array_pack_float_be, shared: true do
 
   ruby_version_is ""..."3.3" do
     it "ignores NULL bytes between directives" do
-      [5.3, 9.2].pack(pack_format("\000", 2)).should == "@\xa9\x99\x9aA\x1333"
+      suppress_warning do
+        [5.3, 9.2].pack(pack_format("\000", 2)).should == "@\xa9\x99\x9aA\x1333"
+      end
     end
   end
 
@@ -175,7 +179,9 @@ describe :array_pack_double_le, shared: true do
 
   ruby_version_is ""..."3.3" do
     it "ignores NULL bytes between directives" do
-      [5.3, 9.2].pack(pack_format("\000", 2)).should == "333333\x15@ffffff\x22@"
+      suppress_warning do
+        [5.3, 9.2].pack(pack_format("\000", 2)).should == "333333\x15@ffffff\x22@"
+      end
     end
   end
 
@@ -244,7 +250,9 @@ describe :array_pack_double_be, shared: true do
 
   ruby_version_is ""..."3.3" do
     it "ignores NULL bytes between directives" do
-      [5.3, 9.2].pack(pack_format("\000", 2)).should == "@\x15333333@\x22ffffff"
+      suppress_warning do
+        [5.3, 9.2].pack(pack_format("\000", 2)).should == "@\x15333333@\x22ffffff"
+      end
     end
   end
 
diff --git a/spec/ruby/core/array/pack/shared/integer.rb b/spec/ruby/core/array/pack/shared/integer.rb
index d3ce9b5792..fd21b25b19 100644
--- a/spec/ruby/core/array/pack/shared/integer.rb
+++ b/spec/ruby/core/array/pack/shared/integer.rb
@@ -43,8 +43,10 @@ describe :array_pack_16bit_le, shared: true do
 
   ruby_version_is ""..."3.3" do
     it "ignores NULL bytes between directives" do
-      str = [0x1243_6578, 0xdef0_abcd].pack(pack_format("\000", 2))
-      str.should == "\x78\x65\xcd\xab"
+      suppress_warning do
+        str = [0x1243_6578, 0xdef0_abcd].pack(pack_format("\000", 2))
+        str.should == "\x78\x65\xcd\xab"
+      end
     end
   end
 
@@ -105,8 +107,10 @@ describe :array_pack_16bit_be, shared: true do
 
   ruby_version_is ""..."3.3" do
     it "ignores NULL bytes between directives" do
-      str = [0x1243_6578, 0xdef0_abcd].pack(pack_format("\000", 2))
-      str.should == "\x65\x78\xab\xcd"
+      suppress_warning do
+        str = [0x1243_6578, 0xdef0_abcd].pack(pack_format("\000", 2))
+        str.should == "\x65\x78\xab\xcd"
+      end
     end
   end
 
@@ -167,8 +171,10 @@ describe :array_pack_32bit_le, shared: true do
 
   ruby_version_is ""..."3.3" do
     it "ignores NULL bytes between directives" do
-      str = [0x1243_6578, 0xdef0_abcd].pack(pack_format("\000", 2))
-      str.should == "\x78\x65\x43\x12\xcd\xab\xf0\xde"
+      suppress_warning do
+        str = [0x1243_6578, 0xdef0_abcd].pack(pack_format("\000", 2))
+        str.should == "\x78\x65\x43\x12\xcd\xab\xf0\xde"
+      end
     end
   end
 
@@ -229,8 +235,10 @@ describe :array_pack_32bit_be, shared: true do
 
   ruby_version_is ""..."3.3" do
     it "ignores NULL bytes between directives" do
-      str = [0x1243_6578, 0xdef0_abcd].pack(pack_format("\000", 2))
-      str.should == "\x12\x43\x65\x78\xde\xf0\xab\xcd"
+      suppress_warning do
+        str = [0x1243_6578, 0xdef0_abcd].pack(pack_format("\000", 2))
+        str.should == "\x12\x43\x65\x78\xde\xf0\xab\xcd"
+      end
     end
   end
 
@@ -351,8 +359,10 @@ describe :array_pack_64bit_le, shared: true do
 
   ruby_version_is ""..."3.3" do
     it "ignores NULL bytes between directives" do
-      str = [0xdef0_abcd_3412_7856, 0x7865_4321_dcba_def0].pack(pack_format("\000", 2))
-      str.should == "\x56\x78\x12\x34\xcd\xab\xf0\xde\xf0\xde\xba\xdc\x21\x43\x65\x78"
+      suppress_warning do
+        str = [0xdef0_abcd_3412_7856, 0x7865_4321_dcba_def0].pack(pack_format("\000", 2))
+        str.should == "\x56\x78\x12\x34\xcd\xab\xf0\xde\xf0\xde\xba\xdc\x21\x43\x65\x78"
+      end
     end
   end
 
@@ -421,8 +431,10 @@ describe :array_pack_64bit_be, shared: true do
 
   ruby_version_is ""..."3.3" do
     it "ignores NULL bytes between directives" do
-      str = [0xdef0_abcd_3412_7856, 0x7865_4321_dcba_def0].pack(pack_format("\000", 2))
-      str.should == "\xde\xf0\xab\xcd\x34\x12\x78\x56\x78\x65\x43\x21\xdc\xba\xde\xf0"
+      suppress_warning do
+        str = [0xdef0_abcd_3412_7856, 0x7865_4321_dcba_def0].pack(pack_format("\000", 2))
+        str.should == "\xde\xf0\xab\xcd\x34\x12\x78\x56\x78\x65\x43\x21\xdc\xba\xde\xf0"
+      end
     end
   end
 
diff --git a/spec/ruby/core/array/pack/shared/unicode.rb b/spec/ruby/core/array/pack/shared/unicode.rb
index 130c447bb7..4d8eaef323 100644
--- a/spec/ruby/core/array/pack/shared/unicode.rb
+++ b/spec/ruby/core/array/pack/shared/unicode.rb
@@ -69,7 +69,9 @@ describe :array_pack_unicode, shared: true do
 
   ruby_version_is ""..."3.3" do
     it "ignores NULL bytes between directives" do
-      [1, 2, 3].pack("U\x00U").should == "\x01\x02"
+      suppress_warning do
+        [1, 2, 3].pack("U\x00U").should == "\x01\x02"
+      end
     end
   end
 
diff --git a/spec/ruby/core/array/pack/w_spec.rb b/spec/ruby/core/array/pack/w_spec.rb
index e241d1519c..48ed4496a5 100644
--- a/spec/ruby/core/array/pack/w_spec.rb
+++ b/spec/ruby/core/array/pack/w_spec.rb
@@ -26,7 +26,9 @@ describe "Array#pack with format 'w'" do
 
   ruby_version_is ""..."3.3" do
     it "ignores NULL bytes between directives" do
-      [1, 2, 3].pack("w\x00w").should == "\x01\x02"
+      suppress_warning do
+        [1, 2, 3].pack("w\x00w").should == "\x01\x02"
+      end
     end
   end
 
diff --git a/spec/ruby/core/array/plus_spec.rb b/spec/ruby/core/array/plus_spec.rb
index 3962b05c39..635bd131c9 100644
--- a/spec/ruby/core/array/plus_spec.rb
+++ b/spec/ruby/core/array/plus_spec.rb
@@ -14,10 +14,23 @@ describe "Array#+" do
     (ary + ary).should == [1, 2, 3, 1, 2, 3]
   end
 
-  it "tries to convert the passed argument to an Array using #to_ary" do
-    obj = mock('["x", "y"]')
-    obj.should_receive(:to_ary).and_return(["x", "y"])
-    ([1, 2, 3] + obj).should == [1, 2, 3, "x", "y"]
+  describe "converts the passed argument to an Array using #to_ary" do
+    it "successfully concatenates the resulting array from the #to_ary call" do
+      obj = mock('["x", "y"]')
+      obj.should_receive(:to_ary).and_return(["x", "y"])
+      ([1, 2, 3] + obj).should == [1, 2, 3, "x", "y"]
+    end
+
+    it "raises a Typeerror if the given argument can't be converted to an array" do
+      -> { [1, 2, 3] + nil }.should raise_error(TypeError)
+      -> { [1, 2, 3] + "abc" }.should raise_error(TypeError)
+    end
+
+    it "raises a NoMethodError if the given argument raises a NoMethodError during type coercion to an Array" do
+      obj = mock("hello")
+      obj.should_receive(:to_ary).and_raise(NoMethodError)
+      -> { [1, 2, 3] + obj }.should raise_error(NoMethodError)
+    end
   end
 
   it "properly handles recursive arrays" do
diff --git a/spec/ruby/core/array/product_spec.rb b/spec/ruby/core/array/product_spec.rb
index 07d2880a96..6fb3818508 100644
--- a/spec/ruby/core/array/product_spec.rb
+++ b/spec/ruby/core/array/product_spec.rb
@@ -9,6 +9,11 @@ describe "Array#product" do
     ar.called.should == :to_ary
   end
 
+  it "returns converted arguments using :method_missing" do
+    ar = ArraySpecs::ArrayMethodMissing.new(2,3)
+    [1].product(ar).should == [[1,2],[1,3]]
+  end
+
   it "returns the expected result" do
     [1,2].product([3,4,5],[6,8]).should == [[1, 3, 6], [1, 3, 8], [1, 4, 6], [1, 4, 8], [1, 5, 6], [1, 5, 8],
                                             [2, 3, 6], [2, 3, 8], [2, 4, 6], [2, 4, 8], [2, 5, 6], [2, 5, 8]]
diff --git a/spec/ruby/core/array/sample_spec.rb b/spec/ruby/core/array/sample_spec.rb
index 5b3aac9aed..6ef78594f0 100644
--- a/spec/ruby/core/array/sample_spec.rb
+++ b/spec/ruby/core/array/sample_spec.rb
@@ -29,6 +29,10 @@ describe "Array#sample" do
     [4].sample(random: Random.new(42)).should equal(4)
   end
 
+  it "returns a single value when not passed a count and a Random class is given" do
+    [4].sample(random: Random).should equal(4)
+  end
+
   it "returns an empty Array when passed zero" do
     [4].sample(0).should == []
   end
diff --git a/spec/ruby/core/array/shuffle_spec.rb b/spec/ruby/core/array/shuffle_spec.rb
index b255147c75..1d528c124f 100644
--- a/spec/ruby/core/array/shuffle_spec.rb
+++ b/spec/ruby/core/array/shuffle_spec.rb
@@ -47,6 +47,10 @@ describe "Array#shuffle" do
     [1, 2].shuffle(random: random).should be_an_instance_of(Array)
   end
 
+  it "accepts a Random class for the value for random: argument" do
+    [1, 2].shuffle(random: Random).should be_an_instance_of(Array)
+  end
+
   it "calls #to_int on the Object returned by #rand" do
     value = mock("array_shuffle_random_value")
     value.should_receive(:to_int).at_least(1).times.and_return(0)
@@ -93,4 +97,14 @@ describe "Array#shuffle!" do
     -> { ArraySpecs.frozen_array.shuffle! }.should raise_error(FrozenError)
     -> { ArraySpecs.empty_frozen_array.shuffle! }.should raise_error(FrozenError)
   end
+
+  it "matches CRuby with random:" do
+    %w[a b c].shuffle(random: Random.new(1)).should == %w[a c b]
+    (0..10).to_a.shuffle(random: Random.new(10)).should == [2, 6, 8, 5, 7, 10, 3, 1, 0, 4, 9]
+  end
+
+  it "matches CRuby with srand" do
+    srand(123)
+    %w[a b c d e f g h i j k].shuffle.should == %w[a e f h i j d b g k c]
+  end
 end
diff --git a/spec/ruby/core/array/try_convert_spec.rb b/spec/ruby/core/array/try_convert_spec.rb
index 47b4722d80..bea8815006 100644
--- a/spec/ruby/core/array/try_convert_spec.rb
+++ b/spec/ruby/core/array/try_convert_spec.rb
@@ -39,7 +39,7 @@ describe "Array.try_convert" do
   it "sends #to_ary to the argument and raises TypeError if it's not a kind of Array" do
     obj = mock("to_ary")
     obj.should_receive(:to_ary).and_return(Object.new)
-    -> { Array.try_convert obj }.should raise_error(TypeError)
+    -> { Array.try_convert obj }.should raise_error(TypeError, "can't convert MockObject to Array (MockObject#to_ary gives Object)")
   end
 
   it "does not rescue exceptions raised by #to_ary" do
author	Benoit Daloze <[email protected]>	2023-04-25 17:04:25 +0200
committer	Benoit Daloze <[email protected]>	2023-04-25 17:09:53 +0200
commit	d562663e4098801c1d7fa7c64a335ea71231a598 (patch)
tree	5b2ab2c9fbb86b4223263485fc5a3224562ae78d /spec/ruby/core/array
parent	d3da01cd110ca99dd0249ee9af92e12cf845998c (diff)