From e2cf71a0858715eb884996b4fc2d6fd39b0c0f8c Mon Sep 17 00:00:00 2001 From: hsbt 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 --- .../specifications/foo-0.0.1-x86-mswin32.gemspec | Bin 0 -> 269 bytes test/rubygems/test_gem_resolver.rb | 2 +- test/rubygems/test_gem_specification.rb | 15 +++++++++++++++ test/rubygems/test_gem_stub_specification.rb | 2 +- 4 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 test/rubygems/specifications/foo-0.0.1-x86-mswin32.gemspec (limited to 'test/rubygems') diff --git a/test/rubygems/specifications/foo-0.0.1-x86-mswin32.gemspec b/test/rubygems/specifications/foo-0.0.1-x86-mswin32.gemspec new file mode 100644 index 0000000000..7fbc56429f Binary files /dev/null and b/test/rubygems/specifications/foo-0.0.1-x86-mswin32.gemspec differ 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 diff --git a/test/rubygems/test_gem_specification.rb b/test/rubygems/test_gem_specification.rb index 1ca2046195..6c7ee6054a 100644 --- a/test/rubygems/test_gem_specification.rb +++ b/test/rubygems/test_gem_specification.rb @@ -2678,6 +2678,21 @@ duplicate dependency on c (>= 1.2.3, development), (~> 1.2) use: end end + def test_validate_prerelease_dependencies_with_prerelease_version + util_setup_validate + + Dir.chdir @tempdir do + @a1.version = '1.0.0.beta.1' + @a1.add_runtime_dependency 'b', '~> 1.2.0.beta.1' + + use_ui @ui do + @a1.validate + end + + assert_equal '', @ui.error, 'warning' + end + end + def test_validate_description util_setup_validate diff --git a/test/rubygems/test_gem_stub_specification.rb b/test/rubygems/test_gem_stub_specification.rb index 5488adc348..786a308556 100644 --- a/test/rubygems/test_gem_stub_specification.rb +++ b/test/rubygems/test_gem_stub_specification.rb @@ -3,7 +3,7 @@ require "rubygems/stub_specification" class TestStubSpecification < Gem::TestCase SPECIFICATIONS = File.expand_path(File.join("..", "specifications"), __FILE__) - FOO = File.join SPECIFICATIONS, "foo-0.0.1.gemspec" + FOO = File.join SPECIFICATIONS, "foo-0.0.1-x86-mswin32.gemspec" BAR = File.join SPECIFICATIONS, "bar-0.0.2.gemspec" def setup -- cgit v1.2.1