Update to ruby/spec@d8bacef

author: Andrew Konchin <[email protected]> 2025-05-07 13:08:11 +0300
committer: Benoit Daloze <[email protected]> 2025-05-09 23:22:15 +0200
commit: 269ad29de95e41cc8a4eede84b98a81a6ff4f7b6 (patch)
tree: 150acf5f6d6c2d401dd46b84b942af26b3699cc9 /spec/ruby/core/kernel
parent: 3135eddb4e8c6975b6fa5345f15fdaa55257851a (diff)
11 files changed, 57 insertions, 189 deletions
diff --git a/spec/ruby/core/kernel/match_spec.rb b/spec/ruby/core/kernel/match_spec.rb
index aa25006163..cd6330fe91 100644
--- a/spec/ruby/core/kernel/match_spec.rb
+++ b/spec/ruby/core/kernel/match_spec.rb
@@ -1,30 +1,7 @@
 require_relative '../../spec_helper'
 
 describe "Kernel#=~" do
-  ruby_version_is ''...'3.2' do
-    it "returns nil matching any object" do
-      o = Object.new
-
-      suppress_warning do
-        (o =~ /Object/).should   be_nil
-        (o =~ 'Object').should   be_nil
-        (o =~ Object).should     be_nil
-        (o =~ Object.new).should be_nil
-        (o =~ nil).should        be_nil
-        (o =~ true).should       be_nil
-      end
-    end
-
-    it "is deprecated" do
-      -> do
-        Object.new =~ /regexp/
-      end.should complain(/deprecated Object#=~ is called on Object/, verbose: true)
-    end
-  end
-
-  ruby_version_is '3.2' do
-    it "is no longer defined" do
-      Object.new.should_not.respond_to?(:=~)
-    end
+  it "is no longer defined" do
+    Object.new.should_not.respond_to?(:=~)
   end
 end
diff --git a/spec/ruby/core/kernel/not_match_spec.rb b/spec/ruby/core/kernel/not_match_spec.rb
index f8dd82fad8..082e56fed7 100644
--- a/spec/ruby/core/kernel/not_match_spec.rb
+++ b/spec/ruby/core/kernel/not_match_spec.rb
@@ -14,18 +14,8 @@ describe "Kernel#!~" do
     (obj !~ :foo).should == false
   end
 
-  ruby_version_is ""..."3.2" do
-    it "returns true if self does not respond to #=~" do
-      suppress_warning do
-        (Object.new !~ :foo).should == true
-      end
-    end
-  end
-
-  ruby_version_is "3.2" do
-    it "raises NoMethodError if self does not respond to #=~" do
-      -> { Object.new !~ :foo }.should raise_error(NoMethodError)
-    end
+  it "raises NoMethodError if self does not respond to #=~" do
+    -> { Object.new !~ :foo }.should raise_error(NoMethodError)
   end
 
   it 'can be overridden in subclasses' do
diff --git a/spec/ruby/core/kernel/open_spec.rb b/spec/ruby/core/kernel/open_spec.rb
index bb42c31f31..6d00af395d 100644
--- a/spec/ruby/core/kernel/open_spec.rb
+++ b/spec/ruby/core/kernel/open_spec.rb
@@ -106,7 +106,7 @@ describe "Kernel#open" do
       ScratchPad.clear
     end
 
-    it "calls #to_path to covert the argument to a String before calling #to_str" do
+    it "calls #to_path to convert the argument to a String before calling #to_str" do
       obj = mock("open to_path")
       obj.should_receive(:to_path).at_least(1).times.and_return(@name)
       obj.should_not_receive(:to_str)
diff --git a/spec/ruby/core/kernel/shared/require.rb b/spec/ruby/core/kernel/shared/require.rb
index b31c89e3bf..52f86f73e5 100644
--- a/spec/ruby/core/kernel/shared/require.rb
+++ b/spec/ruby/core/kernel/shared/require.rb
@@ -296,6 +296,16 @@ describe :kernel_require, shared: true do
       $LOAD_PATH.replace [File.expand_path("b", CODE_LOADING_DIR), CODE_LOADING_DIR]
       @object.require("load_fixture").should be_false
     end
+
+    it "stores the missing path in a LoadError object" do
+      path = "abcd1234"
+
+      -> {
+        @object.send(@method, path)
+      }.should raise_error(LoadError) { |e|
+        e.path.should == path
+      }
+    end
   end
 
   describe "(file extensions)" do
@@ -815,4 +825,24 @@ describe :kernel_require, shared: true do
       e.path.should == path
     }
   end
+
+  platform_is :linux, :darwin do
+    it "does not store the missing path in a LoadError object when c-extension file exists but loading fails and passed absolute path without extension" do
+      # the error message is specific to what dlerror() returns
+      path = File.join CODE_LOADING_DIR, "a", "load_fixture"
+      -> { @object.send(@method, path) }.should raise_error(LoadError) { |e|
+        e.path.should == nil
+      }
+    end
+  end
+
+  platform_is :darwin do
+    it "does not store the missing path in a LoadError object when c-extension file exists but loading fails and passed absolute path with extension" do
+      # the error message is specific to what dlerror() returns
+      path = File.join CODE_LOADING_DIR, "a", "load_fixture.bundle"
+      -> { @object.send(@method, path) }.should raise_error(LoadError) { |e|
+        e.path.should == nil
+      }
+    end
+  end
 end
diff --git a/spec/ruby/core/kernel/shared/sprintf.rb b/spec/ruby/core/kernel/shared/sprintf.rb
index 13dc6e97f0..26bd189593 100644
--- a/spec/ruby/core/kernel/shared/sprintf.rb
+++ b/spec/ruby/core/kernel/shared/sprintf.rb
@@ -22,6 +22,7 @@ describe :kernel_sprintf, shared: true do
       @method.call("%d", "112").should == "112"
       @method.call("%d", "0127").should == "87"
       @method.call("%d", "0xc4").should == "196"
+      @method.call("%d", "0").should == "0"
     end
 
     it "raises TypeError exception if cannot convert to Integer" do
@@ -57,6 +58,11 @@ describe :kernel_sprintf, shared: true do
         it "works well with large numbers" do
           @method.call("%#{f}", 1234567890987654321).should == "1234567890987654321"
         end
+
+        it "converts to the empty string if precision is 0 and value is 0" do
+          @method.call("%.#{f}", 0).should == ""
+          @method.call("%.0#{f}", 0).should == ""
+        end
       end
     end
 
@@ -289,28 +295,12 @@ describe :kernel_sprintf, shared: true do
         @method.call("%c", "a").should == "a"
       end
 
-      ruby_version_is ""..."3.2" do
-        it "raises ArgumentError if argument is a string of several characters" do
-          -> {
-            @method.call("%c", "abc")
-          }.should raise_error(ArgumentError, /%c requires a character/)
-        end
-
-        it "raises ArgumentError if argument is an empty string" do
-          -> {
-            @method.call("%c", "")
-          }.should raise_error(ArgumentError, /%c requires a character/)
-        end
+      it "displays only the first character if argument is a string of several characters" do
+        @method.call("%c", "abc").should == "a"
       end
 
-      ruby_version_is "3.2" do
-        it "displays only the first character if argument is a string of several characters" do
-          @method.call("%c", "abc").should == "a"
-        end
-
-        it "displays no characters if argument is an empty string" do
-          @method.call("%c", "").should == ""
-        end
+      it "displays no characters if argument is an empty string" do
+        @method.call("%c", "").should == ""
       end
 
       it "raises TypeError if argument is not String or Integer and cannot be converted to them" do
diff --git a/spec/ruby/core/kernel/taint_spec.rb b/spec/ruby/core/kernel/taint_spec.rb
index 0c16b1dbbf..9a2efbaea0 100644
--- a/spec/ruby/core/kernel/taint_spec.rb
+++ b/spec/ruby/core/kernel/taint_spec.rb
@@ -2,26 +2,7 @@ require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
 describe "Kernel#taint" do
-  ruby_version_is ""..."3.2" do
-    it "is a no-op" do
-      suppress_warning do
-        o = Object.new
-        o.taint
-        o.should_not.tainted?
-      end
-    end
-
-    it "warns in verbose mode" do
-      -> {
-        obj = mock("tainted")
-        obj.taint
-      }.should complain(/Object#taint is deprecated and will be removed in Ruby 3.2/, verbose: true)
-    end
-  end
-
-  ruby_version_is "3.2" do
-    it "has been removed" do
-      Object.new.should_not.respond_to?(:taint)
-    end
+  it "has been removed" do
+    Object.new.should_not.respond_to?(:taint)
   end
 end
diff --git a/spec/ruby/core/kernel/tainted_spec.rb b/spec/ruby/core/kernel/tainted_spec.rb
index fcae433069..837eb1dafb 100644
--- a/spec/ruby/core/kernel/tainted_spec.rb
+++ b/spec/ruby/core/kernel/tainted_spec.rb
@@ -2,28 +2,7 @@ require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
 describe "Kernel#tainted?" do
-  ruby_version_is ""..."3.2" do
-    it "is a no-op" do
-      suppress_warning do
-        o = mock('o')
-        p = mock('p')
-        p.taint
-        o.should_not.tainted?
-        p.should_not.tainted?
-      end
-    end
-
-    it "warns in verbose mode" do
-      -> {
-        o = mock('o')
-        o.tainted?
-      }.should complain(/Object#tainted\? is deprecated and will be removed in Ruby 3.2/, verbose: true)
-    end
-  end
-
-  ruby_version_is "3.2" do
-    it "has been removed" do
-      Object.new.should_not.respond_to?(:tainted?)
-    end
+  it "has been removed" do
+    Object.new.should_not.respond_to?(:tainted?)
   end
 end
diff --git a/spec/ruby/core/kernel/trust_spec.rb b/spec/ruby/core/kernel/trust_spec.rb
index db6f17e0fb..ef3fa9a3e1 100644
--- a/spec/ruby/core/kernel/trust_spec.rb
+++ b/spec/ruby/core/kernel/trust_spec.rb
@@ -2,27 +2,7 @@ require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
 describe "Kernel#trust" do
-  ruby_version_is ""..."3.2" do
-    it "is a no-op" do
-      suppress_warning do
-        o = Object.new.untrust
-        o.should_not.untrusted?
-        o.trust
-        o.should_not.untrusted?
-      end
-    end
-
-    it "warns in verbose mode" do
-      -> {
-        o = Object.new.untrust
-        o.trust
-      }.should complain(/Object#trust is deprecated and will be removed in Ruby 3.2/, verbose: true)
-    end
-  end
-
-  ruby_version_is "3.2" do
-    it "has been removed" do
-      Object.new.should_not.respond_to?(:trust)
-    end
+  it "has been removed" do
+    Object.new.should_not.respond_to?(:trust)
   end
 end
diff --git a/spec/ruby/core/kernel/untaint_spec.rb b/spec/ruby/core/kernel/untaint_spec.rb
index 26b2aabbe9..47e8544bd4 100644
--- a/spec/ruby/core/kernel/untaint_spec.rb
+++ b/spec/ruby/core/kernel/untaint_spec.rb
@@ -2,27 +2,7 @@ require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
 describe "Kernel#untaint" do
-  ruby_version_is ""..."3.2" do
-    it "is a no-op" do
-      suppress_warning do
-        o = Object.new.taint
-        o.should_not.tainted?
-        o.untaint
-        o.should_not.tainted?
-      end
-    end
-
-    it "warns in verbose mode" do
-      -> {
-        o = Object.new.taint
-        o.untaint
-      }.should complain(/Object#untaint is deprecated and will be removed in Ruby 3.2/, verbose: true)
-    end
-  end
-
-  ruby_version_is "3.2" do
-    it "has been removed" do
-      Object.new.should_not.respond_to?(:untaint)
-    end
+  it "has been removed" do
+    Object.new.should_not.respond_to?(:untaint)
   end
 end
diff --git a/spec/ruby/core/kernel/untrust_spec.rb b/spec/ruby/core/kernel/untrust_spec.rb
index 5310cd8eb4..8787ab3fc9 100644
--- a/spec/ruby/core/kernel/untrust_spec.rb
+++ b/spec/ruby/core/kernel/untrust_spec.rb
@@ -2,26 +2,7 @@ require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
 describe "Kernel#untrust" do
-  ruby_version_is ""..."3.2" do
-    it "is a no-op" do
-      suppress_warning do
-        o = Object.new
-        o.untrust
-        o.should_not.untrusted?
-      end
-    end
-
-    it "warns in verbose mode" do
-      -> {
-        o = Object.new
-        o.untrust
-      }.should complain(/Object#untrust is deprecated and will be removed in Ruby 3.2/, verbose: true)
-    end
-  end
-
-  ruby_version_is "3.2" do
-    it "has been removed" do
-      Object.new.should_not.respond_to?(:untrust)
-    end
+  it "has been removed" do
+    Object.new.should_not.respond_to?(:untrust)
   end
 end
diff --git a/spec/ruby/core/kernel/untrusted_spec.rb b/spec/ruby/core/kernel/untrusted_spec.rb
index ea36d6c98c..29261be9c4 100644
--- a/spec/ruby/core/kernel/untrusted_spec.rb
+++ b/spec/ruby/core/kernel/untrusted_spec.rb
@@ -2,27 +2,7 @@ require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
 describe "Kernel#untrusted?" do
-  ruby_version_is ""..."3.2" do
-    it "is a no-op" do
-      suppress_warning do
-        o = mock('o')
-        o.should_not.untrusted?
-        o.untrust
-        o.should_not.untrusted?
-      end
-    end
-
-    it "warns in verbose mode" do
-      -> {
-        o = mock('o')
-        o.untrusted?
-      }.should complain(/Object#untrusted\? is deprecated and will be removed in Ruby 3.2/, verbose: true)
-    end
-  end
-
-  ruby_version_is "3.2" do
-    it "has been removed" do
-      Object.new.should_not.respond_to?(:untrusted?)
-    end
+  it "has been removed" do
+    Object.new.should_not.respond_to?(:untrusted?)
   end
 end
author	Andrew Konchin <[email protected]>	2025-05-07 13:08:11 +0300
committer	Benoit Daloze <[email protected]>	2025-05-09 23:22:15 +0200
commit	269ad29de95e41cc8a4eede84b98a81a6ff4f7b6 (patch)
tree	150acf5f6d6c2d401dd46b84b942af26b3699cc9 /spec/ruby/core/kernel
parent	3135eddb4e8c6975b6fa5345f15fdaa55257851a (diff)