* 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, 12 insertions, 36 deletions

diff --git a/test/rubygems/test_gem_dependency_resolver_index_set.rb b/test/rubygems/test_gem_dependency_resolver_index_set.rb
index 82ea486792..83b7cce501 100644
--- a/test/rubygems/test_gem_dependency_resolver_index_set.rb
+++ b/test/rubygems/test_gem_dependency_resolver_index_set.rb
@@ -3,50 +3,26 @@ require 'rubygems/dependency_resolver'
 
 class TestGemDependencyResolverIndexSet < Gem::TestCase
 
-  def test_load_spec
-    @fetcher = Gem::FakeFetcher.new
-    Gem::RemoteFetcher.fetcher = @fetcher
+  def setup
+    super
 
-    a_2   = quick_spec 'a', 2
-    a_2_p = quick_spec 'a', 2 do |s| s.platform = Gem::Platform.local end
-
-    Gem::Specification.add_specs a_2, a_2_p
-
-    util_setup_spec_fetcher a_2, a_2_p
-
-    source = Gem::Source.new @gem_repo
-    version = v 2
-
-    set = Gem::DependencyResolver::IndexSet.new
-
-    spec = set.load_spec 'a', version, Gem::Platform.local, source
-
-    assert_equal a_2_p.full_name, spec.full_name
+    @DR = Gem::DependencyResolver
   end
 
-  def test_load_spec_cached
-    @fetcher = Gem::FakeFetcher.new
-    Gem::RemoteFetcher.fetcher = @fetcher
+  def test_initialize
+    set = @DR::IndexSet.new
 
-    a_2   = quick_spec 'a', 2
-    a_2_p = quick_spec 'a', 2 do |s| s.platform = Gem::Platform.local end
+    fetcher = set.instance_variable_get :@f
 
-    Gem::Specification.add_specs a_2, a_2_p
-
-    util_setup_spec_fetcher a_2, a_2_p
-
-    source = Gem::Source.new @gem_repo
-    version = v 2
-
-    set = Gem::DependencyResolver::IndexSet.new
-
-    first = set.load_spec 'a', version, Gem::Platform.local, source
+    assert_same Gem::SpecFetcher.fetcher, fetcher
+  end
 
-    util_setup_spec_fetcher # clear
+  def test_initialize_source
+    set = @DR::IndexSet.new 'http://alternate.example'
 
-    second = set.load_spec 'a', version, Gem::Platform.local, source
+    fetcher = set.instance_variable_get :@f
 
-    assert_same first, second
+    refute_same Gem::SpecFetcher.fetcher, fetcher
   end
 
 end