summaryrefslogtreecommitdiff
path: root/test/rubygems/test_gem_resolver.rb
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-04 06:21:53 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-04 06:21:53 +0000
commite2cf71a0858715eb884996b4fc2d6fd39b0c0f8c (patch)
tree729ecf1549356e45f778666a8806420c8223d05d /test/rubygems/test_gem_resolver.rb
parente4c15e313d3ba8a7d9b8dfae3cc171229e041dbf (diff)
* 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
Diffstat (limited to 'test/rubygems/test_gem_resolver.rb')
-rw-r--r--test/rubygems/test_gem_resolver.rb2
1 files changed, 1 insertions, 1 deletions
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