Update to ruby/spec@83e26c9

1 files changed, 156 insertions, 160 deletions

diff --git a/spec/ruby/core/string/bytesplice_spec.rb b/spec/ruby/core/string/bytesplice_spec.rb
index 2c770e340a..cfd9e3ea9a 100644
--- a/spec/ruby/core/string/bytesplice_spec.rb
+++ b/spec/ruby/core/string/bytesplice_spec.rb
@@ -57,77 +57,75 @@ describe "String#bytesplice" do
     -> { s.bytesplice(2, 1, "xxx") }.should raise_error(FrozenError, "can't modify frozen String: \"hello\"")
   end
 
-  ruby_version_is "3.3" do
-    it "raises IndexError when str_index is less than -bytesize" do
-      -> { "hello".bytesplice(2, 1, "HELLO", -6, 0) }.should raise_error(IndexError, "index -6 out of string")
-    end
-
-    it "raises IndexError when str_index is greater than bytesize" do
-      -> { "hello".bytesplice(2, 1, "HELLO", 6, 0) }.should raise_error(IndexError, "index 6 out of string")
-    end
-
-    it "raises IndexError for negative str length" do
-      -> { "abc".bytesplice(0, 1, "", 0, -2) }.should raise_error(IndexError, "negative length -2")
-    end
-
-    it "replaces with integer str indices" do
-      "hello".bytesplice(1, 2, "HELLO", -5, 0).should == "hlo"
-      "hello".bytesplice(1, 2, "HELLO", 0, 0).should == "hlo"
-      "hello".bytesplice(1, 2, "HELLO", 0, 1).should == "hHlo"
-      "hello".bytesplice(1, 2, "HELLO", 0, 5).should == "hHELLOlo"
-      "hello".bytesplice(1, 2, "HELLO", 0, 6).should == "hHELLOlo"
-    end
-
-    it "raises RangeError when str range left boundary is less than -bytesize" do
-      -> { "hello".bytesplice(0..1, "HELLO", -6...-6) }.should raise_error(RangeError, "-6...-6 out of range")
-    end
-
-    it "replaces with str ranges" do
-      "hello".bytesplice(1..2, "HELLO", -5...-5).should == "hlo"
-      "hello".bytesplice(1..2, "HELLO", 0...0).should == "hlo"
-      "hello".bytesplice(1..2, "HELLO", 0..0).should == "hHlo"
-      "hello".bytesplice(1..2, "HELLO", 0...1).should == "hHlo"
-      "hello".bytesplice(1..2, "HELLO", 0..1).should == "hHElo"
-      "hello".bytesplice(1..2, "HELLO", 0..-1).should == "hHELLOlo"
-      "hello".bytesplice(1..2, "HELLO", 0...5).should == "hHELLOlo"
-      "hello".bytesplice(1..2, "HELLO", 0...6).should == "hHELLOlo"
-    end
-
-    it "raises ArgumentError when integer str index is provided without str length argument" do
-      -> { "hello".bytesplice(0, 1, "xxx", 0) }.should raise_error(ArgumentError, "wrong number of arguments (given 4, expected 2, 3, or 5)")
-    end
-
-    it "replaces on an empty string with str index/length" do
-      "".bytesplice(0, 0, "", 0, 0).should == ""
-      "".bytesplice(0, 0, "xxx", 0, 1).should == "x"
-    end
-
-    it "mutates self with substring and str index/length" do
-      s = "hello"
-      s.bytesplice(2, 1, "xxx", 1, 2).should.equal?(s)
-      s.should.eql?("hexxlo")
-    end
-
-    it "raises when string is frozen and str index/length" do
-      s = "hello".freeze
-      -> { s.bytesplice(2, 1, "xxx", 0, 1) }.should raise_error(FrozenError, "can't modify frozen String: \"hello\"")
-    end
-
-    it "replaces on an empty string with str range" do
-      "".bytesplice(0..0, "", 0..0).should == ""
-      "".bytesplice(0..0, "xyz", 0..1).should == "xy"
-    end
-
-    it "mutates self with substring and str range" do
-      s = "hello"
-      s.bytesplice(2..2, "xyz", 1..2).should.equal?(s)
-      s.should.eql?("heyzlo")
-    end
-
-    it "raises when string is frozen and str range" do
-      s = "hello".freeze
-      -> { s.bytesplice(2..2, "yzx", 0..1) }.should raise_error(FrozenError, "can't modify frozen String: \"hello\"")
-    end
+  it "raises IndexError when str_index is less than -bytesize" do
+    -> { "hello".bytesplice(2, 1, "HELLO", -6, 0) }.should raise_error(IndexError, "index -6 out of string")
+  end
+
+  it "raises IndexError when str_index is greater than bytesize" do
+    -> { "hello".bytesplice(2, 1, "HELLO", 6, 0) }.should raise_error(IndexError, "index 6 out of string")
+  end
+
+  it "raises IndexError for negative str length" do
+    -> { "abc".bytesplice(0, 1, "", 0, -2) }.should raise_error(IndexError, "negative length -2")
+  end
+
+  it "replaces with integer str indices" do
+    "hello".bytesplice(1, 2, "HELLO", -5, 0).should == "hlo"
+    "hello".bytesplice(1, 2, "HELLO", 0, 0).should == "hlo"
+    "hello".bytesplice(1, 2, "HELLO", 0, 1).should == "hHlo"
+    "hello".bytesplice(1, 2, "HELLO", 0, 5).should == "hHELLOlo"
+    "hello".bytesplice(1, 2, "HELLO", 0, 6).should == "hHELLOlo"
+  end
+
+  it "raises RangeError when str range left boundary is less than -bytesize" do
+    -> { "hello".bytesplice(0..1, "HELLO", -6...-6) }.should raise_error(RangeError, "-6...-6 out of range")
+  end
+
+  it "replaces with str ranges" do
+    "hello".bytesplice(1..2, "HELLO", -5...-5).should == "hlo"
+    "hello".bytesplice(1..2, "HELLO", 0...0).should == "hlo"
+    "hello".bytesplice(1..2, "HELLO", 0..0).should == "hHlo"
+    "hello".bytesplice(1..2, "HELLO", 0...1).should == "hHlo"
+    "hello".bytesplice(1..2, "HELLO", 0..1).should == "hHElo"
+    "hello".bytesplice(1..2, "HELLO", 0..-1).should == "hHELLOlo"
+    "hello".bytesplice(1..2, "HELLO", 0...5).should == "hHELLOlo"
+    "hello".bytesplice(1..2, "HELLO", 0...6).should == "hHELLOlo"
+  end
+
+  it "raises ArgumentError when integer str index is provided without str length argument" do
+    -> { "hello".bytesplice(0, 1, "xxx", 0) }.should raise_error(ArgumentError, "wrong number of arguments (given 4, expected 2, 3, or 5)")
+  end
+
+  it "replaces on an empty string with str index/length" do
+    "".bytesplice(0, 0, "", 0, 0).should == ""
+    "".bytesplice(0, 0, "xxx", 0, 1).should == "x"
+  end
+
+  it "mutates self with substring and str index/length" do
+    s = "hello"
+    s.bytesplice(2, 1, "xxx", 1, 2).should.equal?(s)
+    s.should.eql?("hexxlo")
+  end
+
+  it "raises when string is frozen and str index/length" do
+    s = "hello".freeze
+    -> { s.bytesplice(2, 1, "xxx", 0, 1) }.should raise_error(FrozenError, "can't modify frozen String: \"hello\"")
+  end
+
+  it "replaces on an empty string with str range" do
+    "".bytesplice(0..0, "", 0..0).should == ""
+    "".bytesplice(0..0, "xyz", 0..1).should == "xy"
+  end
+
+  it "mutates self with substring and str range" do
+    s = "hello"
+    s.bytesplice(2..2, "xyz", 1..2).should.equal?(s)
+    s.should.eql?("heyzlo")
+  end
+
+  it "raises when string is frozen and str range" do
+    s = "hello".freeze
+    -> { s.bytesplice(2..2, "yzx", 0..1) }.should raise_error(FrozenError, "can't modify frozen String: \"hello\"")
   end
 end
 
@@ -201,94 +199,92 @@ describe "String#bytesplice with multibyte characters" do
     result.encoding.should == Encoding::UTF_8
   end
 
-  ruby_version_is "3.3" do
-    it "raises IndexError when str_index is out of byte size boundary" do
-      -> { "こんにちは".bytesplice(3, 3, "こんにちは", -16, 0) }.should raise_error(IndexError, "index -16 out of string")
-    end
-
-    it "raises IndexError when str_index is not on a codepoint boundary" do
-      -> { "こんにちは".bytesplice(3, 3, "こんにちは", 1, 0) }.should raise_error(IndexError, "offset 1 does not land on character boundary")
-    end
-
-    it "raises IndexError when str_length is not matching the codepoint boundary" do
-      -> { "こんにちは".bytesplice(3, 3, "こんにちは", 0, 1) }.should raise_error(IndexError, "offset 1 does not land on character boundary")
-      -> { "こんにちは".bytesplice(3, 3, "こんにちは", 0, 2) }.should raise_error(IndexError, "offset 2 does not land on character boundary")
-    end
-
-    it "replaces with integer str indices" do
-      "こんにちは".bytesplice(3, 3, "こんにちは", -15, 0).should == "こにちは"
-      "こんにちは".bytesplice(3, 3, "こんにちは", 0, 0).should == "こにちは"
-      "こんにちは".bytesplice(3, 3, "こんにちは", 0, 3).should == "ここにちは"
-      "こんにちは".bytesplice(3, 3, "はは", 3, 3).should == "こはにちは"
-      "こんにちは".bytesplice(3, 3, "こんにちは", 15, 0).should == "こにちは"
-    end
-
-    it "replaces with str range" do
-      "こんにちは".bytesplice(0..2, "こんにちは", -15...-16).should == "んにちは"
-      "こんにちは".bytesplice(0..2, "こんにちは", 0...0).should == "んにちは"
-      "こんにちは".bytesplice(0..2, "こんにちは", 3..5).should == "んんにちは"
-      "こんにちは".bytesplice(0..2, "こんにちは", 3...6).should == "んんにちは"
-      "こんにちは".bytesplice(0..2, "こんにちは", 3..8).should == "んにんにちは"
-      "こんにちは".bytesplice(0..2, "こんにちは", 0..-1).should == "こんにちはんにちは"
-      "こんにちは".bytesplice(0..2, "こんにちは", 0...15).should == "こんにちはんにちは"
-      "こんにちは".bytesplice(0..2, "こんにちは", 0...18).should == "こんにちはんにちは"
-    end
-
-    it "treats negative length for str range as 0" do
-      "こんにちは".bytesplice(0..2, "こんにちは", 0...-100).should == "んにちは"
-      "こんにちは".bytesplice(0..2, "こんにちは", 3...-100).should == "んにちは"
-      "こんにちは".bytesplice(0..2, "こんにちは", -15...-100).should == "んにちは"
-    end
-
-    it "raises when ranges not match codepoint boundaries in str" do
-      -> { "こんにちは".bytesplice(3...3, "こ", 0..0) }.should raise_error(IndexError, "offset 1 does not land on character boundary")
-      -> { "こんにちは".bytesplice(3...3, "こ", 0..1) }.should raise_error(IndexError, "offset 2 does not land on character boundary")
-      # Begin is incorrect
-      -> { "こんにちは".bytesplice(3...3, "こんにちは", -4..-1) }.should raise_error(IndexError, "offset 11 does not land on character boundary")
-      -> { "こんにちは".bytesplice(3...3, "こんにちは", -5..-1) }.should raise_error(IndexError, "offset 10 does not land on character boundary")
-      # End is incorrect
-      -> { "こんにちは".bytesplice(3...3, "こんにちは", -3..-2) }.should raise_error(IndexError, "offset 14 does not land on character boundary")
-      -> { "こんにちは".bytesplice(3...3, "こんにちは", -3..-3) }.should raise_error(IndexError, "offset 13 does not land on character boundary")
-    end
-
-    it "deals with a different encoded argument with str index/length" do
-      s = "こんにちは"
-      s.encoding.should == Encoding::UTF_8
-      sub = "goodbye"
-      sub.force_encoding(Encoding::US_ASCII)
-
-      result = s.bytesplice(3, 3, sub, 0, 3)
-      result.should == "こgooにちは"
-      result.encoding.should == Encoding::UTF_8
-
-      s = "hello"
-      s.force_encoding(Encoding::US_ASCII)
-      sub = "こんにちは"
-      sub.encoding.should == Encoding::UTF_8
-
-      result = s.bytesplice(1, 2, sub, 3, 3)
-      result.should == "hんlo"
-      result.encoding.should == Encoding::UTF_8
-    end
-
-    it "deals with a different encoded argument with str range" do
-      s = "こんにちは"
-      s.encoding.should == Encoding::UTF_8
-      sub = "goodbye"
-      sub.force_encoding(Encoding::US_ASCII)
-
-      result = s.bytesplice(3..5, sub, 0..2)
-      result.should == "こgooにちは"
-      result.encoding.should == Encoding::UTF_8
-
-      s = "hello"
-      s.force_encoding(Encoding::US_ASCII)
-      sub = "こんにちは"
-      sub.encoding.should == Encoding::UTF_8
-
-      result = s.bytesplice(1..2, sub, 3..5)
-      result.should == "hんlo"
-      result.encoding.should == Encoding::UTF_8
-    end
+  it "raises IndexError when str_index is out of byte size boundary" do
+    -> { "こんにちは".bytesplice(3, 3, "こんにちは", -16, 0) }.should raise_error(IndexError, "index -16 out of string")
+  end
+
+  it "raises IndexError when str_index is not on a codepoint boundary" do
+    -> { "こんにちは".bytesplice(3, 3, "こんにちは", 1, 0) }.should raise_error(IndexError, "offset 1 does not land on character boundary")
+  end
+
+  it "raises IndexError when str_length is not matching the codepoint boundary" do
+    -> { "こんにちは".bytesplice(3, 3, "こんにちは", 0, 1) }.should raise_error(IndexError, "offset 1 does not land on character boundary")
+    -> { "こんにちは".bytesplice(3, 3, "こんにちは", 0, 2) }.should raise_error(IndexError, "offset 2 does not land on character boundary")
+  end
+
+  it "replaces with integer str indices" do
+    "こんにちは".bytesplice(3, 3, "こんにちは", -15, 0).should == "こにちは"
+    "こんにちは".bytesplice(3, 3, "こんにちは", 0, 0).should == "こにちは"
+    "こんにちは".bytesplice(3, 3, "こんにちは", 0, 3).should == "ここにちは"
+    "こんにちは".bytesplice(3, 3, "はは", 3, 3).should == "こはにちは"
+    "こんにちは".bytesplice(3, 3, "こんにちは", 15, 0).should == "こにちは"
+  end
+
+  it "replaces with str range" do
+    "こんにちは".bytesplice(0..2, "こんにちは", -15...-16).should == "んにちは"
+    "こんにちは".bytesplice(0..2, "こんにちは", 0...0).should == "んにちは"
+    "こんにちは".bytesplice(0..2, "こんにちは", 3..5).should == "んんにちは"
+    "こんにちは".bytesplice(0..2, "こんにちは", 3...6).should == "んんにちは"
+    "こんにちは".bytesplice(0..2, "こんにちは", 3..8).should == "んにんにちは"
+    "こんにちは".bytesplice(0..2, "こんにちは", 0..-1).should == "こんにちはんにちは"
+    "こんにちは".bytesplice(0..2, "こんにちは", 0...15).should == "こんにちはんにちは"
+    "こんにちは".bytesplice(0..2, "こんにちは", 0...18).should == "こんにちはんにちは"
+  end
+
+  it "treats negative length for str range as 0" do
+    "こんにちは".bytesplice(0..2, "こんにちは", 0...-100).should == "んにちは"
+    "こんにちは".bytesplice(0..2, "こんにちは", 3...-100).should == "んにちは"
+    "こんにちは".bytesplice(0..2, "こんにちは", -15...-100).should == "んにちは"
+  end
+
+  it "raises when ranges not match codepoint boundaries in str" do
+    -> { "こんにちは".bytesplice(3...3, "こ", 0..0) }.should raise_error(IndexError, "offset 1 does not land on character boundary")
+    -> { "こんにちは".bytesplice(3...3, "こ", 0..1) }.should raise_error(IndexError, "offset 2 does not land on character boundary")
+    # Begin is incorrect
+    -> { "こんにちは".bytesplice(3...3, "こんにちは", -4..-1) }.should raise_error(IndexError, "offset 11 does not land on character boundary")
+    -> { "こんにちは".bytesplice(3...3, "こんにちは", -5..-1) }.should raise_error(IndexError, "offset 10 does not land on character boundary")
+    # End is incorrect
+    -> { "こんにちは".bytesplice(3...3, "こんにちは", -3..-2) }.should raise_error(IndexError, "offset 14 does not land on character boundary")
+    -> { "こんにちは".bytesplice(3...3, "こんにちは", -3..-3) }.should raise_error(IndexError, "offset 13 does not land on character boundary")
+  end
+
+  it "deals with a different encoded argument with str index/length" do
+    s = "こんにちは"
+    s.encoding.should == Encoding::UTF_8
+    sub = "goodbye"
+    sub.force_encoding(Encoding::US_ASCII)
+
+    result = s.bytesplice(3, 3, sub, 0, 3)
+    result.should == "こgooにちは"
+    result.encoding.should == Encoding::UTF_8
+
+    s = "hello"
+    s.force_encoding(Encoding::US_ASCII)
+    sub = "こんにちは"
+    sub.encoding.should == Encoding::UTF_8
+
+    result = s.bytesplice(1, 2, sub, 3, 3)
+    result.should == "hんlo"
+    result.encoding.should == Encoding::UTF_8
+  end
+
+  it "deals with a different encoded argument with str range" do
+    s = "こんにちは"
+    s.encoding.should == Encoding::UTF_8
+    sub = "goodbye"
+    sub.force_encoding(Encoding::US_ASCII)
+
+    result = s.bytesplice(3..5, sub, 0..2)
+    result.should == "こgooにちは"
+    result.encoding.should == Encoding::UTF_8
+
+    s = "hello"
+    s.force_encoding(Encoding::US_ASCII)
+    sub = "こんにちは"
+    sub.encoding.should == Encoding::UTF_8
+
+    result = s.bytesplice(1..2, sub, 3..5)
+    result.should == "hんlo"
+    result.encoding.should == Encoding::UTF_8
   end
 end