3 files changed, 70 insertions, 48 deletions
diff --git a/spec/ruby/core/kernel/shared/load.rb b/spec/ruby/core/kernel/shared/load.rb
index 0fe2d5ce16..62c5c7be9b 100644
--- a/spec/ruby/core/kernel/shared/load.rb
+++ b/spec/ruby/core/kernel/shared/load.rb
@@ -165,37 +165,35 @@ describe :kernel_load, shared: true do
   end
 
   describe "when passed a module for 'wrap'" do
-    ruby_version_is "3.1" do
-      it "sets the enclosing scope to the supplied module" do
-        path = File.expand_path "load_wrap_fixture.rb", CODE_LOADING_DIR
-        mod = Module.new
-        @object.load(path, mod)
+    it "sets the enclosing scope to the supplied module" do
+      path = File.expand_path "load_wrap_fixture.rb", CODE_LOADING_DIR
+      mod = Module.new
+      @object.load(path, mod)
 
-        Object.const_defined?(:LoadSpecWrap).should be_false
-        mod.const_defined?(:LoadSpecWrap).should be_true
+      Object.const_defined?(:LoadSpecWrap).should be_false
+      mod.const_defined?(:LoadSpecWrap).should be_true
 
-        wrap_module = ScratchPad.recorded[1]
-        wrap_module.should == mod
-      end
+      wrap_module = ScratchPad.recorded[1]
+      wrap_module.should == mod
+    end
 
-      it "makes constants and instance methods in the source file reachable with the supplied module" do
-        path = File.expand_path "load_wrap_fixture.rb", CODE_LOADING_DIR
-        mod = Module.new
-        @object.load(path, mod)
+    it "makes constants and instance methods in the source file reachable with the supplied module" do
+      path = File.expand_path "load_wrap_fixture.rb", CODE_LOADING_DIR
+      mod = Module.new
+      @object.load(path, mod)
 
-        mod::LOAD_WRAP_SPECS_TOP_LEVEL_CONSTANT.should == 1
-        obj = Object.new
-        obj.extend(mod)
-        obj.send(:load_wrap_specs_top_level_method).should == :load_wrap_specs_top_level_method
-      end
+      mod::LOAD_WRAP_SPECS_TOP_LEVEL_CONSTANT.should == 1
+      obj = Object.new
+      obj.extend(mod)
+      obj.send(:load_wrap_specs_top_level_method).should == :load_wrap_specs_top_level_method
+    end
 
-      it "makes instance methods in the source file private" do
-        path = File.expand_path "load_wrap_fixture.rb", CODE_LOADING_DIR
-        mod = Module.new
-        @object.load(path, mod)
+    it "makes instance methods in the source file private" do
+      path = File.expand_path "load_wrap_fixture.rb", CODE_LOADING_DIR
+      mod = Module.new
+      @object.load(path, mod)
 
-        mod.private_instance_methods.include?(:load_wrap_specs_top_level_method).should == true
-      end
+      mod.private_instance_methods.include?(:load_wrap_specs_top_level_method).should == true
     end
   end
 
diff --git a/spec/ruby/core/kernel/shared/require.rb b/spec/ruby/core/kernel/shared/require.rb
index 250813191b..52f86f73e5 100644
--- a/spec/ruby/core/kernel/shared/require.rb
+++ b/spec/ruby/core/kernel/shared/require.rb
@@ -223,7 +223,7 @@ describe :kernel_require, shared: true do
       it "loads c-extension file when passed absolute path without extension when no .rb is present" 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(Exception, /file too short|not a mach-o file/)
+        -> { @object.send(@method, path) }.should raise_error(LoadError)
       end
     end
 
@@ -231,7 +231,7 @@ describe :kernel_require, shared: true do
       it "loads .bundle file when passed absolute path with .so" do
         # the error message is specific to what dlerror() returns
         path = File.join CODE_LOADING_DIR, "a", "load_fixture.so"
-        -> { @object.send(@method, path) }.should raise_error(Exception, /load_fixture\.bundle.+(file too short|not a mach-o file)/)
+        -> { @object.send(@method, path) }.should raise_error(LoadError)
       end
     end
 
@@ -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..2b2c6c9b63 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
@@ -372,6 +362,10 @@ describe :kernel_sprintf, shared: true do
         obj.should_receive(:inspect).and_return("<inspect-result>")
         @method.call("%p", obj).should == "<inspect-result>"
       end
+
+      it "substitutes 'nil' for nil" do
+        @method.call("%p", nil).should == "nil"
+      end
     end
 
     describe "s" do
@@ -455,7 +449,7 @@ describe :kernel_sprintf, shared: true do
 
       it "is escaped by %" do
         @method.call("%%").should == "%"
-        @method.call("%%d", 10).should == "%d"
+        @method.call("%%d").should == "%d"
       end
     end
   end