From 8da8d4b043c37b53a69803c71ff36b478d4776d0 Mon Sep 17 00:00:00 2001 From: hsbt Date: Wed, 30 May 2018 13:01:35 +0000 Subject: Merge RubyGems 3.0.0.beta1. * It drop to support < Ruby 2.2 * Cleanup deprecated methods and classes. * Mark obsoleted methods to deprecate. * and other enhancements. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63528 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/rubygems/test_gem_resolver.rb | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) (limited to 'test/rubygems/test_gem_resolver.rb') diff --git a/test/rubygems/test_gem_resolver.rb b/test/rubygems/test_gem_resolver.rb index 417f0580f7..b083622da4 100644 --- a/test/rubygems/test_gem_resolver.rb +++ b/test/rubygems/test_gem_resolver.rb @@ -36,10 +36,6 @@ class TestGemResolver < Gem::TestCase flunk e.message end - def test_self_compatibility - assert_same Gem::Resolver, Gem::DependencyResolver - end - def test_self_compose_sets_best_set best_set = @DR::BestSet.new @@ -666,12 +662,12 @@ class TestGemResolver < Gem::TestCase end def test_second_level_backout - b1 = new_spec "b", "1", { "c" => ">= 1" }, "lib/b.rb" - b2 = new_spec "b", "2", { "c" => ">= 2" }, "lib/b.rb" - c1 = new_spec "c", "1" - c2 = new_spec "c", "2" - d1 = new_spec "d", "1", { "c" => "< 2" }, "lib/d.rb" - d2 = new_spec "d", "2", { "c" => "< 2" }, "lib/d.rb" + b1 = util_spec "b", "1", { "c" => ">= 1" }, "lib/b.rb" + b2 = util_spec "b", "2", { "c" => ">= 2" }, "lib/b.rb" + c1 = util_spec "c", "1" + c2 = util_spec "c", "2" + d1 = util_spec "d", "1", { "c" => "< 2" }, "lib/d.rb" + d2 = util_spec "d", "2", { "c" => "< 2" }, "lib/d.rb" s = set(b1, b2, c1, c2, d1, d2) @@ -688,11 +684,11 @@ class TestGemResolver < Gem::TestCase sourceB = Gem::Source.new 'http://example.com/b' sourceC = Gem::Source.new 'http://example.com/c' - spec_A_1 = new_spec 'some-dep', '0.0.1' - spec_A_2 = new_spec 'some-dep', '1.0.0' - spec_B_1 = new_spec 'some-dep', '0.0.1' - spec_B_2 = new_spec 'some-dep', '0.0.2' - spec_C_1 = new_spec 'some-dep', '0.1.0' + spec_A_1 = util_spec 'some-dep', '0.0.1' + spec_A_2 = util_spec 'some-dep', '1.0.0' + spec_B_1 = util_spec 'some-dep', '0.0.1' + spec_B_2 = util_spec 'some-dep', '0.0.2' + spec_C_1 = util_spec 'some-dep', '0.1.0' set = StaticSet.new [ Gem::Resolver::SpecSpecification.new(nil, spec_B_1, sourceB), -- cgit v1.2.3