rubygems-update 3.1.6 → 3.4.10

data/test/rubygems/test_gem_source.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
-require 'rubygems/source'
-require 'rubygems/indexer'
+require_relative "helper"
+require "rubygems/source"
+require "rubygems/indexer"
 
 class TestGemSource < Gem::TestCase
-
   def tuple(*args)
     Gem::NameTuple.new(*args)
   end
@@ -13,25 +12,25 @@ class TestGemSource < Gem::TestCase
     super
 
     @specs = spec_fetcher do |fetcher|
-      fetcher.spec 'a', '1.a'
-      fetcher.gem  'a', 1
-      fetcher.spec 'a', 2
-      fetcher.spec 'b', 2
+      fetcher.spec "a", "1.a"
+      fetcher.gem  "a", 1
+      fetcher.spec "a", 2
+      fetcher.spec "b", 2
     end
 
     @source = Gem::Source.new(@gem_repo)
   end
 
   def test_initialize_invalid_uri
-    assert_raises URI::InvalidURIError do
-      Gem::Source.new 'git@example:a.git'
+    assert_raise URI::InvalidURIError do
+      Gem::Source.new "git@example:a.git"
     end
   end
 
   def test_initialize_git
-    repository = 'git@example:a.git'
+    repository = "git@example:a.git"
 
-    source = Gem::Source::Git.new 'a', repository, 'master', false
+    source = Gem::Source::Git.new "a", repository, nil, false
 
     assert_equal repository, source.uri
   end
@@ -39,15 +38,15 @@ class TestGemSource < Gem::TestCase
   def test_cache_dir_escapes_windows_paths
     uri = URI.parse("file:///C:/WINDOWS/Temp/gem_repo")
     root = Gem.spec_cache_dir
-    cache_dir = @source.cache_dir(uri).gsub(root, '')
+    cache_dir = @source.cache_dir(uri).gsub(root, "")
     assert cache_dir !~ /:/, "#{cache_dir} should not contain a :"
   end
 
   def test_dependency_resolver_set_bundler_api
-    response = Net::HTTPResponse.new '1.1', 200, 'OK'
-    response.uri = URI('http://example') if response.respond_to? :uri
+    response = Net::HTTPResponse.new "1.1", 200, "OK"
+    response.uri = URI("http://example")
 
-    @fetcher.data["#{@gem_repo}api/v1/dependencies"] = response
+    @fetcher.data[@gem_repo] = response
 
     set = @source.dependency_resolver_set
 
@@ -55,8 +54,6 @@ class TestGemSource < Gem::TestCase
   end
 
   def test_dependency_resolver_set_file_uri
-    skip 'install builder gem' unless defined? Builder::XChar
-
     Gem::Indexer.new(@tempdir).generate_index
 
     source = Gem::Source.new "file://#{@tempdir}/"
@@ -73,11 +70,11 @@ class TestGemSource < Gem::TestCase
   end
 
   def test_fetch_spec
-    a1 = @specs['a-1']
+    a1 = @specs["a-1"]
 
     spec_uri = "#{@gem_repo}#{Gem::MARSHAL_SPEC_DIR}#{a1.spec_name}"
 
-    spec = @source.fetch_spec tuple('a', Gem::Version.new(1), 'ruby')
+    spec = @source.fetch_spec tuple("a", Gem::Version.new(1), "ruby")
     assert_equal a1.full_name, spec.full_name
 
     cache_dir = @source.cache_dir URI.parse(spec_uri)
@@ -88,7 +85,7 @@ class TestGemSource < Gem::TestCase
   end
 
   def test_fetch_spec_cached
-    a1 = @specs['a-1']
+    a1 = @specs["a-1"]
 
     spec_uri = "#{@gem_repo}/#{Gem::MARSHAL_SPEC_DIR}#{a1.spec_name}"
     @fetcher.data["#{spec_uri}.rz"] = nil
@@ -98,11 +95,11 @@ class TestGemSource < Gem::TestCase
 
     cache_file = File.join cache_dir, a1.spec_name
 
-    File.open cache_file, 'wb' do |io|
+    File.open cache_file, "wb" do |io|
       Marshal.dump a1, io
     end
 
-    spec = @source.fetch_spec tuple('a', Gem::Version.new(1), 'ruby')
+    spec = @source.fetch_spec tuple("a", Gem::Version.new(1), "ruby")
     assert_equal a1.full_name, spec.full_name
   end
 
@@ -111,24 +108,24 @@ class TestGemSource < Gem::TestCase
       fetcher.legacy_platform
     end
 
-    spec = @source.fetch_spec tuple('pl', Gem::Version.new(1), 'i386-linux')
+    spec = @source.fetch_spec tuple("pl", Gem::Version.new(1), "i386-linux")
 
-    assert_equal specs['pl-1-x86-linux'].full_name, spec.full_name
+    assert_equal specs["pl-1-x86-linux"].full_name, spec.full_name
   end
 
   def test_fetch_spec_platform_ruby
-    spec = @source.fetch_spec tuple('a', Gem::Version.new(1), nil)
-    assert_equal @specs['a-1'].full_name, spec.full_name
+    spec = @source.fetch_spec tuple("a", Gem::Version.new(1), nil)
+    assert_equal @specs["a-1"].full_name, spec.full_name
 
-    spec = @source.fetch_spec tuple('a', Gem::Version.new(1), '')
-    assert_equal @specs['a-1'].full_name, spec.full_name
+    spec = @source.fetch_spec tuple("a", Gem::Version.new(1), "")
+    assert_equal @specs["a-1"].full_name, spec.full_name
   end
 
   def test_load_specs
-    released = @source.load_specs(:released).map { |spec| spec.full_name }
+    released = @source.load_specs(:released).map {|spec| spec.full_name }
     assert_equal %W[a-2 a-1 b-2], released
 
-    cache_dir = File.join Gem.spec_cache_dir, 'gems.example.com%80'
+    cache_dir = File.join Gem.spec_cache_dir, "gems.example.com%80"
     assert File.exist?(cache_dir), "#{cache_dir} does not exist"
 
     cache_file = File.join cache_dir, "specs.#{Gem.marshal_version}"
@@ -139,19 +136,19 @@ class TestGemSource < Gem::TestCase
     latest_specs = @source.load_specs :latest
 
     # Make sure the cached version is actually different:
-    latest_specs << Gem::NameTuple.new('cached', Gem::Version.new('1.0.0'), 'ruby')
+    latest_specs << Gem::NameTuple.new("cached", Gem::Version.new("1.0.0"), "ruby")
 
     @fetcher.data["#{@gem_repo}latest_specs.#{Gem.marshal_version}.gz"] = nil
     @fetcher.data["#{@gem_repo}latest_specs.#{Gem.marshal_version}"] =
-      ' ' * Marshal.dump(latest_specs).length
+      " " * Marshal.dump(latest_specs).length
 
-    cache_dir = File.join Gem.spec_cache_dir, 'gems.example.com%80'
+    cache_dir = File.join Gem.spec_cache_dir, "gems.example.com%80"
 
     FileUtils.mkdir_p cache_dir
 
     cache_file = File.join cache_dir, "latest_specs.#{Gem.marshal_version}"
 
-    File.open cache_file, 'wb' do |io|
+    File.open cache_file, "wb" do |io|
       Marshal.dump latest_specs, io
     end
 
@@ -164,18 +161,18 @@ class TestGemSource < Gem::TestCase
     latest_specs = @source.load_specs :latest
 
     # Make sure the cached version is actually different:
-    latest_specs << Gem::NameTuple.new('fixed', Gem::Version.new('1.0.0'), 'ruby')
+    latest_specs << Gem::NameTuple.new("fixed", Gem::Version.new("1.0.0"), "ruby")
     # Setup valid data on the 'remote'
     @fetcher.data["#{@gem_repo}latest_specs.#{Gem.marshal_version}.gz"] =
           util_gzip(Marshal.dump(latest_specs))
 
-    cache_dir = File.join Gem.spec_cache_dir, 'gems.example.com%80'
+    cache_dir = File.join Gem.spec_cache_dir, "gems.example.com%80"
 
     FileUtils.mkdir_p cache_dir
 
     cache_file = File.join cache_dir, "latest_specs.#{Gem.marshal_version}"
 
-    File.open cache_file, 'wb' do |io|
+    File.open cache_file, "wb" do |io|
       # Setup invalid data in the cache:
       io.write Marshal.dump(latest_specs)[0, 10]
     end
@@ -188,41 +185,41 @@ class TestGemSource < Gem::TestCase
   def test_load_specs_from_unavailable_uri
     src = Gem::Source.new("http://not-there.nothing")
 
-    assert_raises Gem::RemoteFetcher::FetchError do
+    assert_raise Gem::RemoteFetcher::FetchError do
       src.load_specs :latest
     end
   end
 
   def test_spaceship
     remote    = @source
-    specific  = Gem::Source::SpecificFile.new @specs['a-1'].cache_file
+    specific  = Gem::Source::SpecificFile.new @specs["a-1"].cache_file
     installed = Gem::Source::Installed.new
     local     = Gem::Source::Local.new
 
-    assert_equal(0, remote.   <=>(remote),    'remote    <=> remote')
+    assert_equal(0, remote.<=>(remote), "remote <=> remote")
 
-    assert_equal(-1, remote.   <=>(specific),  'remote    <=> specific')
-    assert_equal(1, specific. <=>(remote),    'specific  <=> remote')
+    assert_equal(-1, remote.<=>(specific), "remote <=> specific")
+    assert_equal(1, specific.<=>(remote), "specific <=> remote")
 
-    assert_equal(-1, remote.   <=>(local),     'remote    <=> local')
-    assert_equal(1, local.    <=>(remote),    'local     <=> remote')
+    assert_equal(-1, remote.<=>(local), "remote <=> local")
+    assert_equal(1, local.<=>(remote), "local <=> remote")
 
-    assert_equal(-1, remote.   <=>(installed), 'remote    <=> installed')
-    assert_equal(1, installed.<=>(remote),    'installed <=> remote')
+    assert_equal(-1, remote.<=>(installed), "remote <=> installed")
+    assert_equal(1, installed.<=>(remote), "installed <=> remote")
 
     no_uri = @source.dup
     no_uri.instance_variable_set :@uri, nil
 
-    assert_equal(-1, remote.   <=>(no_uri),    'remote <=> no_uri')
+    assert_equal(-1, remote.<=>(no_uri), "remote <=> no_uri")
   end
 
   def test_spaceship_order_is_preserved_when_uri_differs
     sourceA = Gem::Source.new "http://example.com/a"
     sourceB = Gem::Source.new "http://example.com/b"
 
-    assert_equal(0, sourceA. <=>(sourceA), 'sourceA <=> sourceA')
-    assert_equal(1, sourceA. <=>(sourceB), 'sourceA <=> sourceB')
-    assert_equal(1, sourceB. <=>(sourceA), 'sourceB <=> sourceA')
+    assert_equal(0, sourceA.<=>(sourceA), "sourceA <=> sourceA")
+    assert_equal(1, sourceA.<=>(sourceB), "sourceA <=> sourceB")
+    assert_equal(1, sourceB.<=>(sourceA), "sourceB <=> sourceA")
   end
 
   def test_update_cache_eh
@@ -243,10 +240,14 @@ class TestGemSource < Gem::TestCase
     refute rubygems_source.typo_squatting?("rubysertgems.org")
   end
 
+  def test_typo_squatting_false_positive
+    rubygems_source = Gem::Source.new("https://rubygems.org")
+    refute rubygems_source.typo_squatting?("rubygems.org")
+  end
+
   def test_typo_squatting_custom_distance_threshold
     rubygems_source = Gem::Source.new("https://rubgems.org")
     distance_threshold = 5
     assert rubygems_source.typo_squatting?("rubysertgems.org", distance_threshold)
   end
-
 end

data/test/rubygems/test_gem_source_fetch_problem.rb

@@ -1,28 +1,36 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
+require_relative "helper"
 
 class TestGemSourceFetchProblem < Gem::TestCase
-
   def test_exception
     source = Gem::Source.new @gem_repo
-    error  = RuntimeError.new 'test'
+    error  = RuntimeError.new "test"
 
     sf = Gem::SourceFetchProblem.new source, error
 
-    e = assert_raises RuntimeError do
+    e = assert_raise RuntimeError do
       raise sf
     end
 
-    assert_equal 'test', e.message
+    assert_equal "test", e.message
   end
 
   def test_password_redacted
-    source = Gem::Source.new 'https://username:secret@gemsource.com'
-    error  = RuntimeError.new 'test'
+    source = Gem::Source.new "https://username:secret@gemsource.com"
+    error  = RuntimeError.new "test"
 
     sf = Gem::SourceFetchProblem.new source, error
 
-    refute_match sf.wordy, 'secret'
+    refute_match sf.wordy, "secret"
   end
 
+  def test_source_password_no_redacted
+    source = Gem::Source.new "https://username:secret@gemsource.com"
+    error  = RuntimeError.new "test"
+
+    sf = Gem::SourceFetchProblem.new source, error
+    sf.wordy
+
+    assert_match "secret", source.uri.to_s
+  end
 end

data/test/rubygems/test_gem_source_git.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
-require 'rubygems/source'
+require_relative "helper"
+require "rubygems/source"
 
 class TestGemSourceGit < Gem::TestCase
-
   def setup
     super
 
@@ -11,36 +10,37 @@ class TestGemSourceGit < Gem::TestCase
 
     @hash = Digest::SHA1.hexdigest @repository
 
-    @source = Gem::Source::Git.new @name, @repository, 'master', false
+    @source = Gem::Source::Git.new @name, @repository, nil, false
   end
 
   def test_base_dir
-    assert_equal File.join(Gem.dir, 'bundler'), @source.base_dir
+    assert_equal File.join(Gem.dir, "bundler"), @source.base_dir
 
     @source.root_dir = "#{@gemhome}2"
 
-    assert_equal File.join("#{@gemhome}2", 'bundler'), @source.base_dir
+    assert_equal File.join("#{@gemhome}2", "bundler"), @source.base_dir
   end
 
   def test_checkout
     @source.checkout
 
-    assert_path_exists File.join @source.install_dir, 'a.gemspec'
+    assert_path_exist File.join @source.install_dir, "a.gemspec"
   end
 
-  def test_checkout_master
+  def test_checkout_default
     Dir.chdir @repository do
-      system @git, 'checkout', '-q', '-b', 'other'
-      system @git, 'mv',             'a.gemspec', 'b.gemspec'
-      system @git, 'commit',   '-q', '-a', '-m', 'rename gemspec'
-      system @git, 'checkout', '-q', 'master'
+      default_branch = Gem::Util.popen(@git, "branch", "--show-current").strip
+      system @git, "checkout", "-q", "-b", "other"
+      system @git, "mv",             "a.gemspec", "b.gemspec"
+      system @git, "commit",   "-q", "-a", "-m", "rename gemspec"
+      system @git, "checkout", "-q", default_branch
     end
 
-    @source = Gem::Source::Git.new @name, @repository, 'other', false
+    @source = Gem::Source::Git.new @name, @repository, "other", false
 
     @source.checkout
 
-    assert_path_exists File.join @source.install_dir, 'b.gemspec'
+    assert_path_exist File.join @source.install_dir, "b.gemspec"
   end
 
   def test_checkout_local
@@ -48,9 +48,9 @@ class TestGemSourceGit < Gem::TestCase
 
     @source.checkout
 
-    install_dir = File.join Gem.dir, 'bundler', 'gems', "a-#{@head[0..11]}"
+    install_dir = File.join Gem.dir, "bundler", "gems", "a-#{@head[0..11]}"
 
-    refute_path_exists File.join install_dir, 'a.gemspec'
+    assert_path_not_exist File.join install_dir, "a.gemspec"
   end
 
   def test_checkout_local_cached
@@ -60,33 +60,40 @@ class TestGemSourceGit < Gem::TestCase
 
     @source.checkout
 
-    assert_path_exists File.join @source.install_dir, 'a.gemspec'
+    assert_path_exist File.join @source.install_dir, "a.gemspec"
   end
 
   def test_checkout_submodules
-    source = Gem::Source::Git.new @name, @repository, 'master', true
+    # We need to allow to checkout submodules with file:// protocol
+    # CVE-2022-39253
+    # https://lore.kernel.org/lkml/xmqq4jw1uku5.fsf@gitster.g/
+    system(@git, *%W[config --global protocol.file.allow always])
+
+    source = Gem::Source::Git.new @name, @repository, nil, true
 
-    git_gem 'b'
+    git_gem "b"
 
-    Dir.chdir 'git/a' do
-      Gem::Util.silent_system @git, 'submodule', '--quiet',
-                              'add', File.expand_path('../b'), 'b'
-      system @git, 'commit', '--quiet', '-m', 'add submodule b'
+    Dir.chdir "git/a" do
+      require "open3"
+      output, status = Open3.capture2e(@git, "submodule", "--quiet", "add", File.expand_path("../b"), "b")
+      assert status.success?, output
+
+      system @git, "commit", "--quiet", "-m", "add submodule b"
     end
 
     source.checkout
 
-    assert_path_exists File.join source.install_dir, 'a.gemspec'
-    assert_path_exists File.join source.install_dir, 'b/b.gemspec'
+    assert_path_exist File.join source.install_dir, "a.gemspec"
+    assert_path_exist File.join source.install_dir, "b/b.gemspec"
   end
 
   def test_cache
     assert @source.cache
 
-    assert_path_exists @source.repo_cache_dir
+    assert_path_exist @source.repo_cache_dir
 
     Dir.chdir @source.repo_cache_dir do
-      assert_equal @head, Gem::Util.popen(@git, 'rev-parse', 'master').strip
+      assert_equal @head, Gem::Util.popen(@git, "rev-parse", "HEAD").strip
     end
   end
 
@@ -95,7 +102,7 @@ class TestGemSourceGit < Gem::TestCase
 
     @source.cache
 
-    refute_path_exists @source.repo_cache_dir
+    assert_path_not_exist @source.repo_cache_dir
   end
 
   def test_dir_shortref
@@ -114,17 +121,17 @@ class TestGemSourceGit < Gem::TestCase
     assert_equal @source, @source.dup
 
     source =
-      Gem::Source::Git.new @source.name, @source.repository, 'other', false
+      Gem::Source::Git.new @source.name, @source.repository, "other", false
 
     refute_equal @source, source
 
     source =
-      Gem::Source::Git.new @source.name, 'repo/other', @source.reference, false
+      Gem::Source::Git.new @source.name, "repo/other", @source.reference, false
 
     refute_equal @source, source
 
     source =
-      Gem::Source::Git.new 'b', @source.repository, @source.reference, false
+      Gem::Source::Git.new "b", @source.repository, @source.reference, false
 
     refute_equal @source, source
 
@@ -138,7 +145,7 @@ class TestGemSourceGit < Gem::TestCase
   def test_install_dir
     @source.cache
 
-    expected = File.join Gem.dir, 'bundler', 'gems', "a-#{@head[0..11]}"
+    expected = File.join Gem.dir, "bundler", "gems", "a-#{@head[0..11]}"
 
     assert_equal expected, @source.install_dir
   end
@@ -151,14 +158,14 @@ class TestGemSourceGit < Gem::TestCase
 
   def test_repo_cache_dir
     expected =
-      File.join Gem.dir, 'cache', 'bundler', 'git', "a-#{@hash}"
+      File.join Gem.dir, "cache", "bundler", "git", "a-#{@hash}"
 
     assert_equal expected, @source.repo_cache_dir
 
     @source.root_dir = "#{@gemhome}2"
 
     expected =
-      File.join "#{@gemhome}2", 'cache', 'bundler', 'git', "a-#{@hash}"
+      File.join "#{@gemhome}2", "cache", "bundler", "git", "a-#{@hash}"
 
     assert_equal expected, @source.repo_cache_dir
   end
@@ -169,25 +176,25 @@ class TestGemSourceGit < Gem::TestCase
     assert_equal @head, @source.rev_parse
 
     Dir.chdir @repository do
-      system @git, 'checkout', '--quiet', '-b', 'other'
+      system @git, "checkout", "--quiet", "-b", "other"
     end
 
-    master_head = @head
+    default_head = @head
 
-    git_gem 'a', 2
+    git_gem "a", 2
 
-    source = Gem::Source::Git.new @name, @repository, 'other', false
+    source = Gem::Source::Git.new @name, @repository, "other", false
 
     source.cache
 
-    refute_equal master_head, source.rev_parse
+    refute_equal default_head, source.rev_parse
 
-    source = Gem::Source::Git.new @name, @repository, 'nonexistent', false
+    source = Gem::Source::Git.new @name, @repository, "nonexistent", false
 
     source.cache
 
-    e = assert_raises Gem::Exception do
-      capture_subprocess_io {source.rev_parse}
+    e = assert_raise Gem::Exception do
+      capture_subprocess_io { source.rev_parse }
     end
 
     assert_equal "unable to find reference nonexistent in #{@repository}",
@@ -203,59 +210,59 @@ class TestGemSourceGit < Gem::TestCase
   end
 
   def test_spaceship
-    git       = Gem::Source::Git.new 'a', 'git/a', 'master', false
+    git       = Gem::Source::Git.new "a", "git/a", nil, false
     remote    = Gem::Source.new @gem_repo
     installed = Gem::Source::Installed.new
-    vendor    = Gem::Source::Vendor.new 'vendor/foo'
+    vendor    = Gem::Source::Vendor.new "vendor/foo"
 
-    assert_equal(0, git.      <=>(git),       'git    <=> git')
+    assert_equal(0, git.<=>(git),       "git <=> git")
 
-    assert_equal(1, git.      <=>(remote),    'git    <=> remote')
-    assert_equal(-1, remote.   <=>(git),       'remote <=> git')
+    assert_equal(1, git.<=>(remote),    "git <=> remote")
+    assert_equal(-1, remote.<=>(git), "remote <=> git")
 
-    assert_equal(1, git.      <=>(installed), 'git       <=> installed')
-    assert_equal(-1, installed.<=>(git),       'installed <=> git')
+    assert_equal(1, git.<=>(installed), "git <=> installed")
+    assert_equal(-1, installed.<=>(git), "installed <=> git")
 
-    assert_equal(-1, git.      <=>(vendor),    'git       <=> vendor')
-    assert_equal(1, vendor.   <=>(git),       'vendor    <=> git')
+    assert_equal(-1, git.<=>(vendor), "git <=> vendor")
+    assert_equal(1, vendor.<=>(git), "vendor <=> git")
   end
 
   def test_specs
-    source = Gem::Source::Git.new @name, @repository, 'master', true
+    source = Gem::Source::Git.new @name, @repository, nil, true
 
-    Dir.chdir 'git/a' do
-      FileUtils.mkdir 'b'
+    Dir.chdir "git/a" do
+      FileUtils.mkdir "b"
 
-      Dir.chdir 'b' do
-        b = Gem::Specification.new 'b', 1
+      Dir.chdir "b" do
+        b = Gem::Specification.new "b", 1
 
-        File.open 'b.gemspec', 'w' do |io|
+        File.open "b.gemspec", "w" do |io|
           io.write b.to_ruby
         end
 
-        system @git, 'add', 'b.gemspec'
-        system @git, 'commit', '--quiet', '-m', 'add b/b.gemspec'
+        system @git, "add", "b.gemspec"
+        system @git, "commit", "--quiet", "-m", "add b/b.gemspec"
       end
     end
 
     specs = nil
 
-    capture_io do
+    capture_output do
       specs = source.specs
     end
 
-    assert_equal %w[a-1 b-1], specs.map { |spec| spec.full_name }
+    assert_equal %w[a-1 b-1], specs.map {|spec| spec.full_name }
 
     a_spec = specs.shift
 
     base_dir = File.dirname File.dirname source.install_dir
 
     assert_equal source.install_dir, a_spec.full_gem_path
-    assert_equal File.join(source.install_dir, 'a.gemspec'), a_spec.loaded_from
+    assert_equal File.join(source.install_dir, "a.gemspec"), a_spec.loaded_from
     assert_equal base_dir, a_spec.base_dir
 
     extension_dir =
-      File.join Gem.dir, 'bundler', 'extensions',
+      File.join Gem.dir, "bundler", "extensions",
         Gem::Platform.local.to_s, Gem.extension_api_version,
         "a-#{source.dir_shortref}"
 
@@ -263,8 +270,8 @@ class TestGemSourceGit < Gem::TestCase
 
     b_spec = specs.shift
 
-    assert_equal File.join(source.install_dir, 'b'), b_spec.full_gem_path
-    assert_equal File.join(source.install_dir, 'b', 'b.gemspec'),
+    assert_equal File.join(source.install_dir, "b"), b_spec.full_gem_path
+    assert_equal File.join(source.install_dir, "b", "b.gemspec"),
                  b_spec.loaded_from
     assert_equal base_dir, b_spec.base_dir
 
@@ -272,10 +279,10 @@ class TestGemSourceGit < Gem::TestCase
   end
 
   def test_specs_local
-    source = Gem::Source::Git.new @name, @repository, 'master', true
+    source = Gem::Source::Git.new @name, @repository, nil, true
     source.remote = false
 
-    capture_io do
+    capture_output do
       assert_empty source.specs
     end
   end
@@ -288,16 +295,15 @@ class TestGemSourceGit < Gem::TestCase
     assert_equal @hash, @source.uri_hash
 
     source =
-      Gem::Source::Git.new 'a', 'http://git@example/repo.git', 'master', false
+      Gem::Source::Git.new "a", "http://git@example/repo.git", nil, false
 
-    assert_equal '291c4caac7feba8bb64c297987028acb3dde6cfe',
+    assert_equal "291c4caac7feba8bb64c297987028acb3dde6cfe",
                  source.uri_hash
 
     source =
-      Gem::Source::Git.new 'a', 'HTTP://git@EXAMPLE/repo.git', 'master', false
+      Gem::Source::Git.new "a", "HTTP://git@EXAMPLE/repo.git", nil, false
 
-    assert_equal '291c4caac7feba8bb64c297987028acb3dde6cfe',
+    assert_equal "291c4caac7feba8bb64c297987028acb3dde6cfe",
                  source.uri_hash
   end
-
 end