From 7ed9b794b4e3f3f9874f2ce19401461596d8a2c0 Mon Sep 17 00:00:00 2001 From: drbrain Date: Sun, 8 Dec 2013 01:22:39 +0000 Subject: * lib/rubygems: Update to RubyGems master 14749ce. This fixes bugs handling of gem dependencies lockfiles (Gemfile.lock). * test/rubygems: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44054 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/rubygems/test_gem_resolver.rb | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 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 7383114af4..97ac64b85e 100644 --- a/test/rubygems/test_gem_resolver.rb +++ b/test/rubygems/test_gem_resolver.rb @@ -228,14 +228,27 @@ class TestGemResolver < Gem::TestCase res = Gem::Resolver.new([ad, bd], s) assert_resolves_to [a1, b1, c1, d4], res + end + + def test_backoff_higher_version_to_satisfy_dep + t3 = util_spec "railties", "3.2" + t4 = util_spec "railties", "4.0" + + r3 = util_spec "rails", "3.2", "railties" => "= 3.2" + r4 = util_spec "rails", "4.0", "railties" => "= 4.0" + + rd = make_dep "rails", "3.2" + + c3 = util_spec "coffee", "3.0", "railties" => "~> 3.0" + c4 = util_spec "coffee", "4.0", "railties" => "~> 4.0" + + cd = make_dep "coffee" - cons = res.conflicts + s = set(t3, t4, r3, r4, c3, c4) - assert_equal 1, cons.size - con = cons.first + res = Gem::Resolver.new([rd, cd], s) - assert_equal "c (= 1)", con.dependency.to_s - assert_equal "c-2", con.activated.full_name + assert_resolves_to [r3, t3, c3], res end def test_raises_dependency_error -- cgit v1.2.3