* lib/rubygems: Update to RubyGems master 50a8210. Important changes

  in this commit:

  RubyGems now automatically checks for gem.deps.rb or Gemfile when
  running ruby executables.  This behavior is similar to `bundle exec
  rake`.  This change may be reverted before Ruby 2.1.0 if too many bugs
  are found.

* test/rubygems:  ditto.


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

1 files changed, 23 insertions, 7 deletions

diff --git a/test/rubygems/test_gem_resolver_conflict.rb b/test/rubygems/test_gem_resolver_conflict.rb
index 3ae2a7cf5f..f8bba3f16f 100644
--- a/test/rubygems/test_gem_resolver_conflict.rb
+++ b/test/rubygems/test_gem_resolver_conflict.rb
@@ -12,12 +12,20 @@ class TestGemResolverConflict < Gem::TestCase
     child =
       dependency_request dep('net-ssh', '>= 2.6.5'), 'net-ssh', '2.2.2', root
 
+    dep = Gem::Resolver::DependencyRequest.new dep('net-ssh', '>= 2.0.13'), nil
+
+    spec = quick_spec 'net-ssh', '2.2.2'
+    active =
+      Gem::Resolver::ActivationRequest.new spec, dep
+
     conflict =
-      Gem::Resolver::Conflict.new child, child.requester
+      Gem::Resolver::Conflict.new child, active
 
     expected = <<-EXPECTED
-  Activated net-ssh-2.2.2 instead of (>= 2.6.5) via:
-    net-ssh-2.2.2, rye-0.9.8
+  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)
     EXPECTED
 
     assert_equal expected, conflict.explanation
@@ -36,7 +44,9 @@ class TestGemResolverConflict < Gem::TestCase
     conflict = @DR::Conflict.new a1_req, activated
 
     expected = <<-EXPECTED
-  Activated a-2 instead of (= 1) via:
+  Activated a-2 via:
+    a-2 (= 2)
+  instead of (= 1) via:
     user request (gem command or Gemfile)
     EXPECTED
 
@@ -46,13 +56,19 @@ class TestGemResolverConflict < Gem::TestCase
   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
+      dependency_request dep('other', '>= 1.0'), 'net-ssh', '2.2.2', root
 
     conflict =
-      Gem::Resolver::Conflict.new child, nil
+      Gem::Resolver::Conflict.new nil, nil
+
+    expected = [
+      'net-ssh-2.2.2 (>= 2.0.13)',
+      'rye-0.9.8 (= 0.9.8)'
+    ]
 
-    assert_equal %w[net-ssh-2.2.2 rye-0.9.8], conflict.request_path
+    assert_equal expected, conflict.request_path(child.requester)
   end
 
 end