rubygems-update 3.3.26 → 3.4.18

data/test/rubygems/test_gem_package_tar_reader.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "package/tar_test_case"
 require "rubygems/package"
 
@@ -56,12 +57,14 @@ class TestGemPackageTarReader < Gem::Package::TarTestCase
     io = TempIO.new tar
 
     Gem::Package::TarReader.new io do |tar_reader|
-      tar_reader.seek "baz/bar" do |entry|
+      retval = tar_reader.seek "baz/bar" do |entry|
         assert_kind_of Gem::Package::TarReader::Entry, entry
 
         assert_equal "baz/bar", entry.full_name
+        entry.read
       end
 
+      assert_equal "", retval
       assert_equal 0, io.pos
     end
   ensure
@@ -84,4 +87,49 @@ class TestGemPackageTarReader < Gem::Package::TarTestCase
   ensure
     io.close!
   end
+
+  def test_read_in_gem_data
+    gem_tar = util_gem_data_tar do |tar|
+      tar.add_file "lib/code.rb", 0444 do |io|
+        io.write "# lib/code.rb"
+      end
+    end
+
+    count = 0
+    Gem::Package::TarReader.new(gem_tar).each do |entry|
+      next unless entry.full_name == "data.tar.gz"
+
+      Zlib::GzipReader.wrap entry do |gzio|
+        Gem::Package::TarReader.new(gzio).each do |contents_entry|
+          assert_equal "# lib/code.rb", contents_entry.read
+          count += 1
+        end
+      end
+    end
+
+    assert_equal 1, count, "should have found one file"
+  end
+
+  def test_seek_in_gem_data
+    gem_tar = util_gem_data_tar do |tar|
+      tar.add_file "lib/code.rb", 0444 do |io|
+        io.write "# lib/code.rb"
+      end
+      tar.add_file "lib/foo.rb", 0444 do |io|
+        io.write "# lib/foo.rb"
+      end
+    end
+
+    count = 0
+    Gem::Package::TarReader.new(gem_tar).seek("data.tar.gz") do |entry|
+      Zlib::GzipReader.wrap entry do |gzio|
+        Gem::Package::TarReader.new(gzio).seek("lib/foo.rb") do |contents_entry|
+          assert_equal "# lib/foo.rb", contents_entry.read
+          count += 1
+        end
+      end
+    end
+
+    assert_equal 1, count, "should have found one file"
+  end
 end

data/test/rubygems/test_gem_package_tar_reader_entry.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "package/tar_test_case"
 require "rubygems/package"
 
@@ -10,8 +11,7 @@ class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
 
     @tar = String.new
     @tar << tar_file_header("lib/foo", "", 0, @contents.size, Time.now)
-    @tar << @contents
-    @tar << "\0" * (512 - (@tar.size % 512))
+    @tar << tar_file_contents(@contents)
 
     @entry = util_entry @tar
   end
@@ -21,8 +21,35 @@ class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
     super
   end
 
-  def close_util_entry(entry)
-    entry.instance_variable_get(:@io).close!
+  def test_open
+    io = TempIO.new @tar
+    header = Gem::Package::TarHeader.from io
+    retval = Gem::Package::TarReader::Entry.open header, io do |entry|
+      entry.getc
+    end
+    assert_equal "a", retval
+    assert_equal @tar.size, io.pos, "should have read to end of entry"
+  end
+
+  def test_open_closes_entry
+    io = TempIO.new @tar
+    header = Gem::Package::TarHeader.from io
+    entry = nil
+    Gem::Package::TarReader::Entry.open header, io do |e|
+      entry = e
+    end
+    assert entry.closed?
+    assert_raise(IOError) { entry.getc }
+  end
+
+  def test_open_returns_entry
+    io = TempIO.new @tar
+    header = Gem::Package::TarHeader.from io
+    entry = Gem::Package::TarReader::Entry.open header, io
+    refute entry.closed?
+    assert_equal ?a, entry.getc
+    assert_nil entry.close
+    assert entry.closed?
   end
 
   def test_bytes_read
@@ -125,6 +152,18 @@ class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
     assert_equal @contents, @entry.read
   end
 
+  def test_consecutive_read
+    expected = StringIO.new(@contents)
+    assert_equal expected.read, @entry.read
+    assert_equal expected.read, @entry.read
+  end
+
+  def test_consecutive_read_bytes_past_eof
+    expected = StringIO.new(@contents)
+    assert_equal expected.read, @entry.read
+    assert_equal expected.read(1), @entry.read(1)
+  end
+
   def test_read_big
     assert_equal @contents, @entry.read(@contents.size * 2)
   end
@@ -133,9 +172,24 @@ class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
     assert_equal @contents[0...100], @entry.read(100)
   end
 
-  def test_readpartial
+  def test_read_remaining
+    @entry.read(100)
+    assert_equal @contents[100..-1], @entry.read
+  end
+
+  def test_read_partial
+    assert_equal @contents[0...100], @entry.readpartial(100)
+  end
+
+  def test_read_partial_buffer
+    buffer = "".b
+    @entry.readpartial(100, buffer)
+    assert_equal @contents[0...100], buffer
+  end
+
+  def test_readpartial_past_eof
+    @entry.readpartial(@contents.size)
     assert_raise(EOFError) do
-      @entry.read(@contents.size)
       @entry.readpartial(1)
     end
   end
@@ -149,4 +203,96 @@ class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
 
     assert_equal char, @entry.getc
   end
+
+  def test_seek
+    @entry.seek(50)
+    assert_equal 50, @entry.pos
+    assert_equal @contents[50..-1], @entry.read, "read remaining after seek"
+    @entry.seek(-50, IO::SEEK_CUR)
+    assert_equal @contents.size - 50, @entry.pos
+    assert_equal @contents[-50..-1], @entry.read, "read after stepping back 50 from the end"
+    @entry.seek(0, IO::SEEK_SET)
+    assert_equal 0, @entry.pos
+    assert_equal @contents, @entry.read, "read from beginning"
+    @entry.seek(-10, IO::SEEK_END)
+    assert_equal @contents.size - 10, @entry.pos
+    assert_equal @contents[-10..-1], @entry.read, "read from end"
+  end
+
+  def test_read_zero
+    expected = StringIO.new("")
+    assert_equal expected.read(0), @entry.read(0)
+  end
+
+  def test_readpartial_zero
+    expected = StringIO.new("")
+    assert_equal expected.readpartial(0), @entry.readpartial(0)
+  end
+
+  def test_zero_byte_file_read
+    zero_entry = util_entry(tar_file_header("foo", "", 0, 0, Time.now))
+    expected = StringIO.new("")
+    assert_equal expected.read, zero_entry.read
+  end
+
+  def test_zero_byte_file_readpartial
+    zero_entry = util_entry(tar_file_header("foo", "", 0, 0, Time.now))
+    expected = StringIO.new("")
+    assert_equal expected.readpartial(0), zero_entry.readpartial(0)
+  end
+
+  def test_read_from_gzip_io
+    tgz = util_gzip(@tar)
+
+    Zlib::GzipReader.wrap StringIO.new(tgz) do |gzio|
+      entry = util_entry(gzio)
+      assert_equal @contents, entry.read
+      entry.rewind
+      assert_equal @contents, entry.read, "second read after rewind should read same contents"
+    end
+  end
+
+  def test_read_from_gzip_io_with_non_zero_offset
+    contents2 = ("0".."9").to_a.join * 100
+    @tar << tar_file_header("lib/bar", "", 0, contents2.size, Time.now)
+    @tar << tar_file_contents(contents2)
+
+    tgz = util_gzip(@tar)
+
+    Zlib::GzipReader.wrap StringIO.new(tgz) do |gzio|
+      util_entry(gzio).close # skip the first entry so io.pos is not 0, preventing easy rewind
+      entry = util_entry(gzio)
+
+      assert_equal contents2, entry.read
+      entry.rewind
+      assert_equal contents2, entry.read, "second read after rewind should read same contents"
+    end
+  end
+
+  def test_seek_in_gzip_io_with_non_zero_offset
+    contents2 = ("0".."9").to_a.join * 100
+    @tar << tar_file_header("lib/bar", "", 0, contents2.size, Time.now)
+    @tar << tar_file_contents(contents2)
+
+    tgz = util_gzip(@tar)
+
+    Zlib::GzipReader.wrap StringIO.new(tgz) do |gzio|
+      util_entry(gzio).close # skip the first entry so io.pos is not 0
+      entry = util_entry(gzio)
+
+      entry.seek(50)
+      assert_equal 50, entry.pos
+      assert_equal contents2[50..-1], entry.read, "read remaining after seek"
+      entry.seek(-50, IO::SEEK_CUR)
+      assert_equal contents2.size - 50, entry.pos
+      assert_equal contents2[-50..-1], entry.read, "read after stepping back 50 from the end"
+      entry.seek(0, IO::SEEK_SET)
+      assert_equal 0, entry.pos
+      assert_equal contents2, entry.read, "read from beginning"
+      entry.seek(-10, IO::SEEK_END)
+      assert_equal contents2.size - 10, entry.pos
+      assert_equal contents2[-10..-1], entry.read, "read from end"
+      assert_equal contents2.size, entry.pos
+    end
+  end
 end

data/test/rubygems/test_gem_package_tar_writer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "package/tar_test_case"
 require "rubygems/package/tar_writer"
 

data/test/rubygems/test_gem_package_task.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems"
 

data/test/rubygems/test_gem_path_support.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems"
 require "fileutils"

data/test/rubygems/test_gem_platform.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/platform"
 require "rbconfig"
@@ -85,66 +86,65 @@ class TestGemPlatform < Gem::TestCase
 
   def test_initialize
     test_cases = {
-      "amd64-freebsd6"         => ["amd64",     "freebsd",   "6"],
-      "hppa2.0w-hpux11.31"     => ["hppa2.0w",  "hpux",      "11"],
-      "java"                   => [nil,         "java",      nil],
-      "jruby"                  => [nil,         "java",      nil],
-      "universal-dotnet"       => ["universal", "dotnet",    nil],
-      "universal-dotnet2.0"    => ["universal", "dotnet",  "2.0"],
-      "universal-dotnet4.0"    => ["universal", "dotnet",  "4.0"],
-      "powerpc-aix5.3.0.0"     => ["powerpc",   "aix",       "5"],
-      "powerpc-darwin7"        => ["powerpc",   "darwin",    "7"],
-      "powerpc-darwin8"        => ["powerpc",   "darwin",    "8"],
-      "powerpc-linux"          => ["powerpc",   "linux",     nil],
-      "powerpc64-linux"        => ["powerpc64", "linux",     nil],
-      "sparc-solaris2.10"      => ["sparc",     "solaris",   "2.10"],
-      "sparc-solaris2.8"       => ["sparc",     "solaris",   "2.8"],
-      "sparc-solaris2.9"       => ["sparc",     "solaris",   "2.9"],
-      "universal-darwin8"      => ["universal", "darwin",    "8"],
-      "universal-darwin9"      => ["universal", "darwin",    "9"],
-      "universal-macruby"      => ["universal", "macruby",   nil],
-      "i386-cygwin"            => ["x86",       "cygwin",    nil],
-      "i686-darwin"            => ["x86",       "darwin",    nil],
-      "i686-darwin8.4.1"       => ["x86",       "darwin",    "8"],
-      "i386-freebsd4.11"       => ["x86",       "freebsd",   "4"],
-      "i386-freebsd5"          => ["x86",       "freebsd",   "5"],
-      "i386-freebsd6"          => ["x86",       "freebsd",   "6"],
-      "i386-freebsd7"          => ["x86",       "freebsd",   "7"],
-      "i386-freebsd"           => ["x86",       "freebsd",   nil],
-      "universal-freebsd"      => ["universal", "freebsd",   nil],
-      "i386-java1.5"           => ["x86",       "java",      "1.5"],
-      "x86-java1.6"            => ["x86",       "java",      "1.6"],
-      "i386-java1.6"           => ["x86",       "java",      "1.6"],
-      "i686-linux"             => ["x86",       "linux",     nil],
-      "i586-linux"             => ["x86",       "linux",     nil],
-      "i486-linux"             => ["x86",       "linux",     nil],
-      "i386-linux"             => ["x86",       "linux",     nil],
-      "i586-linux-gnu"         => ["x86",       "linux",     "gnu"],
-      "i386-linux-gnu"         => ["x86",       "linux",     "gnu"],
-      "i386-mingw32"           => ["x86",       "mingw32",   nil],
-      "x64-mingw-ucrt"         => ["x64",       "mingw",     "ucrt"],
-      "i386-mswin32"           => ["x86",       "mswin32",   nil],
-      "i386-mswin32_80"        => ["x86",       "mswin32",   "80"],
-      "i386-mswin32-80"        => ["x86",       "mswin32",   "80"],
-      "x86-mswin32"            => ["x86",       "mswin32",   nil],
-      "x86-mswin32_60"         => ["x86",       "mswin32",   "60"],
-      "x86-mswin32-60"         => ["x86",       "mswin32",   "60"],
-      "i386-netbsdelf"         => ["x86",       "netbsdelf", nil],
-      "i386-openbsd4.0"        => ["x86",       "openbsd",   "4.0"],
-      "i386-solaris2.10"       => ["x86",       "solaris",   "2.10"],
-      "i386-solaris2.8"        => ["x86",       "solaris",   "2.8"],
-      "mswin32"                => ["x86",       "mswin32",   nil],
-      "x86_64-linux"           => ["x86_64",    "linux",     nil],
-      "x86_64-linux-gnu"       => ["x86_64",    "linux",     "gnu"],
-      "x86_64-linux-musl"      => ["x86_64",    "linux",     "musl"],
-      "x86_64-linux-uclibc"    => ["x86_64",    "linux",     "uclibc"],
-      "arm-linux-eabi"         => ["arm",       "linux",     "eabi"],
-      "arm-linux-gnueabi"      => ["arm",       "linux",     "gnueabi"],
-      "arm-linux-musleabi"     => ["arm",       "linux",     "musleabi"],
-      "arm-linux-uclibceabi"   => ["arm",       "linux",     "uclibceabi"],
-      "x86_64-openbsd3.9"      => ["x86_64",    "openbsd",   "3.9"],
-      "x86_64-openbsd4.0"      => ["x86_64",    "openbsd",   "4.0"],
-      "x86_64-openbsd"         => ["x86_64",    "openbsd",   nil],
+      "amd64-freebsd6" => ["amd64", "freebsd", "6"],
+      "java" => [nil, "java", nil],
+      "jruby" => [nil, "java", nil],
+      "universal-dotnet" => ["universal", "dotnet", nil],
+      "universal-dotnet2.0" => ["universal", "dotnet",  "2.0"],
+      "universal-dotnet4.0" => ["universal", "dotnet",  "4.0"],
+      "powerpc-aix5.3.0.0" => ["powerpc", "aix", "5"],
+      "powerpc-darwin7" => ["powerpc",   "darwin",    "7"],
+      "powerpc-darwin8" => ["powerpc",   "darwin",    "8"],
+      "powerpc-linux" => ["powerpc", "linux", nil],
+      "powerpc64-linux" => ["powerpc64", "linux", nil],
+      "sparc-solaris2.10" => ["sparc", "solaris", "2.10"],
+      "sparc-solaris2.8" => ["sparc",     "solaris",   "2.8"],
+      "sparc-solaris2.9" => ["sparc",     "solaris",   "2.9"],
+      "universal-darwin8" => ["universal", "darwin",    "8"],
+      "universal-darwin9" => ["universal", "darwin",    "9"],
+      "universal-macruby" => ["universal", "macruby",   nil],
+      "i386-cygwin" => ["x86",       "cygwin",    nil],
+      "i686-darwin" => ["x86",       "darwin",    nil],
+      "i686-darwin8.4.1" => ["x86",       "darwin",    "8"],
+      "i386-freebsd4.11" => ["x86",       "freebsd",   "4"],
+      "i386-freebsd5" => ["x86",       "freebsd",   "5"],
+      "i386-freebsd6" => ["x86",       "freebsd",   "6"],
+      "i386-freebsd7" => ["x86",       "freebsd",   "7"],
+      "i386-freebsd" => ["x86", "freebsd", nil],
+      "universal-freebsd" => ["universal", "freebsd", nil],
+      "i386-java1.5" => ["x86", "java", "1.5"],
+      "x86-java1.6" => ["x86", "java", "1.6"],
+      "i386-java1.6" => ["x86", "java", "1.6"],
+      "i686-linux" => ["x86",       "linux",     nil],
+      "i586-linux" => ["x86",       "linux",     nil],
+      "i486-linux" => ["x86",       "linux",     nil],
+      "i386-linux" => ["x86",       "linux",     nil],
+      "i586-linux-gnu" => ["x86",       "linux",     "gnu"],
+      "i386-linux-gnu" => ["x86",       "linux",     "gnu"],
+      "i386-mingw32" => ["x86", "mingw32", nil],
+      "x64-mingw-ucrt" => ["x64", "mingw", "ucrt"],
+      "i386-mswin32" => ["x86", "mswin32", nil],
+      "i386-mswin32_80" => ["x86",       "mswin32",   "80"],
+      "i386-mswin32-80" => ["x86",       "mswin32",   "80"],
+      "x86-mswin32" => ["x86", "mswin32", nil],
+      "x86-mswin32_60" => ["x86",       "mswin32",   "60"],
+      "x86-mswin32-60" => ["x86",       "mswin32",   "60"],
+      "i386-netbsdelf" => ["x86",       "netbsdelf", nil],
+      "i386-openbsd4.0" => ["x86", "openbsd", "4.0"],
+      "i386-solaris2.10" => ["x86", "solaris", "2.10"],
+      "i386-solaris2.8" => ["x86", "solaris", "2.8"],
+      "mswin32" => ["x86", "mswin32", nil],
+      "x86_64-linux" => ["x86_64", "linux", nil],
+      "x86_64-linux-gnu" => ["x86_64", "linux", "gnu"],
+      "x86_64-linux-musl" => ["x86_64", "linux", "musl"],
+      "x86_64-linux-uclibc" => ["x86_64", "linux", "uclibc"],
+      "arm-linux-eabi" => ["arm", "linux", "eabi"],
+      "arm-linux-gnueabi" => ["arm", "linux", "gnueabi"],
+      "arm-linux-musleabi" => ["arm", "linux", "musleabi"],
+      "arm-linux-uclibceabi" => ["arm", "linux", "uclibceabi"],
+      "x86_64-openbsd3.9" => ["x86_64",    "openbsd",   "3.9"],
+      "x86_64-openbsd4.0" => ["x86_64",    "openbsd",   "4.0"],
+      "x86_64-openbsd" => ["x86_64", "openbsd", nil],
     }
 
     test_cases.each do |arch, expected|

data/test/rubygems/test_gem_rdoc.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "rubygems"
 require_relative "helper"
 require "rubygems/rdoc"

data/test/rubygems/test_gem_remote_fetcher.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 
 require "webrick"
@@ -28,7 +29,7 @@ require "rubygems/package"
 class TestGemRemoteFetcher < Gem::TestCase
   include Gem::DefaultUserInteraction
 
-  SERVER_DATA = <<-EOY.freeze
+  SERVER_DATA = <<-EOY
 --- !ruby/object:Gem::Cache
 gems:
   rake-0.4.11: !ruby/object:Gem::Specification
@@ -1174,10 +1175,10 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
   def start_server(data)
     null_logger = NilLog.new
     s = WEBrick::HTTPServer.new(
-      :Port            => 0,
-      :DocumentRoot    => nil,
-      :Logger          => null_logger,
-      :AccessLog       => null_logger
+      :Port => 0,
+      :DocumentRoot => nil,
+      :Logger => null_logger,
+      :AccessLog => null_logger
     )
     s.mount_proc("/kill") {|req, res| s.shutdown }
     s.mount_proc("/yaml") do |req, res|

data/test/rubygems/test_gem_request.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/request"
 require "ostruct"
-require "base64"
 
 unless Gem::HAVE_OPENSSL
   warn "Skipping Gem::Request tests.  openssl not found."
@@ -20,6 +20,12 @@ class TestGemRequest < Gem::TestCase
     Gem::Request.create_with_proxy uri, request_class, last_modified, proxy
   end
 
+  # This method is same code as Base64.encode64
+  # We should not use Base64.encode64 because we need to avoid gem activation.
+  def base64_encode64(bin)
+    [bin].pack("m")
+  end
+
   def setup
     @proxies = %w[http_proxy https_proxy HTTP_PROXY http_proxy_user HTTP_PROXY_USER http_proxy_pass HTTP_PROXY_PASS no_proxy NO_PROXY]
     @old_proxies = @proxies.map {|k| ENV[k] }
@@ -208,7 +214,7 @@ class TestGemRequest < Gem::TestCase
     end
 
     auth_header = conn.payload["Authorization"]
-    assert_equal "Basic #{Base64.encode64('user:pass')}".strip, auth_header
+    assert_equal "Basic #{base64_encode64('user:pass')}".strip, auth_header
     assert_includes @ui.output, "GET https://user:REDACTED@example.rubygems/specs.#{Gem.marshal_version}"
   end
 
@@ -225,7 +231,7 @@ class TestGemRequest < Gem::TestCase
     end
 
     auth_header = conn.payload["Authorization"]
-    assert_equal "Basic #{Base64.encode64('user:{DEScede}pass')}".strip, auth_header
+    assert_equal "Basic #{base64_encode64('user:{DEScede}pass')}".strip, auth_header
     assert_includes @ui.output, "GET https://user:REDACTED@example.rubygems/specs.#{Gem.marshal_version}"
   end
 
@@ -242,7 +248,7 @@ class TestGemRequest < Gem::TestCase
     end
 
     auth_header = conn.payload["Authorization"]
-    assert_equal "Basic #{Base64.encode64('{DEScede}pass:x-oauth-basic')}".strip, auth_header
+    assert_equal "Basic #{base64_encode64('{DEScede}pass:x-oauth-basic')}".strip, auth_header
     assert_includes @ui.output, "GET https://REDACTED:x-oauth-basic@example.rubygems/specs.#{Gem.marshal_version}"
   end
 

data/test/rubygems/test_gem_request_connection_pools.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/request"
 require "timeout"

data/test/rubygems/test_gem_request_set.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/request_set"
 
@@ -110,7 +111,7 @@ Gems to install:
     end
 
     options = {
-      :gemdeps     => "gem.deps.rb",
+      :gemdeps => "gem.deps.rb",
       :install_dir => "#{@gemhome}2",
     }
 
@@ -575,7 +576,7 @@ ruby "0"
     rs.resolve
 
     options = {
-      :development         => true,
+      :development => true,
       :development_shallow => true,
     }
 

data/test/rubygems/test_gem_request_set_gem_dependency_api.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/request_set"
 
@@ -95,7 +96,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
 
     assert_equal [dep("a")], @set.dependencies
 
-    assert_equal %w[git/a master], @git_set.repositories["a"]
+    assert_equal ["git/a", nil], @git_set.repositories["a"]
 
     expected = { "a" => Gem::Requirement.create("!") }
 
@@ -107,7 +108,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
 
     assert_equal [dep("a")], @set.dependencies
 
-    assert_equal %w[https://example@bitbucket.org/example/repository.git master],
+    assert_equal ["https://example@bitbucket.org/example/repository.git", nil],
                  @git_set.repositories["a"]
 
     expected = { "a" => Gem::Requirement.create("!") }
@@ -120,7 +121,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
 
     assert_equal [dep("a")], @set.dependencies
 
-    assert_equal %w[https://example@bitbucket.org/example/example.git master],
+    assert_equal ["https://example@bitbucket.org/example/example.git", nil],
                  @git_set.repositories["a"]
 
     expected = { "a" => Gem::Requirement.create("!") }
@@ -145,7 +146,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
 
     assert_equal [dep("a")], @set.dependencies
 
-    assert_equal %w[https://gist.github.com/a.git master],
+    assert_equal ["https://gist.github.com/a.git", nil],
                  @git_set.repositories["a"]
   end
 
@@ -166,7 +167,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
 
     assert_equal [dep("a")], @set.dependencies
 
-    assert_equal %w[git/a master], @git_set.repositories["a"]
+    assert_equal ["git/a", nil], @git_set.repositories["a"]
     assert_equal %w[git/a], @git_set.need_submodules.keys
   end
 
@@ -183,7 +184,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
 
     assert_equal [dep("a")], @set.dependencies
 
-    assert_equal %w[https://github.com/example/repository.git master],
+    assert_equal ["https://github.com/example/repository.git", nil],
                  @git_set.repositories["a"]
 
     expected = { "a" => Gem::Requirement.create("!") }
@@ -196,7 +197,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
 
     assert_equal [dep("a")], @set.dependencies
 
-    assert_equal %w[https://github.com/example/example.git master],
+    assert_equal ["https://github.com/example/example.git", nil],
                  @git_set.repositories["a"]
 
     expected = { "a" => Gem::Requirement.create("!") }
@@ -609,8 +610,8 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
 
     assert_equal [dep("a"), dep("b")], @set.dependencies
 
-    assert_equal %w[git://example/repo.git master], @git_set.repositories["a"]
-    assert_equal %w[git://example/repo.git master], @git_set.repositories["b"]
+    assert_equal ["git://example/repo.git", nil], @git_set.repositories["a"]
+    assert_equal ["git://example/repo.git", nil], @git_set.repositories["b"]
   end
 
   def test_git_source
@@ -620,7 +621,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
 
     @gda.gem "a", :example => "repo"
 
-    assert_equal %w[git://example/repo.git master], @git_set.repositories["a"]
+    assert_equal ["git://example/repo.git", nil], @git_set.repositories["a"]
   end
 
   def test_group

data/test/rubygems/test_gem_request_set_lockfile.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/request_set"
 require "rubygems/request_set/lockfile"