[rubygems/rubygems] Make Gem.clear_paths test less implementation d…

…ependent rubygems/rubygems@b545daa95d
ruby · May 14, 2024 · 6454238 · 6454238
1 parent 8d28e63
commit 6454238
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/test/rubygems/helper.rb b/test/rubygems/helper.rb
@@ -534,6 +534,16 @@ def without_any_upwards_gemfiles
     ENV["BUNDLE_GEMFILE"] = File.join(@tempdir, "Gemfile")
   end
 
+  def with_env(overrides, &block)
+    @orig_env = ENV.to_h
+    ENV.replace(overrides)
+    begin
+      block.call
+    ensure
+      ENV.replace(@orig_env)
+    end
+  end
+
   ##
   # A git_gem is used with a gem dependencies file.  The gem created here
   # has no files, just a gem specification for the given +name+ and +version+.

diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
@@ -516,7 +516,10 @@ def test_self_clear_paths
 
     Gem.clear_paths
 
-    assert_nil Gem::Specification.send(:class_variable_get, :@@all)
+    with_env("GEM_HOME" => "foo", "GEM_PATH" => "bar") do
+      assert_equal("foo", Gem.dir)
+      assert_equal("bar", Gem.path.first)
+    end
   end
 
   def test_self_configuration

diff --git a/test/rubygems/test_gem_ci_detector.rb b/test/rubygems/test_gem_ci_detector.rb
@@ -3,7 +3,7 @@
 require_relative "helper"
 require "rubygems"
 
-class TestCiDetector < Test::Unit::TestCase
+class TestCiDetector < Gem::TestCase
   def test_ci?
     with_env("FOO" => "bar") { assert_equal(false, Gem::CIDetector.ci?) }
     with_env("CI" => "true") { assert_equal(true, Gem::CIDetector.ci?) }
@@ -29,16 +29,4 @@ def test_ci_strings
       assert_equal(["dsari", "taskcluster"], Gem::CIDetector.ci_strings)
     end
   end
-
-  private
-
-  def with_env(overrides, &block)
-    @orig_env = ENV.to_h
-    ENV.replace(overrides)
-    begin
-      block.call
-    ensure
-      ENV.replace(@orig_env)
-    end
-  end
 end