Update to ruby/spec@7f22a0b

Author: eregon

spec/ruby/core/array/shared/slice.rb

@@ -743,6 +743,30 @@ def to.to_int() -2 end
         @array.send(@method, eval("(-2..-4).step(10)")).should == []
         @array.send(@method, eval("(-2...-4).step(10)")).should == []
       end
+
+      it "has range with bounds outside of array" do
+        # end is equal to array's length
+        @array.send(@method, (0..6).step(1)).should == [0, 1, 2, 3, 4, 5]
+        -> { @array.send(@method, (0..6).step(2)) }.should raise_error(RangeError)
+
+        # end is greater than length with positive steps
+        @array.send(@method, (1..6).step(2)).should == [1, 3, 5]
+        @array.send(@method, (2..7).step(2)).should == [2, 4]
+        -> { @array.send(@method, (2..8).step(2)) }.should raise_error(RangeError)
+
+        # begin is greater than length with negative steps
+        @array.send(@method, (6..1).step(-2)).should == [5, 3, 1]
+        @array.send(@method, (7..2).step(-2)).should == [5, 3]
+        -> { @array.send(@method, (8..2).step(-2)) }.should raise_error(RangeError)
+      end
+
+      it "has endless range with start outside of array's bounds" do
+        @array.send(@method, eval("(6..).step(1)")).should == []
+        @array.send(@method, eval("(7..).step(1)")).should == nil
+
+        @array.send(@method, eval("(6..).step(2)")).should == []
+        -> { @array.send(@method, eval("(7..).step(2)")) }.should raise_error(RangeError)
+      end
     end
   end
 

spec/ruby/core/dir/shared/glob.rb

@@ -55,12 +55,24 @@
     end
   end
 
+  ruby_version_is "3.0"..."3.1" do
+    it "result is sorted with any non false value of sort:" do
+      result = Dir.send(@method, '*', sort: 0)
+      result.should == result.sort
+
+      result = Dir.send(@method, '*', sort: nil)
+      result.should == result.sort
+
+      result = Dir.send(@method, '*', sort: 'false')
+      result.should == result.sort
+    end
+  end
+
   ruby_version_is "3.1" do
-    it "true or false is expected as sort:" do
-      -> {Dir.send(@method, '*', sort: nil)}.should raise_error ArgumentError, /true or false/
-      -> {Dir.send(@method, '*', sort: 0)}.should raise_error ArgumentError, /true or false/
-      -> {Dir.send(@method, '*', sort: "")}.should raise_error ArgumentError, /true or false/
-      -> {Dir.send(@method, '*', sort: Object.new)}.should raise_error ArgumentError, /true or false/
+    it "raises an ArgumentError if sort: is not true or false" do
+      -> { Dir.send(@method, '*', sort: 0) }.should raise_error ArgumentError, /expected true or false/
+      -> { Dir.send(@method, '*', sort: nil) }.should raise_error ArgumentError, /expected true or false/
+      -> { Dir.send(@method, '*', sort: 'false') }.should raise_error ArgumentError, /expected true or false/
     end
   end
 

spec/ruby/core/encoding/compatible_spec.rb

@@ -54,7 +54,7 @@
 
     it "returns nil if the second's Encoding is not ASCII compatible" do
       a = "abc".force_encoding("UTF-8")
-      b = "123".force_encoding("UTF-16LE")
+      b = "1234".force_encoding("UTF-16LE")
       Encoding.compatible?(a, b).should be_nil
     end
   end

spec/ruby/core/encoding/converter/putback_spec.rb

@@ -34,14 +34,23 @@
     @ec.putback.should == ""
   end
 
+  it "returns the problematic bytes for UTF-16LE" do
+    ec = Encoding::Converter.new("utf-16le", "iso-8859-1")
+    src = "\x00\xd8\x61\x00"
+    dst = ""
+    ec.primitive_convert(src, dst).should == :invalid_byte_sequence
+    ec.primitive_errinfo.should == [:invalid_byte_sequence, "UTF-16LE", "UTF-8", "\x00\xD8", "a\x00"]
+    ec.putback.should == "a\x00".force_encoding("utf-16le")
+    ec.putback.should == ""
+  end
+
   it "accepts an integer argument corresponding to the number of bytes to be put back" do
     ec = Encoding::Converter.new("utf-16le", "iso-8859-1")
     src = "\x00\xd8\x61\x00"
     dst = ""
     ec.primitive_convert(src, dst).should == :invalid_byte_sequence
     ec.primitive_errinfo.should == [:invalid_byte_sequence, "UTF-16LE", "UTF-8", "\x00\xD8", "a\x00"]
-    ec.putback(1).should == "\x00".force_encoding("utf-16le")
-    ec.putback.should == "a".force_encoding("utf-16le")
+    ec.putback(2).should == "a\x00".force_encoding("utf-16le")
     ec.putback.should == ""
   end
 end

spec/ruby/core/enumerable/grep_spec.rb

@@ -65,6 +65,18 @@ class EnumerableSpecGrep2; def ===(obj); /^ca/ =~ obj; end; end
       ["abc", "def"].grep(/b/).should == ["abc"]
       Regexp.last_match[0].should == "z"
     end
+
+    it "correctly handles non-string elements" do
+      'set last match' =~ /set last (.*)/
+      [:a, 'b', 'z', :c, 42, nil].grep(/[a-d]/).should == [:a, 'b', :c]
+      $1.should == 'match'
+
+      o = Object.new
+      def o.to_str
+        'hello'
+      end
+      [o].grep(/ll/).first.should.equal?(o)
+    end
   end
 
   describe "with a block" do

spec/ruby/core/enumerable/grep_v_spec.rb

@@ -45,6 +45,18 @@ def (@odd_matcher = BasicObject.new).===(obj)
       ["abc", "def"].grep_v(/e/).should == ["abc"]
       Regexp.last_match[0].should == "z"
     end
+
+    it "correctly handles non-string elements" do
+      'set last match' =~ /set last (.*)/
+      [:a, 'b', 'z', :c, 42, nil].grep_v(/[a-d]/).should == ['z', 42, nil]
+      $1.should == 'match'
+
+      o = Object.new
+      def o.to_str
+        'hello'
+      end
+      [o].grep_v(/mm/).first.should.equal?(o)
+    end
   end
 
   describe "without block" do

spec/ruby/core/enumerator/arithmetic_sequence/begin_spec.rb

@@ -6,4 +6,13 @@
     (1..10).step.begin.should == 1
     (1...10).step.begin.should == 1
   end
+
+  ruby_version_is "2.7" do
+    context "with beginless" do
+      it "returns nil as begin of the sequence" do
+        eval("(..10).step(1)").begin.should == nil
+        eval("(...10).step(1)").begin.should == nil
+      end
+    end
+  end
 end

spec/ruby/core/enumerator/arithmetic_sequence/end_spec.rb

@@ -6,4 +6,11 @@
     (1..10).step.end.should == 10
     (1...10).step(17).end.should == 10
   end
+
+  context "with endless" do
+    it "returns nil as end of the sequence" do
+      (1..).step(1).end.should == nil
+      (1...).step(1).end.should == nil
+    end
+  end
 end

spec/ruby/core/exception/errno_spec.rb

@@ -56,3 +56,12 @@
     end
   end
 end
+
+describe "Errno::ENOENT" do
+  it "lets subclasses inherit the default error message" do
+    c = Class.new(Errno::ENOENT)
+    raise c, "custom message"
+  rescue => e
+    e.message.should == "No such file or directory - custom message"
+  end
+end

spec/ruby/core/gc/auto_compact_spec.rb

@@ -12,6 +12,11 @@
       original = GC.auto_compact
       begin
         GC.auto_compact = !original
+      rescue NotImplementedError # platform does not support autocompact
+        skip
+      end
+
+      begin
         GC.auto_compact.should == !original
       ensure
         GC.auto_compact = original