rubygems-update 3.1.6 → 3.3.22

data/test/rubygems/test_kernel.rb

@@ -1,14 +1,15 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
+require_relative "helper"
 
 class TestKernel < Gem::TestCase
-
   def setup
     super
 
     @old_path = $:.dup
 
     util_make_gems
+
+    without_any_upwards_gemfiles
   end
 
   def teardown
@@ -18,77 +19,77 @@ class TestKernel < Gem::TestCase
   end
 
   def test_gem
-    assert gem('a', '= 1'), "Should load"
-    assert $:.any? { |p| %r{a-1/lib} =~ p }
+    assert gem("a", "= 1"), "Should load"
+    assert $:.any? {|p| %r{a-1/lib} =~ p }
   end
 
   def test_gem_default
-    assert gem('a', '>= 0')
+    assert gem("a", ">= 0")
 
-    assert_equal @a2, Gem.loaded_specs['a']
+    assert_equal @a2, Gem.loaded_specs["a"]
   end
 
   def test_gem_default_re_gem
-    assert gem('a', '=1')
+    assert gem("a", "=1")
 
-    refute gem('a', '>= 0')
+    refute gem("a", ">= 0")
 
-    assert_equal @a1, Gem.loaded_specs['a']
+    assert_equal @a1, Gem.loaded_specs["a"]
   end
 
   def test_gem_re_gem_mismatch
-    assert gem('a', '=1')
+    assert gem("a", "=1")
 
-    assert_raises Gem::LoadError do
-      gem('a', '= 2')
+    assert_raise Gem::LoadError do
+      gem("a", "= 2")
     end
 
-    assert_equal @a1, Gem.loaded_specs['a']
+    assert_equal @a1, Gem.loaded_specs["a"]
   end
 
   def test_gem_redundant
-    assert gem('a', '= 1'), "Should load"
-    refute gem('a', '= 1'), "Should not load"
-    assert_equal 1, $:.select { |p| %r{a-1/lib} =~ p }.size
+    assert gem("a", "= 1"), "Should load"
+    refute gem("a", "= 1"), "Should not load"
+    assert_equal 1, $:.select {|p| %r{a-1/lib} =~ p }.size
   end
 
   def test_gem_overlapping
-    assert gem('a', '= 1'), "Should load"
-    refute gem('a', '>= 1'), "Should not load"
-    assert_equal 1, $:.select { |p| %r{a-1/lib} =~ p }.size
+    assert gem("a", "= 1"), "Should load"
+    refute gem("a", ">= 1"), "Should not load"
+    assert_equal 1, $:.select {|p| %r{a-1/lib} =~ p }.size
   end
 
   def test_gem_prerelease
-    quick_gem 'd', '1.1.a'
-    refute gem('d', '>= 1'),   'release requirement must not load prerelease'
-    assert gem('d', '>= 1.a'), 'prerelease requirement may load prerelease'
+    quick_gem "d", "1.1.a"
+    refute gem("d", ">= 1"),   "release requirement must not load prerelease"
+    assert gem("d", ">= 1.a"), "prerelease requirement may load prerelease"
   end
 
   def test_gem_env_req
-    ENV["GEM_REQUIREMENT_A"] = '~> 2.0'
-    assert_raises(Gem::MissingSpecVersionError) { gem('a', '= 1') }
-    assert gem('a', '> 1')
-    assert_equal @a2, Gem.loaded_specs['a']
+    ENV["GEM_REQUIREMENT_A"] = "~> 2.0"
+    assert_raise(Gem::MissingSpecVersionError) { gem("a", "= 1") }
+    assert gem("a", "> 1")
+    assert_equal @a2, Gem.loaded_specs["a"]
   end
 
   def test_gem_conflicting
-    assert gem('a', '= 1'), "Should load"
+    assert gem("a", "= 1"), "Should load"
 
-    ex = assert_raises Gem::LoadError do
-      gem 'a', '= 2'
+    ex = assert_raise Gem::LoadError do
+      gem "a", "= 2"
     end
 
     assert_equal "can't activate a-2, already activated a-1", ex.message
     assert_match(/activated a-1/, ex.message)
-    assert_equal 'a', ex.name
+    assert_equal "a", ex.name
 
-    assert $:.any? { |p| %r{a-1/lib} =~ p }
-    refute $:.any? { |p| %r{a-2/lib} =~ p }
+    assert $:.any? {|p| %r{a-1/lib} =~ p }
+    refute $:.any? {|p| %r{a-2/lib} =~ p }
   end
 
   def test_gem_not_adding_bin
-    assert gem('a', '= 1'), "Should load"
-    refute $:.any? { |p| %r{a-1/bin} =~ p }
+    assert gem("a", "= 1"), "Should load"
+    refute $:.any? {|p| %r{a-1/bin} =~ p }
   end
 
   def test_gem_failing_inside_require_doesnt_cause_double_exceptions
@@ -98,46 +99,31 @@ class TestKernel < Gem::TestCase
 
     output, _ = Open3.capture2e(
       { "GEM_HOME" => Gem.paths.home },
-      Gem.ruby,
-      "-I",
-      File.expand_path("../../lib", __dir__),
+      *ruby_with_rubygems_in_load_path,
       "-r",
       "./activate.rb"
     )
 
-    load_errors = output.split("\n").select { |line| line.include?("Could not find")}
+    load_errors = output.split("\n").select {|line| line.include?("Could not find") }
 
     assert_equal 1, load_errors.size
   end
 
   def test_gem_bundler
-    quick_gem 'bundler', '1'
-    quick_gem 'bundler', '2.a'
+    quick_gem "bundler", "1"
+    quick_gem "bundler", "2.a"
 
-    assert gem('bundler')
-    assert $:.any? { |p| %r{bundler-1/lib} =~ p }
-  end
-
-  def test_gem_bundler_missing_bundler_version
-    Gem::BundlerVersionFinder.stub(:bundler_version_with_reason, ["55", "reason"]) do
-      quick_gem 'bundler', '1'
-      quick_gem 'bundler', '2.a'
-
-      e = assert_raises Gem::MissingSpecVersionError do
-        gem('bundler')
-      end
-      assert_match "Could not find 'bundler' (55) required by reason.", e.message
-    end
+    assert gem("bundler")
+    assert $:.any? {|p| %r{bundler-1/lib} =~ p }
   end
 
   def test_gem_bundler_inferred_bundler_version
-    Gem::BundlerVersionFinder.stub(:bundler_version_with_reason, ["1", "reason"]) do
-      quick_gem 'bundler', '1'
-      quick_gem 'bundler', '2.a'
+    Gem::BundlerVersionFinder.stub(:bundler_version, Gem::Version.new("1")) do
+      quick_gem "bundler", "1"
+      quick_gem "bundler", "2.a"
 
-      assert gem('bundler', '>= 0.a')
-      assert $:.any? { |p| %r{bundler-1/lib} =~ p }
+      assert gem("bundler", ">= 0.a")
+      assert $:.any? {|p| %r{bundler-1/lib} =~ p }
     end
   end
-
 end

data/test/rubygems/test_project_sanity.rb

@@ -1,15 +1,20 @@
 # frozen_string_literal: true
 
+require_relative "helper"
 require "open3"
 
-class TestProjectSanity < Minitest::Test
-
+class TestProjectSanity < Gem::TestCase
   def test_manifest_is_up_to_date
-    skip unless File.exist?(File.expand_path("../../../Rakefile", __FILE__))
+    pend unless File.exist?(File.expand_path("../../Rakefile", __dir__))
 
     _, status = Open3.capture2e("rake check_manifest")
 
     assert status.success?, "Expected Manifest.txt to be up to date, but it's not. Run `rake update_manifest` to sync it."
   end
 
+  def test_require_rubygems_package
+    err, status = Open3.capture2e(*ruby_with_rubygems_in_load_path, "--disable-gems", "-e", "require \"rubygems/package\"")
+
+    assert status.success?, err
+  end
 end

data/test/rubygems/test_remote_fetch_error.rb

@@ -1,21 +1,19 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
+require_relative "helper"
 
 class TestRemoteFetchError < Gem::TestCase
-
   def test_password_redacted
-    error = Gem::RemoteFetcher::FetchError.new('There was an error fetching', 'https://user:secret@gemsource.org')
-    refute_match 'secret', error.to_s
+    error = Gem::RemoteFetcher::FetchError.new("There was an error fetching", "https://user:secret@gemsource.org")
+    refute_match %r{secret}, error.to_s
   end
 
   def test_invalid_url
-    error = Gem::RemoteFetcher::FetchError.new('There was an error fetching', 'https://::gemsource.org')
-    assert_equal error.to_s, 'There was an error fetching (https://::gemsource.org)'
+    error = Gem::RemoteFetcher::FetchError.new("There was an error fetching", "https://::gemsource.org")
+    assert_equal error.to_s, "There was an error fetching (https://::gemsource.org)"
   end
 
   def test_to_s
-    error = Gem::RemoteFetcher::FetchError.new('There was an error fetching', 'https://gemsource.org')
-    assert_equal error.to_s, 'There was an error fetching (https://gemsource.org)'
+    error = Gem::RemoteFetcher::FetchError.new("There was an error fetching", "https://gemsource.org")
+    assert_equal error.to_s, "There was an error fetching (https://gemsource.org)"
   end
-
 end