diff options
Diffstat (limited to 'test/rubygems/test_gem_resolver_conflict.rb')
| -rw-r--r-- | test/rubygems/test_gem_resolver_conflict.rb | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/test/rubygems/test_gem_resolver_conflict.rb b/test/rubygems/test_gem_resolver_conflict.rb index f8bba3f16f..0cef0cad2a 100644 --- a/test/rubygems/test_gem_resolver_conflict.rb +++ b/test/rubygems/test_gem_resolver_conflict.rb @@ -22,10 +22,17 @@ class TestGemResolverConflict < Gem::TestCase Gem::Resolver::Conflict.new child, active expected = <<-EXPECTED - Activated net-ssh-2.2.2 via: - net-ssh-2.2.2 (>= 2.0.13) - instead of (>= 2.6.5) via: - net-ssh-2.2.2 (>= 2.0.13), rye-0.9.8 (= 0.9.8) + Activated net-ssh-2.2.2 + which does not match conflicting dependency (>= 2.6.5) + + Conflicting dependency chains: + net-ssh (>= 2.0.13), 2.2.2 activated + + versus: + rye (= 0.9.8), 0.9.8 activated, depends on + net-ssh (>= 2.0.13), 2.2.2 activated, depends on + net-ssh (>= 2.6.5) + EXPECTED assert_equal expected, conflict.explanation @@ -44,10 +51,15 @@ class TestGemResolverConflict < Gem::TestCase conflict = @DR::Conflict.new a1_req, activated expected = <<-EXPECTED - Activated a-2 via: - a-2 (= 2) - instead of (= 1) via: - user request (gem command or Gemfile) + Activated a-2 + which does not match conflicting dependency (= 1) + + Conflicting dependency chains: + a (= 2), 2 activated + + versus: + a (= 1) + EXPECTED assert_equal expected, conflict.explanation @@ -64,8 +76,8 @@ class TestGemResolverConflict < Gem::TestCase Gem::Resolver::Conflict.new nil, nil expected = [ - 'net-ssh-2.2.2 (>= 2.0.13)', - 'rye-0.9.8 (= 0.9.8)' + 'net-ssh (>= 2.0.13), 2.2.2 activated', + 'rye (= 0.9.8), 0.9.8 activated' ] assert_equal expected, conflict.request_path(child.requester) |