1 files changed, 26 insertions, 13 deletions
diff --git a/spec/ruby/core/kernel/require_spec.rb b/spec/ruby/core/kernel/require_spec.rb
index 896afb840a..62d954c2bf 100644
--- a/spec/ruby/core/kernel/require_spec.rb
+++ b/spec/ruby/core/kernel/require_spec.rb
@@ -13,27 +13,40 @@ describe "Kernel#require" do
 
   # if this fails, update your rubygems
   it "is a private method" do
-    Kernel.should have_private_instance_method(:require)
+    Kernel.private_instance_methods(false).should.include?(:require)
   end
 
-  provided = %w[complex enumerator rational thread ruby2_keywords]
-  ruby_version_is "3.1" do
-    provided << "fiber"
-  end
+  it "provided features are already required" do
+    provided = %w[complex enumerator fiber rational thread ruby2_keywords]
+    ruby_version_is "4.0" do
+      provided += %w[set pathname]
+    end
+    ruby_version_is "4.1" do
+      provided += %w[monitor]
+    end
 
-  it "#{provided.join(', ')} are already required" do
     out = ruby_exe("puts $LOADED_FEATURES", options: '--disable-gems --disable-did-you-mean')
-    features = out.lines.map { |line| File.basename(line.chomp, '.*') }
+    features = out.lines.map(&:chomp)
 
-    # Ignore CRuby internals
-    features -= %w[encdb transdb windows_1252]
-    features.reject! { |feature| feature.end_with?('-fake') }
+    # Ignore engine-specific internals
+    case RUBY_ENGINE
+    when "jruby"
+      features -= %w[java.rb jruby/util.rb]
+    when "ruby"
+      so = RbConfig::CONFIG['DLEXT']
+      features -= ["windows_1252.#{so}", "windows_31.#{so}"]
+      features.reject! { |feature| feature.end_with? "encdb.#{so}" }
+      features.reject! { |feature| feature.end_with? "transdb.#{so}" }
+      features.reject! { |feature| feature.include?('-fake') }
+    end
 
-    features.sort.should == provided.sort
+    features_no_ext = features.map { |path| File.basename(path, '.*') }
+    features_no_ext.sort.should == provided.sort
 
-    code = provided.map { |f| "puts require #{f.inspect}\n" }.join
+    requires = features
+    code = requires.map { |f| "puts require #{f.inspect}\n" }.join
     required = ruby_exe(code, options: '--disable-gems')
-    required.should == "false\n" * provided.size
+    required.should == "false\n" * requires.size
   end
 
   it_behaves_like :kernel_require_basic, :require, CodeLoadingSpecs::Method.new