Ensure RubyGems is loaded before running #require specs

Author: eregon

spec/ruby/core/module/autoload_spec.rb

@@ -1,4 +1,5 @@
 require_relative '../../spec_helper'
+require_relative '../../fixtures/code_loading'
 require_relative 'fixtures/classes'
 require 'thread'
 
@@ -33,14 +34,7 @@
 describe "Module#autoload" do
   before :all do
     @non_existent = fixture __FILE__, "no_autoload.rb"
-
-    # Require RubyGems eagerly, to ensure #require is already the RubyGems
-    # version, before starting #autoload specs which snapshot #require, and
-    # could end up redefining #require as the original core Kernel#require.
-    begin
-      require "rubygems"
-    rescue LoadError
-    end
+    CodeLoadingSpecs.preload_rubygems
   end
 
   before :each do

spec/ruby/fixtures/code_loading.rb

@@ -12,7 +12,22 @@ def load(name, wrap=false)
     end
   end
 
+  def self.preload_rubygems
+    # Require RubyGems eagerly, to ensure #require is already the RubyGems
+    # version and RubyGems is only loaded once, before starting #require/#autoload specs
+    # which snapshot $LOADED_FEATURES and could cause RubyGems to load twice.
+    # #require specs also snapshot #require, and could end up redefining #require as the original core Kernel#require.
+    @rubygems ||= begin
+      require "rubygems"
+      true
+    rescue LoadError
+      true
+    end
+  end
+
   def self.spec_setup
+    preload_rubygems
+
     @saved_loaded_features = $LOADED_FEATURES.clone
     @saved_load_path = $LOAD_PATH.clone
     ScratchPad.record []