* 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, 41 insertions, 0 deletions

diff --git a/test/rubygems/test_gem_impossible_dependencies_error.rb b/test/rubygems/test_gem_impossible_dependencies_error.rb
new file mode 100644
index 0000000000..9a0472fa36
--- /dev/null
+++ b/test/rubygems/test_gem_impossible_dependencies_error.rb
@@ -0,0 +1,41 @@
+require 'rubygems/test_case'
+
+class TestGemImpossibleDependenciesError < Gem::TestCase
+
+  def test_message_conflict
+    request = dependency_request dep('net-ssh', '>= 2.0.13'), 'rye', '0.9.8'
+
+    conflicts = []
+
+    # These conflicts are lies as their dependencies does not have the correct
+    # requested-by entries, but they are suitable for testing the message.
+    # See #485 to construct a correct conflict.
+    net_ssh_2_2_2 =
+      dependency_request dep('net-ssh', '>= 2.6.5'), 'net-ssh', '2.2.2', request
+    net_ssh_2_6_5 =
+      dependency_request dep('net-ssh', '~> 2.2.2'), 'net-ssh', '2.6.5', request
+
+    conflict1 = Gem::DependencyResolver::DependencyConflict.new \
+      net_ssh_2_6_5, net_ssh_2_6_5.requester
+
+    conflict2 = Gem::DependencyResolver::DependencyConflict.new \
+      net_ssh_2_2_2, net_ssh_2_2_2.requester
+
+    conflicts << [net_ssh_2_6_5.requester.spec, conflict1]
+    conflicts << [net_ssh_2_2_2.requester.spec, conflict2]
+
+    error = Gem::ImpossibleDependenciesError.new request, conflicts
+
+    expected = <<-EXPECTED
+rye-0.9.8 requires net-ssh (>= 2.0.13) but it conflicted:
+  Activated net-ssh-2.6.5 instead of (~> 2.2.2) via:
+    net-ssh-2.6.5, rye-0.9.8
+  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, error.message
+  end
+
+end
+