diff options
Diffstat (limited to 'test/rubygems/test_gem_dependency_installer.rb')
-rw-r--r-- | test/rubygems/test_gem_dependency_installer.rb | 214 |
1 files changed, 124 insertions, 90 deletions
diff --git a/test/rubygems/test_gem_dependency_installer.rb b/test/rubygems/test_gem_dependency_installer.rb index 2b0b874b2d..8999723ba1 100644 --- a/test/rubygems/test_gem_dependency_installer.rb +++ b/test/rubygems/test_gem_dependency_installer.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require_relative "helper" require "rubygems/dependency_installer" require "rubygems/security" @@ -74,7 +75,7 @@ class TestGemDependencyInstaller < Gem::TestCase @fetcher.data["http://gems.example.com/gems/a-10.a.gem"] = p1a_data dep = Gem::Dependency.new "a" - inst = Gem::DependencyInstaller.new :prerelease => true + inst = Gem::DependencyInstaller.new prerelease: true inst.install dep assert_equal %w[a-10.a], Gem::Specification.map(&:full_name) @@ -96,7 +97,7 @@ class TestGemDependencyInstaller < Gem::TestCase dep = Gem::Dependency.new "a" - inst = Gem::DependencyInstaller.new :prerelease => true + inst = Gem::DependencyInstaller.new prerelease: true inst.install dep assert_equal %w[a-1.b b-1.b c-1.1.b], Gem::Specification.map(&:full_name) @@ -131,7 +132,7 @@ class TestGemDependencyInstaller < Gem::TestCase @fetcher.data["http://gems.example.com/gems/a-1.gem"] = p1a_data dep = Gem::Dependency.new "a" - inst = Gem::DependencyInstaller.new :prerelease => true + inst = Gem::DependencyInstaller.new prerelease: true inst.install dep assert_equal %w[a-1], Gem::Specification.map(&:full_name) @@ -152,11 +153,11 @@ class TestGemDependencyInstaller < Gem::TestCase inst = nil Dir.chdir @tempdir do - inst = Gem::DependencyInstaller.new :ignore_dependencies => true + inst = Gem::DependencyInstaller.new ignore_dependencies: true inst.install "b" end - assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name }, + assert_equal %w[b-1], inst.installed_gems.map(&:full_name), "sanity check" Dir.chdir @tempdir do @@ -164,7 +165,7 @@ class TestGemDependencyInstaller < Gem::TestCase inst.install "e" end - assert_equal %w[a-1 e-1], inst.installed_gems.map {|s| s.full_name } + assert_equal %w[a-1 e-1], inst.installed_gems.map(&:full_name) end def test_install_cache_dir @@ -177,11 +178,11 @@ class TestGemDependencyInstaller < Gem::TestCase inst = nil Dir.chdir dir do - inst = Gem::DependencyInstaller.new :cache_dir => @tempdir + inst = Gem::DependencyInstaller.new cache_dir: @tempdir inst.install "b" end - assert_equal %w[a-1 b-1], inst.installed_gems.map {|s| s.full_name } + assert_equal %w[a-1 b-1], inst.installed_gems.map(&:full_name) assert File.exist? File.join(@gemhome, "cache", @a1.file_name) assert File.exist? File.join(@gemhome, "cache", @b1.file_name) @@ -197,7 +198,7 @@ class TestGemDependencyInstaller < Gem::TestCase Gem::Specification.reset FileUtils.mv @a1_gem, @tempdir - FileUtils.mv a2_gem, @tempdir # not in index + FileUtils.mv a2_gem, @tempdir # not in index FileUtils.mv @b1_gem, @tempdir inst = nil @@ -206,7 +207,7 @@ class TestGemDependencyInstaller < Gem::TestCase inst.install "a", req("= 2") end - assert_equal %w[a-2], inst.installed_gems.map {|s| s.full_name }, + assert_equal %w[a-2], inst.installed_gems.map(&:full_name), "sanity check" FileUtils.rm File.join(@tempdir, a2.file_name) @@ -217,7 +218,7 @@ class TestGemDependencyInstaller < Gem::TestCase end assert_equal %w[a-2 b-1], Gem::Specification.map(&:full_name) - assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name } + assert_equal %w[b-1], inst.installed_gems.map(&:full_name) end # This asserts that if a gem's dependency is satisfied by an @@ -236,7 +237,7 @@ class TestGemDependencyInstaller < Gem::TestCase Gem::Specification.reset FileUtils.mv @a1_gem, @tempdir - FileUtils.mv a2_gem, @tempdir # not in index + FileUtils.mv a2_gem, @tempdir # not in index FileUtils.mv @b1_gem, @tempdir FileUtils.mv a3_gem, @tempdir @@ -254,7 +255,7 @@ class TestGemDependencyInstaller < Gem::TestCase end assert_equal %w[a-2 b-1], Gem::Specification.map(&:full_name) - assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name } + assert_equal %w[b-1], inst.installed_gems.map(&:full_name) end def test_install_dependency @@ -273,11 +274,11 @@ class TestGemDependencyInstaller < Gem::TestCase FileUtils.mv @b1_gem, @tempdir Dir.chdir @tempdir do - inst = Gem::DependencyInstaller.new(:build_docs_in_background => false) + inst = Gem::DependencyInstaller.new(build_docs_in_background: false) inst.install "b" end - assert_equal %w[a-1 b-1], inst.installed_gems.map {|s| s.full_name } + assert_equal %w[a-1 b-1], inst.installed_gems.map(&:full_name) assert done_installing_ran, "post installs hook was not run" end @@ -293,11 +294,11 @@ class TestGemDependencyInstaller < Gem::TestCase inst = nil Dir.chdir @tempdir do - inst = Gem::DependencyInstaller.new(:development => true) + inst = Gem::DependencyInstaller.new(development: true) inst.install "b" end - assert_equal %w[a-1 aa-1 b-1], inst.installed_gems.map {|s| s.full_name } + assert_equal %w[a-1 aa-1 b-1], inst.installed_gems.map(&:full_name) end def test_install_dependency_development_deep @@ -313,11 +314,11 @@ class TestGemDependencyInstaller < Gem::TestCase inst = nil Dir.chdir @tempdir do - inst = Gem::DependencyInstaller.new(:development => true) + inst = Gem::DependencyInstaller.new(development: true) inst.install "d" end - assert_equal %w[a-1 aa-1 b-1 c-1 d-1], inst.installed_gems.map {|s| s.full_name } + assert_equal %w[a-1 aa-1 b-1 c-1 d-1], inst.installed_gems.map(&:full_name) end def test_install_dependency_development_shallow @@ -333,11 +334,11 @@ class TestGemDependencyInstaller < Gem::TestCase inst = nil Dir.chdir @tempdir do - inst = Gem::DependencyInstaller.new(:development => true, :dev_shallow => true) + inst = Gem::DependencyInstaller.new(development: true, dev_shallow: true) inst.install "d" end - assert_equal %w[c-1 d-1], inst.installed_gems.map {|s| s.full_name } + assert_equal %w[c-1 d-1], inst.installed_gems.map(&:full_name) end def test_install_dependency_existing @@ -353,7 +354,7 @@ class TestGemDependencyInstaller < Gem::TestCase inst.install "b" end - assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name } + assert_equal %w[b-1], inst.installed_gems.map(&:full_name) end def test_install_dependency_existing_extension @@ -390,7 +391,7 @@ class TestGemDependencyInstaller < Gem::TestCase Dir.chdir pwd end - assert_equal %w[f-1], inst.installed_gems.map {|s| s.full_name } + assert_equal %w[f-1], inst.installed_gems.map(&:full_name) assert_path_exist e1.extension_dir end @@ -410,7 +411,7 @@ class TestGemDependencyInstaller < Gem::TestCase inst.install "f" end - assert_equal %w[f-2], inst.installed_gems.map {|s| s.full_name } + assert_equal %w[f-2], inst.installed_gems.map(&:full_name) end def test_install_local @@ -420,11 +421,11 @@ class TestGemDependencyInstaller < Gem::TestCase inst = nil Dir.chdir @tempdir do - inst = Gem::DependencyInstaller.new :domain => :local + inst = Gem::DependencyInstaller.new domain: :local inst.install "a-1.gem" end - assert_equal %w[a-1], inst.installed_gems.map {|s| s.full_name } + assert_equal %w[a-1], inst.installed_gems.map(&:full_name) end def test_install_local_prerelease @@ -434,11 +435,11 @@ class TestGemDependencyInstaller < Gem::TestCase inst = nil Dir.chdir @tempdir do - inst = Gem::DependencyInstaller.new :domain => :local + inst = Gem::DependencyInstaller.new domain: :local inst.install "a-1.a.gem" end - assert_equal %w[a-1.a], inst.installed_gems.map {|s| s.full_name } + assert_equal %w[a-1.a], inst.installed_gems.map(&:full_name) end def test_install_local_dependency @@ -450,11 +451,11 @@ class TestGemDependencyInstaller < Gem::TestCase inst = nil Dir.chdir @tempdir do - inst = Gem::DependencyInstaller.new :domain => :local + inst = Gem::DependencyInstaller.new domain: :local inst.install "b-1.gem" end - assert_equal %w[a-1 b-1], inst.installed_gems.map {|s| s.full_name } + assert_equal %w[a-1 b-1], inst.installed_gems.map(&:full_name) end def test_install_local_dependency_installed @@ -468,11 +469,45 @@ class TestGemDependencyInstaller < Gem::TestCase Dir.chdir @tempdir do Gem::Installer.at("a-1.gem").install - inst = Gem::DependencyInstaller.new :domain => :local + inst = Gem::DependencyInstaller.new domain: :local inst.install "b-1.gem" end - assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name } + assert_equal %w[b-1], inst.installed_gems.map(&:full_name) + end + + def test_install_local_dependency_no_network_for_target_gem + a1, a1_gem = util_gem "a", "1" + _, b1_gem = util_gem "b", "1" do |s| + s.add_dependency "a" + end + + util_setup_spec_fetcher(a1) + + a1_data = Gem.read_binary(a1_gem) + @fetcher.data["http://gems.example.com/gems/a-1.gem"] = a1_data + + # compact index is available + compact_index_response = Gem::Net::HTTPResponse.new "1.1", 200, "OK" + compact_index_response.uri = Gem::URI("http://gems.example.com") + @fetcher.data["http://gems.example.com/"] = compact_index_response + + # but private local gem not present there + @fetcher.data["http://gems.example.com/info/b"] = + proc do + raise "should not happen" + end + + FileUtils.mv b1_gem, @tempdir + + inst = nil + + Dir.chdir @tempdir do + inst = Gem::DependencyInstaller.new + inst.install "b-1.gem" + end + + assert_equal %w[a-1 b-1], inst.installed_gems.map(&:full_name) end def test_install_local_subdir @@ -481,11 +516,11 @@ class TestGemDependencyInstaller < Gem::TestCase inst = nil Dir.chdir @tempdir do - inst = Gem::DependencyInstaller.new :domain => :local + inst = Gem::DependencyInstaller.new domain: :local inst.install "gems/a-1.gem" end - assert_equal %w[a-1], inst.installed_gems.map {|s| s.full_name } + assert_equal %w[a-1], inst.installed_gems.map(&:full_name) end def test_install_minimal_deps @@ -507,19 +542,19 @@ class TestGemDependencyInstaller < Gem::TestCase inst = nil Dir.chdir @tempdir do - inst = Gem::DependencyInstaller.new :ignore_dependencies => true + inst = Gem::DependencyInstaller.new ignore_dependencies: true inst.install "b", req("= 1") end - assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name }, + assert_equal %w[b-1], inst.installed_gems.map(&:full_name), "sanity check" Dir.chdir @tempdir do - inst = Gem::DependencyInstaller.new :minimal_deps => true + inst = Gem::DependencyInstaller.new minimal_deps: true inst.install "e" end - assert_equal %w[a-1 e-1], inst.installed_gems.map {|s| s.full_name } + assert_equal %w[a-1 e-1], inst.installed_gems.map(&:full_name) end def test_install_no_minimal_deps @@ -541,19 +576,19 @@ class TestGemDependencyInstaller < Gem::TestCase inst = nil Dir.chdir @tempdir do - inst = Gem::DependencyInstaller.new :ignore_dependencies => true + inst = Gem::DependencyInstaller.new ignore_dependencies: true inst.install "b", req("= 1") end - assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name }, + assert_equal %w[b-1], inst.installed_gems.map(&:full_name), "sanity check" Dir.chdir @tempdir do - inst = Gem::DependencyInstaller.new :minimal_deps => false + inst = Gem::DependencyInstaller.new minimal_deps: false inst.install "e" end - assert_equal %w[a-1 b-2 e-1], inst.installed_gems.map {|s| s.full_name } + assert_equal %w[a-1 b-2 e-1], inst.installed_gems.map(&:full_name) end def test_install_no_document @@ -561,12 +596,12 @@ class TestGemDependencyInstaller < Gem::TestCase done_installing_called = false - Gem.done_installing do |dep_installer, specs| + Gem.done_installing do |dep_installer, _specs| done_installing_called = true assert_empty dep_installer.document end - inst = Gem::DependencyInstaller.new :domain => :local, :document => [] + inst = Gem::DependencyInstaller.new domain: :local, document: [] inst.install @a1_gem @@ -580,14 +615,14 @@ class TestGemDependencyInstaller < Gem::TestCase inst = nil Dir.chdir @tempdir do - inst = Gem::DependencyInstaller.new :env_shebang => true, :wrappers => true, :format_executable => false + inst = Gem::DependencyInstaller.new env_shebang: true, wrappers: true, format_executable: false inst.install "a" end env = "/\\S+/env" unless Gem.win_platform? - assert_match %r{\A#!#{env} #{RbConfig::CONFIG['ruby_install_name']}\n}, - File.read(File.join(@gemhome, "bin", "a_bin")) + assert_match(/\A#!#{env} #{RbConfig::CONFIG["ruby_install_name"]}\n/, + File.read(File.join(@gemhome, "bin", "a_bin"))) end def test_install_force @@ -599,11 +634,11 @@ class TestGemDependencyInstaller < Gem::TestCase inst = nil Dir.chdir @tempdir do - inst = Gem::DependencyInstaller.new :force => true + inst = Gem::DependencyInstaller.new force: true inst.install "b" end - assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name } + assert_equal %w[b-1], inst.installed_gems.map(&:full_name) end def test_install_build_args @@ -614,8 +649,7 @@ class TestGemDependencyInstaller < Gem::TestCase build_args = %w[--a --b="c"] Dir.chdir @tempdir do - inst = Gem::DependencyInstaller.new( - :build_args => build_args) + inst = Gem::DependencyInstaller.new(build_args: build_args) inst.install "a" end @@ -629,11 +663,11 @@ class TestGemDependencyInstaller < Gem::TestCase inst = nil Dir.chdir @tempdir do - inst = Gem::DependencyInstaller.new :ignore_dependencies => true + inst = Gem::DependencyInstaller.new ignore_dependencies: true inst.install "b" end - assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name } + assert_equal %w[b-1], inst.installed_gems.map(&:full_name) end def test_install_install_dir @@ -650,11 +684,11 @@ class TestGemDependencyInstaller < Gem::TestCase inst = nil Dir.chdir @tempdir do - inst = Gem::DependencyInstaller.new :install_dir => gemhome2 + inst = Gem::DependencyInstaller.new install_dir: gemhome2 inst.install "b" end - assert_equal %w[a-1 b-1], inst.installed_gems.map {|s| s.full_name } + assert_equal %w[a-1 b-1], inst.installed_gems.map(&:full_name) assert File.exist?(File.join(gemhome2, "specifications", @a1.spec_name)) assert File.exist?(File.join(gemhome2, "cache", @a1.file_name)) @@ -674,11 +708,11 @@ class TestGemDependencyInstaller < Gem::TestCase inst = nil Dir.chdir @tempdir do - inst = Gem::DependencyInstaller.new :domain => :both + inst = Gem::DependencyInstaller.new domain: :both inst.install "b" end - assert_equal %w[a-1 b-1], inst.installed_gems.map {|s| s.full_name } + assert_equal %w[a-1 b-1], inst.installed_gems.map(&:full_name) a1, b1 = inst.installed_gems assert_equal a1.spec_file, a1.loaded_from @@ -698,11 +732,11 @@ class TestGemDependencyInstaller < Gem::TestCase inst = nil Dir.chdir @tempdir do - inst = Gem::DependencyInstaller.new :domain => :both + inst = Gem::DependencyInstaller.new domain: :both inst.install "b" end - assert_equal %w[a-1 b-1], inst.installed_gems.map {|s| s.full_name } + assert_equal %w[a-1 b-1], inst.installed_gems.map(&:full_name) end def test_install_domain_local @@ -713,7 +747,7 @@ class TestGemDependencyInstaller < Gem::TestCase Dir.chdir @tempdir do e = assert_raise Gem::UnsatisfiableDependencyError do - inst = Gem::DependencyInstaller.new :domain => :local + inst = Gem::DependencyInstaller.new domain: :local inst.install "b" end @@ -721,7 +755,7 @@ class TestGemDependencyInstaller < Gem::TestCase assert_equal expected, e.message end - assert_equal [], inst.installed_gems.map {|s| s.full_name } + assert_equal [], inst.installed_gems.map(&:full_name) end def test_install_domain_remote @@ -734,10 +768,10 @@ class TestGemDependencyInstaller < Gem::TestCase @fetcher.data["http://gems.example.com/gems/a-1.gem"] = a1_data - inst = Gem::DependencyInstaller.new :domain => :remote + inst = Gem::DependencyInstaller.new domain: :remote inst.install "a" - assert_equal %w[a-1], inst.installed_gems.map {|s| s.full_name } + assert_equal %w[a-1], inst.installed_gems.map(&:full_name) end def test_install_dual_repository @@ -750,11 +784,11 @@ class TestGemDependencyInstaller < Gem::TestCase gemhome2 = "#{@gemhome}2" Dir.chdir @tempdir do - inst = Gem::DependencyInstaller.new :install_dir => gemhome2 + inst = Gem::DependencyInstaller.new install_dir: gemhome2 inst.install "a" end - assert_equal %w[a-1], inst.installed_gems.map {|s| s.full_name }, + assert_equal %w[a-1], inst.installed_gems.map(&:full_name), "sanity check" ENV["GEM_HOME"] = @gemhome @@ -766,7 +800,7 @@ class TestGemDependencyInstaller < Gem::TestCase inst.install "b" end - assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name } + assert_equal %w[b-1], inst.installed_gems.map(&:full_name) end def test_install_reinstall @@ -777,7 +811,7 @@ class TestGemDependencyInstaller < Gem::TestCase inst = nil Dir.chdir @tempdir do - inst = Gem::DependencyInstaller.new :force => true + inst = Gem::DependencyInstaller.new force: true inst.install "a" end @@ -801,7 +835,7 @@ class TestGemDependencyInstaller < Gem::TestCase inst.install "a" end - assert_equal %w[a-1], inst.installed_gems.map {|s| s.full_name } + assert_equal %w[a-1], inst.installed_gems.map(&:full_name) end def test_install_remote_dep @@ -821,7 +855,7 @@ class TestGemDependencyInstaller < Gem::TestCase inst.install dep end - assert_equal %w[a-1], inst.installed_gems.map {|s| s.full_name } + assert_equal %w[a-1], inst.installed_gems.map(&:full_name) end def test_install_remote_platform_newer @@ -851,10 +885,10 @@ class TestGemDependencyInstaller < Gem::TestCase @fetcher.data["http://gems.example.com/gems/#{a2_o.file_name}"] = a2_o_data - inst = Gem::DependencyInstaller.new :domain => :remote + inst = Gem::DependencyInstaller.new domain: :remote inst.install "a" - assert_equal %w[a-1], inst.installed_gems.map {|s| s.full_name } + assert_equal %w[a-1], inst.installed_gems.map(&:full_name) end def test_install_platform_is_ignored_when_a_file_is_specified @@ -862,10 +896,10 @@ class TestGemDependencyInstaller < Gem::TestCase s.platform = Gem::Platform.new %w[cpu other_platform 1] end - inst = Gem::DependencyInstaller.new :domain => :local + inst = Gem::DependencyInstaller.new domain: :local inst.install a_gem - assert_equal %w[a-1-cpu-other_platform-1], inst.installed_gems.map {|s| s.full_name } + assert_equal %w[a-1-cpu-other_platform-1], inst.installed_gems.map(&:full_name) end require "rubygems/openssl" @@ -874,14 +908,14 @@ class TestGemDependencyInstaller < Gem::TestCase def test_install_security_policy util_setup_gems - data = File.open(@a1_gem, "rb") {|f| f.read } + data = File.open(@a1_gem, "rb", &:read) @fetcher.data["http://gems.example.com/gems/a-1.gem"] = data - data = File.open(@b1_gem, "rb") {|f| f.read } + data = File.open(@b1_gem, "rb", &:read) @fetcher.data["http://gems.example.com/gems/b-1.gem"] = data policy = Gem::Security::HighSecurity - inst = Gem::DependencyInstaller.new :security_policy => policy + inst = Gem::DependencyInstaller.new security_policy: policy e = assert_raise Gem::Security::Exception do inst.install "b" @@ -890,21 +924,21 @@ class TestGemDependencyInstaller < Gem::TestCase assert_equal "unsigned gems are not allowed by the High Security policy", e.message - assert_equal %w[], inst.installed_gems.map {|s| s.full_name } + assert_equal %w[], inst.installed_gems.map(&:full_name) end end # Wrappers don't work on mswin - unless win_platform? + unless Gem.win_platform? def test_install_no_wrappers util_setup_gems @fetcher.data["http://gems.example.com/gems/a-1.gem"] = read_binary(@a1_gem) - inst = Gem::DependencyInstaller.new :wrappers => false, :format_executable => false + inst = Gem::DependencyInstaller.new wrappers: false, format_executable: false inst.install "a" - refute_match(%r{This file was generated by RubyGems.}, + refute_match(/This file was generated by RubyGems./, File.read(File.join(@gemhome, "bin", "a_bin"))) end end @@ -912,32 +946,32 @@ class TestGemDependencyInstaller < Gem::TestCase def test_install_version util_setup_d - data = File.open(@d2_gem, "rb") {|f| f.read } + data = File.open(@d2_gem, "rb", &:read) @fetcher.data["http://gems.example.com/gems/d-2.gem"] = data - data = File.open(@d1_gem, "rb") {|f| f.read } + data = File.open(@d1_gem, "rb", &:read) @fetcher.data["http://gems.example.com/gems/d-1.gem"] = data inst = Gem::DependencyInstaller.new inst.install "d", "= 1" - assert_equal %w[d-1], inst.installed_gems.map {|s| s.full_name } + assert_equal %w[d-1], inst.installed_gems.map(&:full_name) end def test_install_version_default util_setup_d - data = File.open(@d2_gem, "rb") {|f| f.read } + data = File.open(@d2_gem, "rb", &:read) @fetcher.data["http://gems.example.com/gems/d-2.gem"] = data - data = File.open(@d1_gem, "rb") {|f| f.read } + data = File.open(@d1_gem, "rb", &:read) @fetcher.data["http://gems.example.com/gems/d-1.gem"] = data inst = Gem::DependencyInstaller.new inst.install "d" - assert_equal %w[d-2], inst.installed_gems.map {|s| s.full_name } + assert_equal %w[d-2], inst.installed_gems.map(&:full_name) end def test_install_legacy_spec_with_nil_required_ruby_version @@ -1110,7 +1144,7 @@ class TestGemDependencyInstaller < Gem::TestCase inst = Gem::DependencyInstaller.new request_set = inst.resolve_dependencies "b", req(">= 0") - requests = request_set.sorted_requests.map {|req| req.full_name } + requests = request_set.sorted_requests.map(&:full_name) assert_equal %w[a-1 b-1], requests end @@ -1121,10 +1155,10 @@ class TestGemDependencyInstaller < Gem::TestCase FileUtils.mv @a1_gem, @tempdir FileUtils.mv @b1_gem, @tempdir - inst = Gem::DependencyInstaller.new :ignore_dependencies => true + inst = Gem::DependencyInstaller.new ignore_dependencies: true request_set = inst.resolve_dependencies "b", req(">= 0") - requests = request_set.sorted_requests.map {|req| req.full_name } + requests = request_set.sorted_requests.map(&:full_name) assert request_set.ignore_dependencies @@ -1141,7 +1175,7 @@ class TestGemDependencyInstaller < Gem::TestCase inst = Gem::DependencyInstaller.new request_set = inst.resolve_dependencies "a-1.gem", req(">= 0") - requests = request_set.sorted_requests.map {|req| req.full_name } + requests = request_set.sorted_requests.map(&:full_name) assert_equal %w[a-1], requests end |