diff options
Diffstat (limited to 'test/rubygems/test_gem_request_set.rb')
| -rw-r--r-- | test/rubygems/test_gem_request_set.rb | 59 |
1 files changed, 29 insertions, 30 deletions
diff --git a/test/rubygems/test_gem_request_set.rb b/test/rubygems/test_gem_request_set.rb index 6d14321126..9aa244892c 100644 --- a/test/rubygems/test_gem_request_set.rb +++ b/test/rubygems/test_gem_request_set.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require_relative "helper" require "rubygems/request_set" @@ -7,8 +8,6 @@ class TestGemRequestSet < Gem::TestCase super Gem::RemoteFetcher.fetcher = @fetcher = Gem::FakeFetcher.new - - @DR = Gem::Resolver end def test_gem @@ -45,7 +44,7 @@ class TestGemRequestSet < Gem::TestCase done_installing_ran = false - Gem.done_installing do |installer, specs| + Gem.done_installing do |_installer, _specs| done_installing_ran = true end @@ -56,7 +55,7 @@ class TestGemRequestSet < Gem::TestCase io.puts 'gem "a"' io.flush - result = rs.install_from_gemdeps :gemdeps => io.path do |req, installer| + result = rs.install_from_gemdeps gemdeps: io.path do |req, _installer| installed << req.full_name end @@ -88,7 +87,7 @@ Gems to install: EXPECTED actual, _ = capture_output do - rs.install_from_gemdeps :gemdeps => io.path, :explain => true + rs.install_from_gemdeps gemdeps: io.path, explain: true end assert_equal(expected, actual) end @@ -110,11 +109,11 @@ Gems to install: end options = { - :gemdeps => "gem.deps.rb", - :install_dir => "#{@gemhome}2", + gemdeps: "gem.deps.rb", + install_dir: "#{@gemhome}2", } - rs.install_from_gemdeps options do |req, installer| + rs.install_from_gemdeps options do |req, _installer| installed << req.full_name end @@ -134,7 +133,7 @@ Gems to install: io.flush assert_raise Gem::UnsatisfiableDependencyError do - rs.install_from_gemdeps :gemdeps => io.path, :domain => :local + rs.install_from_gemdeps gemdeps: io.path, domain: :local end end @@ -172,7 +171,7 @@ DEPENDENCIES io.puts 'gem "b"' end - rs.install_from_gemdeps :gemdeps => "gem.deps.rb" do |req, installer| + rs.install_from_gemdeps gemdeps: "gem.deps.rb" do |req, _installer| installed << req.full_name end @@ -226,7 +225,7 @@ end io.puts("gemspec") end - rs.install_from_gemdeps :gemdeps => "Gemfile" do |req, installer| + rs.install_from_gemdeps gemdeps: "Gemfile" do |req, _installer| installed << req.full_name end @@ -251,7 +250,7 @@ ruby "0" io.flush - rs.install_from_gemdeps :gemdeps => io.path do |req, installer| + rs.install_from_gemdeps gemdeps: io.path do |req, _installer| installed << req.full_name end end @@ -324,7 +323,7 @@ ruby "0" res = rs.resolve StaticSet.new([a, b]) assert_equal 2, res.size - names = res.map {|s| s.full_name }.sort + names = res.map(&:full_name).sort assert_equal ["a-2", "b-2"], names @@ -343,7 +342,7 @@ ruby "0" res = rs.resolve StaticSet.new([a, b, c]) assert_equal 3, res.size - names = res.map {|s| s.full_name }.sort + names = res.map(&:full_name).sort assert_equal %w[a-1.b b-1.b c-1.1.b], names end @@ -410,12 +409,12 @@ ruby "0" res = rs.resolve assert_equal 1, res.size - names = res.map {|s| s.full_name }.sort + names = res.map(&:full_name).sort assert_equal %w[a-1], names - assert_equal [@DR::BestSet, @DR::GitSet, @DR::VendorSet, @DR::SourceSet], - rs.sets.map {|set| set.class } + assert_equal [Gem::Resolver::BestSet, Gem::Resolver::GitSet, Gem::Resolver::VendorSet, Gem::Resolver::SourceSet], + rs.sets.map(&:class) end def test_resolve_ignore_dependencies @@ -429,7 +428,7 @@ ruby "0" res = rs.resolve StaticSet.new([a, b]) assert_equal 1, res.size - names = res.map {|s| s.full_name }.sort + names = res.map(&:full_name).sort assert_equal %w[a-2], names end @@ -474,12 +473,12 @@ ruby "0" res = rs.resolve assert_equal 2, res.size - names = res.map {|s| s.full_name }.sort + names = res.map(&:full_name).sort assert_equal ["a-1", "b-2"], names - assert_equal [@DR::BestSet, @DR::GitSet, @DR::VendorSet, @DR::SourceSet], - rs.sets.map {|set| set.class } + assert_equal [Gem::Resolver::BestSet, Gem::Resolver::GitSet, Gem::Resolver::VendorSet, Gem::Resolver::SourceSet], + rs.sets.map(&:class) end def test_sorted_requests @@ -492,7 +491,7 @@ ruby "0" rs.resolve StaticSet.new([a, b, c]) - names = rs.sorted_requests.map {|s| s.full_name } + names = rs.sorted_requests.map(&:full_name) assert_equal %w[c-2 b-2 a-2], names end @@ -521,14 +520,14 @@ ruby "0" installers << installer end - assert_equal %w[b-1 a-1], reqs.map {|req| req.full_name } + assert_equal %w[b-1 a-1], reqs.map(&:full_name) assert_equal %w[b-1 a-1], installers.map {|installer| installer.spec.full_name } assert_path_exist File.join @gemhome, "specifications", "a-1.gemspec" assert_path_exist File.join @gemhome, "specifications", "b-1.gemspec" - assert_equal %w[b-1 a-1], installed.map {|s| s.full_name } + assert_equal %w[b-1 a-1], installed.map(&:full_name) assert done_installing_ran end @@ -551,7 +550,7 @@ ruby "0" assert_path_exist File.join @tempdir, "specifications", "a-1.gemspec" assert_path_exist File.join @tempdir, "specifications", "b-1.gemspec" - assert_equal %w[b-1 a-1], installed.map {|s| s.full_name } + assert_equal %w[b-1 a-1], installed.map(&:full_name) end def test_install_into_development_shallow @@ -575,15 +574,15 @@ ruby "0" rs.resolve options = { - :development => true, - :development_shallow => true, + development: true, + development_shallow: true, } installed = rs.install_into @tempdir, true, options do assert_equal @tempdir, ENV["GEM_HOME"] end - assert_equal %w[a-1 b-1], installed.map {|s| s.full_name }.sort + assert_equal %w[a-1 b-1], installed.map(&:full_name).sort end def test_sorted_requests_development_shallow @@ -608,7 +607,7 @@ ruby "0" rs.resolve StaticSet.new [a_spec, b_spec, c_spec] - assert_equal %w[b-1 a-1], rs.sorted_requests.map {|req| req.full_name } + assert_equal %w[b-1 a-1], rs.sorted_requests.map(&:full_name) end def test_tsort_each_child_development @@ -637,7 +636,7 @@ ruby "0" deps = rs.enum_for(:tsort_each_child, a_req).to_a - assert_equal %w[b], deps.map {|dep| dep.name } + assert_equal %w[b], deps.map(&:name) end def test_tsort_each_child_development_shallow |