Merge rubygems master from upstream.

I picked the commit from 3c469e0da538428a0ddd94f99aa73c32da22e8ba
This commit is contained in:
Hiroshi SHIBATA 2019-06-01 12:45:11 +03:00
parent 560cd5b1f0
commit 56660de3c6
55 changed files with 1051 additions and 1053 deletions

View file

@ -13,11 +13,9 @@ class TestGemResolverActivationRequest < Gem::TestCase
source = Gem::Source::Local.new
platform = Gem::Platform::RUBY
@a1 = @DR::IndexSpecification.new nil, 'a', v(1), source, platform
@a2 = @DR::IndexSpecification.new nil, 'a', v(2), source, platform
@a3 = @DR::IndexSpecification.new nil, 'a', v(3), source, platform
@req = @DR::ActivationRequest.new @a3, @dep, [@a1, @a2]
@req = @DR::ActivationRequest.new @a3, @dep
end
def test_development_eh
@ -25,7 +23,7 @@ class TestGemResolverActivationRequest < Gem::TestCase
dep_req = @DR::DependencyRequest.new dep('a', '>= 0', :development), nil
act_req = @DR::ActivationRequest.new @a3, dep_req, [@a1, @a2]
act_req = @DR::ActivationRequest.new @a3, dep_req
assert act_req.development?
end
@ -33,41 +31,14 @@ class TestGemResolverActivationRequest < Gem::TestCase
def test_inspect
assert_match 'a-3', @req.inspect
assert_match 'from a (>= 0)', @req.inspect
assert_match '(others possible: a-1, a-2)', @req.inspect
end
def test_inspect_legacy
req = @DR::ActivationRequest.new @a3, @dep, true
assert_match '(others possible)', req.inspect
req = @DR::ActivationRequest.new @a3, @dep, false
refute_match '(others possible)', req.inspect
end
def test_installed_eh
v_spec = Gem::Resolver::VendorSpecification.new nil, @a3
@req = @DR::ActivationRequest.new v_spec, @dep, [@a1, @a2]
@req = @DR::ActivationRequest.new v_spec, @dep
assert @req.installed?
end
def test_others_possible_eh
assert @req.others_possible?
req = @DR::ActivationRequest.new @a3, @dep, []
refute req.others_possible?
req = @DR::ActivationRequest.new @a3, @dep, true
assert req.others_possible?
req = @DR::ActivationRequest.new @a3, @dep, false
refute req.others_possible?
end
end