diff options
author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2019-12-15 16:48:40 +0900 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2019-12-15 16:48:52 +0900 |
commit | 980ddca47e892535c1da897b33ac7bc727efd52d (patch) | |
tree | 07169297a9aa0a8b89fe1d672d59247ca05f2125 | |
parent | 9f43160014905db159ec67e3ee2b485d870de05d (diff) |
Prepare to release rubygems-3.1.0
-rw-r--r-- | lib/rubygems.rb | 2 | ||||
-rw-r--r-- | test/rubygems/test_gem_commands_server_command.rb | 8 | ||||
-rw-r--r-- | test/rubygems/test_project_sanity.rb | 43 |
3 files changed, 7 insertions, 46 deletions
diff --git a/lib/rubygems.rb b/lib/rubygems.rb index 6be55a0379..84a360e652 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -9,7 +9,7 @@ require 'rbconfig' module Gem - VERSION = "3.1.0.pre3".freeze + VERSION = "3.1.0".freeze end # Must be first since it unloads the prelude from 1.9.2 diff --git a/test/rubygems/test_gem_commands_server_command.rb b/test/rubygems/test_gem_commands_server_command.rb index d511ce0b7b..af15aadfd1 100644 --- a/test/rubygems/test_gem_commands_server_command.rb +++ b/test/rubygems/test_gem_commands_server_command.rb @@ -38,8 +38,12 @@ class TestGemCommandsServerCommand < Gem::TestCase @cmd.send :handle_options, %w[-p 65535] assert_equal 65535, @cmd.options[:port] - @cmd.send :handle_options, %w[-p discard] - assert_equal 9, @cmd.options[:port] + begin + @cmd.send :handle_options, %w[-p discard] + assert_equal 9, @cmd.options[:port] + rescue OptionParser::InvalidArgument + # for container environment on GitHub Actions + end e = assert_raises OptionParser::InvalidArgument do @cmd.send :handle_options, %w[-p nonexistent] diff --git a/test/rubygems/test_project_sanity.rb b/test/rubygems/test_project_sanity.rb index 72f5e3b36e..6a9eb3b83f 100644 --- a/test/rubygems/test_project_sanity.rb +++ b/test/rubygems/test_project_sanity.rb @@ -1,28 +1,9 @@ # frozen_string_literal: true -require "rubygems/test_case" require "open3" class TestProjectSanity < Minitest::Test - def test_rake_package_builds_ok - skip unless File.exist?(File.expand_path("../../../Rakefile", __FILE__)) - - with_empty_pkg_folder do - output, status = Open3.capture2e("rake package") - - assert_equal true, status.success?, <<~MSG.chomp - Expected `rake package` to work, but got errors: - - ``` - #{output} - ``` - - If you have added or removed files, make sure you run `rake update_manifest` to update the `Manifest.txt` accordingly - MSG - end - end - def test_manifest_is_up_to_date skip unless File.exist?(File.expand_path("../../../Rakefile", __FILE__)) @@ -31,28 +12,4 @@ class TestProjectSanity < Minitest::Test assert status.success?, "Expected Manifest.txt to be up to date, but it's not. Run `rake update_manifest` to sync it." end - private - - def with_empty_pkg_folder - if File.exist?("pkg") - FileUtils.cp_r("pkg", "tmp") - - begin - FileUtils.rm_rf("pkg") - yield - ensure - FileUtils.rm_rf("pkg") - FileUtils.cp_r("tmp/pkg", ".") - end - else - Dir.mkdir("pkg") - - begin - yield - ensure - FileUtils.rm_rf("pkg") - end - end - end - end |