* lib/rubygems: Import RubyGems 2.1

* test/rubygems:  Ditto.


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

1 files changed, 36 insertions, 0 deletions

diff --git a/test/rubygems/test_gem_dependency_resolver_dependency_conflict.rb b/test/rubygems/test_gem_dependency_resolver_dependency_conflict.rb
new file mode 100644
index 0000000000..56a34d3001
--- /dev/null
+++ b/test/rubygems/test_gem_dependency_resolver_dependency_conflict.rb
@@ -0,0 +1,36 @@
+require 'rubygems/test_case'
+require 'rubygems/dependency_resolver'
+
+class TestGemDependencyResolverDependencyConflict < Gem::TestCase
+
+  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::DependencyResolver::DependencyConflict.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_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::DependencyResolver::DependencyConflict.new child, nil
+
+    assert_equal %w[net-ssh-2.2.2 rye-0.9.8], conflict.request_path
+  end
+
+end
+