diff options
Diffstat (limited to 'lib/rubygems/test_case.rb')
| -rw-r--r-- | lib/rubygems/test_case.rb | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb index 6061be1a84..8e909e4afe 100644 --- a/lib/rubygems/test_case.rb +++ b/lib/rubygems/test_case.rb @@ -1,11 +1,7 @@ # frozen_string_literal: true # TODO: $SAFE = 1 -if defined? Gem::QuickLoader - Gem::QuickLoader.load_full_rubygems_library -else - require 'rubygems' -end +require 'rubygems' # If bundler gemspec exists, add to stubs bundler_gemspec = File.expand_path("../../../bundler/bundler.gemspec", __FILE__) @@ -38,9 +34,8 @@ unless Gem::Dependency.new('rdoc', '>= 3.10').matching_specs.empty? gem 'json' end -if Gem::USE_BUNDLER_FOR_GEMDEPS - require 'bundler' -end +require 'bundler' + require 'minitest/autorun' require 'rubygems/deprecate' @@ -261,9 +256,8 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni @current_dir = Dir.pwd @fetcher = nil - if Gem::USE_BUNDLER_FOR_GEMDEPS - Bundler.ui = Bundler::UI::Silent.new - end + Bundler.ui = Bundler::UI::Silent.new + @back_ui = Gem::DefaultUserInteraction.ui @ui = Gem::MockGemUi.new # This needs to be a new instance since we call use_ui(@ui) when we want to @@ -368,9 +362,7 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni Gem.loaded_specs.clear Gem.clear_default_specs Gem::Specification.unresolved_deps.clear - if Gem::USE_BUNDLER_FOR_GEMDEPS - Bundler.reset! - end + Bundler.reset! Gem.configuration.verbose = true Gem.configuration.update_sources = true |