From f9cb39e61499e51cfdd0670a95de584b9e5f29c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
Date: Sat, 3 Aug 2019 12:22:36 +0200
Subject: Remove a bunch of unneeded rubygems requires

---
 spec/runtime/setup_spec.rb        | 17 -----------------
 spec/support/artifice/endpoint.rb |  1 -
 spec/support/hax.rb               |  2 --
 3 files changed, 20 deletions(-)

diff --git a/spec/runtime/setup_spec.rb b/spec/runtime/setup_spec.rb
index 65cb006edd..c24e951a4f 100644
--- a/spec/runtime/setup_spec.rb
+++ b/spec/runtime/setup_spec.rb
@@ -12,7 +12,6 @@ RSpec.describe "Bundler.setup" do
       G
 
       ruby <<-RUBY
-        require 'rubygems'
         require 'bundler'
         Bundler.setup
 
@@ -35,7 +34,6 @@ RSpec.describe "Bundler.setup" do
 
     it "doesn't make all groups available" do
       ruby <<-RUBY
-        require 'rubygems'
         require 'bundler'
         Bundler.setup(:default)
 
@@ -51,7 +49,6 @@ RSpec.describe "Bundler.setup" do
 
     it "accepts string for group name" do
       ruby <<-RUBY
-        require 'rubygems'
         require 'bundler'
         Bundler.setup(:default, 'test')
 
@@ -64,7 +61,6 @@ RSpec.describe "Bundler.setup" do
 
     it "leaves all groups available if they were already" do
       ruby <<-RUBY
-        require 'rubygems'
         require 'bundler'
         Bundler.setup
         Bundler.setup(:default)
@@ -78,7 +74,6 @@ RSpec.describe "Bundler.setup" do
 
     it "leaves :default available if setup is called twice" do
       ruby <<-RUBY
-        require 'rubygems'
         require 'bundler'
         Bundler.setup(:default)
         Bundler.setup(:default, :test)
@@ -127,7 +122,6 @@ RSpec.describe "Bundler.setup" do
       ENV["RUBYLIB"] = "rubylib_dir"
 
       ruby <<-RUBY
-        require 'rubygems'
         require 'bundler'
         Bundler.setup
         puts $LOAD_PATH
@@ -150,7 +144,6 @@ RSpec.describe "Bundler.setup" do
       G
 
       ruby! <<-RUBY
-        require 'rubygems'
         require 'bundler'
         Bundler.setup
         puts $LOAD_PATH
@@ -179,7 +172,6 @@ RSpec.describe "Bundler.setup" do
       G
 
       ruby! <<-RUBY
-        require 'rubygems'
         require 'bundler/setup'
         puts $LOAD_PATH
       RUBY
@@ -201,7 +193,6 @@ RSpec.describe "Bundler.setup" do
     G
 
     ruby <<-R
-      require 'rubygems'
       require 'bundler'
 
       begin
@@ -222,7 +213,6 @@ RSpec.describe "Bundler.setup" do
     G
 
     ruby <<-R
-      require 'rubygems'
       require 'bundler'
 
       Bundler.setup
@@ -246,7 +236,6 @@ RSpec.describe "Bundler.setup" do
     G
 
     ruby <<-R
-      require 'rubygems'
       require 'bundler'
 
       Bundler.setup
@@ -300,7 +289,6 @@ RSpec.describe "Bundler.setup" do
 
         ENV["BUNDLE_GEMFILE"] = "Gemfile"
         ruby <<-R
-          require 'rubygems'
           require 'bundler'
 
           begin
@@ -456,7 +444,6 @@ RSpec.describe "Bundler.setup" do
       break_git!
 
       ruby <<-R
-        require 'rubygems'
         require 'bundler'
 
         begin
@@ -478,7 +465,6 @@ RSpec.describe "Bundler.setup" do
       break_git!
 
       ruby <<-R
-        require "rubygems"
         require "bundler"
 
         begin
@@ -937,8 +923,6 @@ end
 
     it "does not pull in system gems" do
       run <<-R
-        require 'rubygems'
-
         begin;
           require 'rack'
         rescue LoadError
@@ -1221,7 +1205,6 @@ end
 
       let(:activation_warning_hack) { strip_whitespace(<<-RUBY) }
         require #{spec_dir.join("support/hax").to_s.dump}
-        require "rubygems"
 
         if Gem::Specification.instance_methods.map(&:to_sym).include?(:activate)
           Gem::Specification.send(:alias_method, :bundler_spec_activate, :activate)
diff --git a/spec/support/artifice/endpoint.rb b/spec/support/artifice/endpoint.rb
index d9e9e0ae0a..0176059e87 100644
--- a/spec/support/artifice/endpoint.rb
+++ b/spec/support/artifice/endpoint.rb
@@ -44,7 +44,6 @@ class Endpoint < Sinatra::Base
     def dependencies_for(gem_names, gem_repo = GEM_REPO)
       return [] if gem_names.nil? || gem_names.empty?
 
-      require "rubygems"
       require "bundler"
       Bundler::Deprecate.skip_during do
         all_specs = %w[specs.4.8 prerelease_specs.4.8].map do |filename|
diff --git a/spec/support/hax.rb b/spec/support/hax.rb
index 4f8d9b89ec..5e6acdc783 100644
--- a/spec/support/hax.rb
+++ b/spec/support/hax.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "rubygems"
-
 module Gem
   if version = ENV["BUNDLER_SPEC_RUBYGEMS_VERSION"]
     remove_const(:VERSION) if const_defined?(:VERSION)
-- 
cgit v1.2.1