Merge RubyGems/Bundler master from 8459ebd6ad65ce3397233416dc64083ae7572bb9

2 files changed, 18 insertions, 0 deletions

diff --git a/test/rubygems/test_exit.rb b/test/rubygems/test_exit.rb
new file mode 100644
index 0000000000..9557fe5d06
--- /dev/null
+++ b/test/rubygems/test_exit.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+require 'rubygems'
+
+class TestExit < Gem::TestCase
+  def test_exit
+    system(*ruby_with_rubygems_in_load_path, "-e", "raise Gem::SystemExitException.new(2)")
+    assert_equal 2, $?.exitstatus
+  end
+end
diff --git a/test/rubygems/test_gem_package.rb b/test/rubygems/test_gem_package.rb
index dbb037fd80..3fa2c1911c 100644
--- a/test/rubygems/test_gem_package.rb
+++ b/test/rubygems/test_gem_package.rb
@@ -1145,6 +1145,13 @@ class TestGemPackage < Gem::Package::TarTestCase
     end
   end
 
+  def test_contents_from_io
+    io = StringIO.new Gem.read_binary @gem
+    package = Gem::Package.new io
+
+    assert_equal %w[lib/code.rb], package.contents
+  end
+
   def util_tar
     tar_io = StringIO.new