From e2cf71a0858715eb884996b4fc2d6fd39b0c0f8c Mon Sep 17 00:00:00 2001
From: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 4 Dec 2015 06:21:53 +0000
Subject: * lib/rubygems: Update to RubyGems 2.5.0+ HEAD(fdab4c4).   this
 version includes #1396, #1397, #1398, #1399 * test/rubygems: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52880 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/rubygems/test_gem_resolver.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/test/rubygems/test_gem_resolver.rb b/test/rubygems/test_gem_resolver.rb
index c4b5251c82..a944a69d9a 100644
--- a/test/rubygems/test_gem_resolver.rb
+++ b/test/rubygems/test_gem_resolver.rb
@@ -516,7 +516,7 @@ class TestGemResolver < Gem::TestCase
 
     dependency = e.conflict.dependency
 
-    assert_equal 'a', dependency.name
+    assert_includes %w(a b), dependency.name
     assert_equal req('>= 0'), dependency.requirement
 
     activated = e.conflict.activated
-- 
cgit v1.2.3