* lib/rubygems: Update to RubyGems master 6a3d9f9. Changes include:

  Compatibly renamed Gem::DependencyResolver to Gem::Resolver.

  Added support for git gems in gem.deps.rb and Gemfile.

  Fixed resolver bugs.

* test/rubygems: ditto.

* lib/rubygems/LICENSE.txt:  Updated to license from RubyGems trunk.
  [ruby-trunk - Bug #9086]

* lib/rubygems/commands/which_command.rb:  RubyGems now indicates
  failure when any file is missing.  [ruby-trunk - Bug #9004]

* lib/rubygems/ext/builder:  Extensions are now installed into the
  extension install directory and the first directory in the require
  path from the gem.  This allows backwards compatibility with msgpack
  and other gems that calculate full require paths.
  [ruby-trunk - Bug #9106]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43714 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 59 insertions, 0 deletions

diff --git a/test/rubygems/test_gem_resolver_conflict.rb b/test/rubygems/test_gem_resolver_conflict.rb
new file mode 100644
index 0000000000..3ae2a7cf5f
--- /dev/null
+++ b/test/rubygems/test_gem_resolver_conflict.rb
@@ -0,0 +1,59 @@
+require 'rubygems/test_case'
+
+class TestGemResolverConflict < Gem::TestCase
+
+  def test_self_compatibility
+    assert_same Gem::Resolver::Conflict, Gem::Resolver::DependencyConflict
+  end
+
+  def test_explanation
+    root  =
+      dependency_request dep('net-ssh', '>= 2.0.13'), 'rye', '0.9.8'
+    child =
+      dependency_request dep('net-ssh', '>= 2.6.5'), 'net-ssh', '2.2.2', root
+
+    conflict =
+      Gem::Resolver::Conflict.new child, child.requester
+
+    expected = <<-EXPECTED
+  Activated net-ssh-2.2.2 instead of (>= 2.6.5) via:
+    net-ssh-2.2.2, rye-0.9.8
+    EXPECTED
+
+    assert_equal expected, conflict.explanation
+  end
+
+  def test_explanation_user_request
+    @DR = Gem::Resolver
+
+    spec = util_spec 'a', 2
+
+    a1_req = @DR::DependencyRequest.new dep('a', '= 1'), nil
+    a2_req = @DR::DependencyRequest.new dep('a', '= 2'), nil
+
+    activated = @DR::ActivationRequest.new spec, a2_req
+
+    conflict = @DR::Conflict.new a1_req, activated
+
+    expected = <<-EXPECTED
+  Activated a-2 instead of (= 1) via:
+    user request (gem command or Gemfile)
+    EXPECTED
+
+    assert_equal expected, conflict.explanation
+  end
+
+  def test_request_path
+    root  =
+      dependency_request dep('net-ssh', '>= 2.0.13'), 'rye', '0.9.8'
+    child =
+      dependency_request dep('net-ssh', '>= 2.6.5'), 'net-ssh', '2.2.2', root
+
+    conflict =
+      Gem::Resolver::Conflict.new child, nil
+
+    assert_equal %w[net-ssh-2.2.2 rye-0.9.8], conflict.request_path
+  end
+
+end
+