* lib/rubygems: Update to RubyGems master 4bdc4f2. Important changes

  in this commit:

  RubyGems now chooses the test server port reliably.  Patch by akr.

  Partial implementation of bundler's Gemfile format.

  Refactorings to improve the new resolver.

  Fixes bugs in the resolver.

* test/rubygems:  Tests for the above.


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

1 files changed, 7 insertions, 3 deletions

diff --git a/test/rubygems/test_gem_dependency_resolver_vendor_set.rb b/test/rubygems/test_gem_dependency_resolver_vendor_set.rb
index b925ff3f47..227cf369c8 100644
--- a/test/rubygems/test_gem_dependency_resolver_vendor_set.rb
+++ b/test/rubygems/test_gem_dependency_resolver_vendor_set.rb
@@ -20,7 +20,7 @@ class TestGemDependencyResolverVendorSet < Gem::TestCase
   end
 
   def test_add_vendor_gem_missing
-    name, version, directory = vendor_gem
+    name, _, directory = vendor_gem
 
     FileUtils.rm_r directory
 
@@ -45,15 +45,19 @@ class TestGemDependencyResolverVendorSet < Gem::TestCase
 
     spec = @set.load_spec name, version, Gem::Platform::RUBY, nil
 
+    source = Gem::Source::Vendor.new directory
+
     expected = [
-      Gem::DependencyResolver::VendorSpecification.new(@set, spec, nil)
+      Gem::DependencyResolver::VendorSpecification.new(@set, spec, source)
     ]
 
     assert_equal expected, found
   end
 
   def test_load_spec
-    assert_raises KeyError do
+    error = Object.const_defined?(:KeyError) ? KeyError : IndexError
+
+    assert_raises error do
       @set.load_spec 'a', v(1), Gem::Platform::RUBY, nil
     end
   end