summaryrefslogtreecommitdiff
path: root/lib/rubygems/test_case.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/rubygems/test_case.rb')
-rw-r--r--lib/rubygems/test_case.rb13
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb
index 9bb5c8e78b..2ae8ec9a2c 100644
--- a/lib/rubygems/test_case.rb
+++ b/lib/rubygems/test_case.rb
@@ -1,5 +1,11 @@
# TODO: $SAFE = 1
+begin
+ gem 'minitest', '~> 4.0'
+rescue NoMethodError
+ # for ruby tests
+end
+
if defined? Gem::QuickLoader
Gem::QuickLoader.load_full_rubygems_library
else
@@ -220,8 +226,8 @@ class Gem::TestCase < MiniTest::Unit::TestCase
ENV["GEM_SPEC_CACHE"] = File.join @tempdir, 'spec_cache'
@orig_ruby = if ENV['RUBY'] then
- ruby = Gem.instance_variable_get :@ruby
- Gem.instance_variable_set :@ruby, ENV['RUBY']
+ ruby = Gem.ruby
+ Gem.ruby = ENV['RUBY']
ruby
end
@@ -310,8 +316,7 @@ class Gem::TestCase < MiniTest::Unit::TestCase
ENV['GEM_HOME'] = @orig_gem_home
ENV['GEM_PATH'] = @orig_gem_path
- _ = @orig_ruby
- Gem.instance_variable_set :@ruby, @orig_ruby if @orig_ruby
+ Gem.ruby = @orig_ruby if @orig_ruby
if @orig_ENV_HOME then
ENV['HOME'] = @orig_ENV_HOME