diff options
Diffstat (limited to 'lib/rubygems/test_case.rb')
-rw-r--r-- | lib/rubygems/test_case.rb | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb index 82afb8a068..f7f216e5e3 100644 --- a/lib/rubygems/test_case.rb +++ b/lib/rubygems/test_case.rb @@ -25,7 +25,9 @@ unless Gem::Dependency.new('rdoc', '>= 3.10').matching_specs.empty? gem 'json' end -require 'bundler' +if Gem::USE_BUNDLER_FOR_GEMDEPS + require 'bundler' +end require 'minitest/autorun' require 'rubygems/deprecate' @@ -235,7 +237,9 @@ class Gem::TestCase < MiniTest::Unit::TestCase @current_dir = Dir.pwd @fetcher = nil - Bundler.ui = Bundler::UI::Silent.new + if Gem::USE_BUNDLER_FOR_GEMDEPS + Bundler.ui = Bundler::UI::Silent.new + end @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 @@ -331,7 +335,9 @@ class Gem::TestCase < MiniTest::Unit::TestCase Gem.loaded_specs.clear Gem.clear_default_specs Gem::Specification.unresolved_deps.clear - Bundler.reset! + if Gem::USE_BUNDLER_FOR_GEMDEPS + Bundler.reset! + end Gem.configuration.verbose = true Gem.configuration.update_sources = true |