1 files changed, 8 insertions, 15 deletions
diff --git a/spec/bundler/support/rubygems_version_manager.rb b/spec/bundler/support/rubygems_version_manager.rb
index c2e5a5f484..88da14b67e 100644
--- a/spec/bundler/support/rubygems_version_manager.rb
+++ b/spec/bundler/support/rubygems_version_manager.rb
@@ -24,30 +24,23 @@ class RubygemsVersionManager
 
   def assert_system_features_not_loaded!
     at_exit do
-      errors = if $?.nil?
-        ""
-      else
-        all_commands_output
-      end
-
       rubylibdir = RbConfig::CONFIG["rubylibdir"]
 
       rubygems_path = rubylibdir + "/rubygems"
       rubygems_default_path = rubygems_path + "/defaults"
 
       bundler_path = rubylibdir + "/bundler"
-      bundler_exemptions = Gem.rubygems_version < Gem::Version.new("3.2.0") ? [bundler_path + "/errors.rb"] : []
 
       bad_loaded_features = $LOADED_FEATURES.select do |loaded_feature|
         (loaded_feature.start_with?(rubygems_path) && !loaded_feature.start_with?(rubygems_default_path)) ||
-          (loaded_feature.start_with?(bundler_path) && !bundler_exemptions.any? {|bundler_exemption| loaded_feature.start_with?(bundler_exemption) })
+          loaded_feature.start_with?(bundler_path)
       end
 
-      if bad_loaded_features.any?
-        errors += "the following features were incorrectly loaded:\n#{bad_loaded_features.join("\n")}"
+      errors = if bad_loaded_features.any?
+        all_commands_output + "the following features were incorrectly loaded:\n#{bad_loaded_features.join("\n")}"
       end
 
-      raise errors unless errors.empty?
+      raise errors if errors
     end
   end
 
@@ -72,7 +65,7 @@ class RubygemsVersionManager
   def switch_local_copy_if_needed
     return unless local_copy_switch_needed?
 
-    sys_exec("git checkout #{target_tag}", :dir => local_copy_path)
+    sys_exec("git checkout #{target_tag}", dir: local_copy_path)
 
     ENV["RGV"] = local_copy_path.to_s
   end
@@ -91,7 +84,7 @@ class RubygemsVersionManager
   end
 
   def local_copy_tag
-    sys_exec("git rev-parse --abbrev-ref HEAD", :dir => local_copy_path)
+    sys_exec("git rev-parse --abbrev-ref HEAD", dir: local_copy_path)
   end
 
   def local_copy_path
@@ -104,7 +97,7 @@ class RubygemsVersionManager
     rubygems_path = source_root.join("tmp/rubygems")
 
     unless rubygems_path.directory?
-      sys_exec("git clone .. #{rubygems_path}", :dir => source_root)
+      sys_exec("git clone .. #{rubygems_path}", dir: source_root)
     end
 
     rubygems_path
@@ -119,7 +112,7 @@ class RubygemsVersionManager
   end
 
   def resolve_target_tag
-    return "v#{@source}" if @source.match(/^\d/)
+    return "v#{@source}" if @source.match?(/^\d/)
 
     @source
   end