From fdb6a621b0bde5dec6b4541569a95fb2f16261a3 Mon Sep 17 00:00:00 2001
From: drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 13 Sep 2013 01:40:42 +0000
Subject: 	* lib/rubygems:  Update to RubyGems 2.1.3

	  Fixed installing platform gems

	  Restored concurrent requires

	  Fixed installing gems with extensions with --install-dir

	  Fixed `gem fetch -v` to install the latest version

	  Fixed installing gems with "./" in their files entries

	* test/rubygems/test_gem_package.rb:  Tests for the above.

	* NEWS:  Updated for RubyGems 2.1.3


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42927 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/rubygems/test_gem_dependency_resolver.rb | 31 +++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

(limited to 'test/rubygems/test_gem_dependency_resolver.rb')

diff --git a/test/rubygems/test_gem_dependency_resolver.rb b/test/rubygems/test_gem_dependency_resolver.rb
index 38f3d868ea..47eef8cc55 100644
--- a/test/rubygems/test_gem_dependency_resolver.rb
+++ b/test/rubygems/test_gem_dependency_resolver.rb
@@ -68,23 +68,28 @@ class TestGemDependencyResolver < Gem::TestCase
 
   def test_picks_best_platform
     is = Gem::DependencyResolver::IndexSpecification
-    a2_p = quick_spec 'a' do |s| s.platform = Gem::Platform.local end
-    version = Gem::Version.new 2
+    unknown = Gem::Platform.new 'unknown'
+    a2_p1 = quick_spec 'a', 2 do |s| s.platform = Gem::Platform.local end
+    a3_p2 = quick_spec 'a', 3 do |s| s.platform = unknown end
+    v2 = v(2)
+    v3 = v(3)
     source = Gem::Source.new @gem_repo
 
     s = set
 
-    a2   = is.new s, 'a', version, source, Gem::Platform::RUBY
-    a2_p = is.new s, 'a', version, source, Gem::Platform.local.to_s
+    a2    = is.new s, 'a', v2, source, Gem::Platform::RUBY
+    a2_p1 = is.new s, 'a', v2, source, Gem::Platform.local.to_s
+    a3_p2 = is.new s, 'a', v3, source, unknown
 
-    s.add a2_p
+    s.add a3_p2
+    s.add a2_p1
     s.add a2
 
     ad = make_dep "a"
 
     res = Gem::DependencyResolver.new([ad], s)
 
-    assert_set [a2_p], res.resolve
+    assert_set [a2_p1], res.resolve
   end
 
   def test_only_returns_spec_once
@@ -348,4 +353,18 @@ class TestGemDependencyResolver < Gem::TestCase
 
     assert_set [b1, c1, d2], r.resolve
   end
+
+  def test_select_local_platforms
+    r = Gem::DependencyResolver.new nil, nil
+
+    a1    = quick_spec 'a', 1
+    a1_p1 = quick_spec 'a', 1 do |s| s.platform = Gem::Platform.local end
+    a1_p2 = quick_spec 'a', 1 do |s| s.platform = 'unknown'           end
+
+    selected = r.select_local_platforms [a1, a1_p1, a1_p2]
+
+    assert_equal [a1, a1_p1], selected
+  end
+
 end
+
-- 
cgit v1.2.3