Improve spec for provided features, i.e., requires done during startup

Author: eregon

spec/ruby/core/kernel/require_spec.rb

@@ -16,6 +16,22 @@
     Kernel.should have_private_instance_method(:require)
   end
 
+  provided = %w[complex enumerator rational thread ruby2_keywords]
+  ruby_version_is "3.1" do
+    provided << "fiber"
+  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 -= %w[encdb transdb] # Ignore CRuby internals
+    features.sort.should == provided.sort
+
+    code = provided.map { |f| "puts require #{f.inspect}\n" }.join
+    required = ruby_exe(code, options: '--disable-gems')
+    required.should == "false\n" * provided.size
+  end
+
   it_behaves_like :kernel_require_basic, :require, CodeLoadingSpecs::Method.new
   it_behaves_like :kernel_require, :require, CodeLoadingSpecs::Method.new
 end

spec/ruby/core/kernel/shared/require.rb

@@ -546,20 +546,6 @@
       ScratchPad.recorded.should == []
     end
 
-    provided = %w[complex enumerator rational thread]
-    provided << 'ruby2_keywords'
-
-    it "#{provided.join(', ')} are already required" do
-      features = ruby_exe("puts $LOADED_FEATURES", options: '--disable-gems')
-      provided.each { |feature|
-        features.should =~ /\b#{feature}\.(rb|so|jar)$/
-      }
-
-      code = provided.map { |f| "puts require #{f.inspect}\n" }.join
-      required = ruby_exe(code, options: '--disable-gems')
-      required.should == "false\n" * provided.size
-    end
-
     it "unicode_normalize is part of core and not $LOADED_FEATURES" do
       features = ruby_exe("puts $LOADED_FEATURES", options: '--disable-gems')
       features.lines.each { |feature|

spec/ruby/library/fiber/current_spec.rb

@@ -3,6 +3,12 @@
 require 'fiber'
 
 describe "Fiber.current" do
+  ruby_version_is "3.1" do
+    it "is available without an extra require" do
+      ruby_exe("print Fiber.current.class", options: '--disable-gems --disable-did-you-mean').should == "Fiber"
+    end
+  end
+
   it "returns the root Fiber when called outside of a Fiber" do
     root = Fiber.current
     root.should be_an_instance_of(Fiber)

spec/tags/core/kernel/require_tags.txt

@@ -6,3 +6,4 @@ fails:Kernel#require (non-extensioned path) loads a .rb extensioned file when a
 fails:Kernel#require (non-extensioned path) does not load a feature twice when $LOAD_PATH has been modified
 slow:Kernel#require ($LOADED_FEATURES) complex, enumerator, rational, thread, ruby2_keywords are already required
 slow:Kernel.require ($LOADED_FEATURES) complex, enumerator, rational, thread, ruby2_keywords are already required
+slow:Kernel#require complex, enumerator, rational, thread, ruby2_keywords, fiber are already required

spec/tags/library/fiber/current_tags.txt

@@ -0,0 +1 @@
+slow:Fiber.current is available without an extra require