rubygems-update 3.2.17 → 3.2.18

data/test/rubygems/test_gem_package_tar_header.rb

@@ -57,19 +57,19 @@ class TestGemPackageTarHeader < Gem::Package::TarTestCase
   end
 
   def test_initialize_bad
-    assert_raises ArgumentError do
+    assert_raise ArgumentError do
       Gem::Package::TarHeader.new :name => '', :size => '', :mode => ''
     end
 
-    assert_raises ArgumentError do
+    assert_raise ArgumentError do
       Gem::Package::TarHeader.new :name => '', :size => '', :prefix => ''
     end
 
-    assert_raises ArgumentError do
+    assert_raise ArgumentError do
       Gem::Package::TarHeader.new :name => '', :prefix => '', :mode => ''
     end
 
-    assert_raises ArgumentError do
+    assert_raise ArgumentError do
       Gem::Package::TarHeader.new :prefix => '', :size => '', :mode => ''
     end
   end
@@ -156,7 +156,7 @@ group\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000
       # overwrite the size field
       header_s[124, 12] = val
       io = TempIO.new header_s
-      assert_raises ArgumentError do
+      assert_raise ArgumentError do
         Gem::Package::TarHeader.from io
       end
       io.close!

data/test/rubygems/test_gem_package_tar_reader_entry.rb

@@ -42,19 +42,19 @@ class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
 
     assert @entry.bytes_read
 
-    e = assert_raises(IOError) { @entry.eof? }
+    e = assert_raise(IOError) { @entry.eof? }
     assert_equal 'closed Gem::Package::TarReader::Entry', e.message
 
-    e = assert_raises(IOError) { @entry.getc }
+    e = assert_raise(IOError) { @entry.getc }
     assert_equal 'closed Gem::Package::TarReader::Entry', e.message
 
-    e = assert_raises(IOError) { @entry.pos }
+    e = assert_raise(IOError) { @entry.pos }
     assert_equal 'closed Gem::Package::TarReader::Entry', e.message
 
-    e = assert_raises(IOError) { @entry.read }
+    e = assert_raise(IOError) { @entry.read }
     assert_equal 'closed Gem::Package::TarReader::Entry', e.message
 
-    e = assert_raises(IOError) { @entry.rewind }
+    e = assert_raise(IOError) { @entry.rewind }
     assert_equal 'closed Gem::Package::TarReader::Entry', e.message
   end
 
@@ -75,10 +75,10 @@ class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
   end
 
   def test_full_name_null
-    skip "jruby strips the null byte and does not think it's corrupt" if Gem.java_platform?
+    pend "jruby strips the null byte and does not think it's corrupt" if Gem.java_platform?
     @entry.header.prefix << "\000"
 
-    e = assert_raises Gem::Package::TarInvalidError do
+    e = assert_raise Gem::Package::TarInvalidError do
       @entry.full_name
     end
 
@@ -134,7 +134,7 @@ class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
   end
 
   def test_readpartial
-    assert_raises(EOFError) do
+    assert_raise(EOFError) do
       @entry.read(@contents.size)
       @entry.readpartial(1)
     end

data/test/rubygems/test_gem_package_tar_writer.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 require 'rubygems/package/tar_test_case'
 require 'rubygems/package/tar_writer'
-require 'minitest/mock'
 
 class TestGemPackageTarWriter < Gem::Package::TarTestCase
   def setup
@@ -117,7 +116,7 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
   end
 
   def test_add_file_signer
-    skip 'openssl is missing' unless Gem::HAVE_OPENSSL
+    pend 'openssl is missing' unless Gem::HAVE_OPENSSL
 
     signer = Gem::Security::Signer.new PRIVATE_KEY, [PUBLIC_CERT]
 
@@ -150,13 +149,12 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
     signer = Gem::Security::Signer.new nil, nil
 
     Time.stub :now, Time.at(1458518157) do
-
       @tar_writer.add_file_signed 'x', 0644, signer do |io|
         io.write 'a' * 10
       end
 
       assert_headers_equal(tar_file_header('x', '', 0644, 10, Time.now),
-                         @io.string[0, 512])
+                           @io.string[0, 512])
     end
     assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
 
@@ -170,11 +168,11 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
       end
 
       assert_headers_equal(tar_file_header('x', '', 0644, 10, Time.now),
-                         @io.string[0, 512])
-    end
+                           @io.string[0, 512])
 
-    assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
-    assert_equal 1024, @io.pos
+      assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
+      assert_equal 1024, @io.pos
+    end
   end
 
   def test_add_file_simple_source_date_epoch
@@ -185,7 +183,7 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
       end
 
       assert_headers_equal(tar_file_header('x', '', 0644, 10, Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc),
-                         @io.string[0, 512])
+                           @io.string[0, 512])
     end
   end
 
@@ -194,7 +192,7 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
       @tar_writer.add_file_simple 'x', 0, 100
 
       assert_headers_equal tar_file_header('x', '', 0, 100, Time.now),
-                         @io.string[0, 512]
+        @io.string[0, 512]
     end
 
     assert_equal "\0" * 512, @io.string[512, 512]
@@ -209,7 +207,7 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
   end
 
   def test_add_file_simple_size
-    assert_raises Gem::Package::TarWriter::FileOverflow do
+    assert_raise Gem::Package::TarWriter::FileOverflow do
       @tar_writer.add_file_simple("lib/foo/bar", 0, 10) do |io|
         io.write "1" * 11
       end
@@ -221,27 +219,27 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
 
     assert_equal "\0" * 1024, @io.string
 
-    e = assert_raises IOError do
+    e = assert_raise IOError do
       @tar_writer.close
     end
     assert_equal 'closed Gem::Package::TarWriter', e.message
 
-    e = assert_raises IOError do
+    e = assert_raise IOError do
       @tar_writer.flush
     end
     assert_equal 'closed Gem::Package::TarWriter', e.message
 
-    e = assert_raises IOError do
+    e = assert_raise IOError do
       @tar_writer.add_file 'x', 0
     end
     assert_equal 'closed Gem::Package::TarWriter', e.message
 
-    e = assert_raises IOError do
+    e = assert_raise IOError do
       @tar_writer.add_file_simple 'x', 0, 0
     end
     assert_equal 'closed Gem::Package::TarWriter', e.message
 
-    e = assert_raises IOError do
+    e = assert_raise IOError do
       @tar_writer.mkdir 'x', 0
     end
     assert_equal 'closed Gem::Package::TarWriter', e.message
@@ -297,7 +295,7 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
     assert_equal ['b' * 100, 'a'], @tar_writer.split_name(name)
 
     name = File.join 'a', 'b' * 101
-    exception = assert_raises Gem::Package::TooLongFileName do
+    exception = assert_raise Gem::Package::TooLongFileName do
       @tar_writer.split_name name
     end
     assert_includes exception.message, name
@@ -305,7 +303,7 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
     # note, GNU tar 1.28 is unable to handle this case too,
     # tested with "tar --format=ustar -cPf /tmp/foo.tartar -- /aaaaaa....a"
     name = '/' + 'a' * 100
-    exception = assert_raises Gem::Package::TooLongFileName do
+    exception = assert_raise Gem::Package::TooLongFileName do
       @tar_writer.split_name name
     end
     assert_includes exception.message, name
@@ -316,7 +314,7 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
     assert_equal ['b', 'a' * 155], @tar_writer.split_name(name)
 
     name = File.join 'a' * 156, 'b'
-    exception = assert_raises Gem::Package::TooLongFileName do
+    exception = assert_raise Gem::Package::TooLongFileName do
       @tar_writer.split_name name
     end
     assert_includes exception.message, name
@@ -324,7 +322,7 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
 
   def test_split_name_too_long_total
     name = 'a' * 257
-    exception = assert_raises Gem::Package::TooLongFileName do
+    exception = assert_raise Gem::Package::TooLongFileName do
       @tar_writer.split_name name
     end
     assert_includes exception.message, name

data/test/rubygems/test_gem_package_task.rb

@@ -40,7 +40,7 @@ class TestGemPackageTask < Gem::TestCase
 
       Rake.application['package'].invoke
 
-      assert_path_exists 'pkg/pkgr-1.2.3.gem'
+      assert_path_exist 'pkg/pkgr-1.2.3.gem'
     end
   ensure
     RakeFileUtils.verbose_flag = original_rake_fileutils_verbosity
@@ -56,7 +56,7 @@ class TestGemPackageTask < Gem::TestCase
       g.summary = 'summary'
     end
 
-    _, err = capture_io do
+    _, err = capture_output do
       Rake.application = Rake::Application.new
 
       pkg = Gem::PackageTask.new(gem) do |p|

data/test/rubygems/test_gem_path_support.rb

@@ -130,7 +130,7 @@ class TestGemPathSupport < Gem::TestCase
     begin
       File.symlink(dir, symlink)
     rescue NotImplementedError, SystemCallError
-      skip 'symlinks not supported'
+      pend 'symlinks not supported'
     end
     not_existing = "#{@tempdir}/does_not_exist"
     path = "#{symlink}#{File::PATH_SEPARATOR}#{not_existing}"

data/test/rubygems/test_gem_rdoc.rb

@@ -24,7 +24,7 @@ class TestGemRDoc < Gem::TestCase
     begin
       Gem::RDoc.load_rdoc
     rescue Gem::DocumentError => e
-      skip e.message
+      pend e.message
     end
 
     Gem.configuration[:rdoc] = nil
@@ -84,16 +84,16 @@ class TestGemRDoc < Gem::TestCase
     refute @hook.rdoc_installed?
     refute @hook.ri_installed?
 
-    assert_path_exists @a.doc_dir
+    assert_path_exist @a.doc_dir
   end
 
   def test_remove_unwritable
-    skip 'chmod not supported' if Gem.win_platform?
-    skip 'skipped in root privilege' if Process.uid.zero?
+    pend 'chmod not supported' if Gem.win_platform?
+    pend 'skipped in root privilege' if Process.uid.zero?
     FileUtils.mkdir_p @a.base_dir
     FileUtils.chmod 0, @a.base_dir
 
-    e = assert_raises Gem::FilePermissionError do
+    e = assert_raise Gem::FilePermissionError do
       @hook.remove
     end
 
@@ -113,16 +113,16 @@ class TestGemRDoc < Gem::TestCase
   def test_setup
     @hook.setup
 
-    assert_path_exists @a.doc_dir
+    assert_path_exist @a.doc_dir
   end
 
   def test_setup_unwritable
-    skip 'chmod not supported' if Gem.win_platform?
-    skip 'skipped in root privilege' if Process.uid.zero?
+    pend 'chmod not supported' if Gem.win_platform?
+    pend 'skipped in root privilege' if Process.uid.zero?
     FileUtils.mkdir_p @a.doc_dir
     FileUtils.chmod 0, @a.doc_dir
 
-    e = assert_raises Gem::FilePermissionError do
+    e = assert_raise Gem::FilePermissionError do
       @hook.setup
     end
 

data/test/rubygems/test_gem_remote_fetcher.rb

@@ -10,7 +10,6 @@ end
 
 require 'rubygems/remote_fetcher'
 require 'rubygems/package'
-require 'minitest/mock'
 
 # = Testing Proxy Settings
 #
@@ -146,7 +145,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
     fetcher = Gem::RemoteFetcher.new nil
     @fetcher = fetcher
 
-    e = assert_raises ArgumentError do
+    e = assert_raise ArgumentError do
       @fetcher.fetch_path("gems.example.com/yaml", nil, true)
     end
 
@@ -184,7 +183,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
 
     assert_equal 'hello', data
 
-    refute_path_exists path
+    assert_path_not_exist path
   end
 
   def util_fuck_with_fetcher(data, blow = false)
@@ -390,7 +389,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
   def test_download_unsupported
     inst = Gem::RemoteFetcher.fetcher
 
-    e = assert_raises ArgumentError do
+    e = assert_raise ArgumentError do
       inst.download @a1, 'ftp://gems.rubyforge.org'
     end
 
@@ -451,7 +450,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
 
     url = 'http://example.com/uri'
 
-    e = assert_raises Gem::RemoteFetcher::FetchError do
+    e = assert_raise Gem::RemoteFetcher::FetchError do
       fetcher.fetch_path url
     end
 
@@ -469,7 +468,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
 
     url = 'http://example.com/uri'
 
-    e = assert_raises Gem::RemoteFetcher::FetchError do
+    e = assert_raise Gem::RemoteFetcher::FetchError do
       fetcher.fetch_path url
     end
 
@@ -487,7 +486,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
 
     url = 'http://example.com/uri'
 
-    e = assert_raises Gem::RemoteFetcher::FetchError do
+    e = assert_raise Gem::RemoteFetcher::FetchError do
       fetcher.fetch_path url
     end
 
@@ -506,7 +505,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
 
     url = 'http://example.com/uri'
 
-    e = assert_raises Gem::RemoteFetcher::FetchError do
+    e = assert_raise Gem::RemoteFetcher::FetchError do
       fetcher.fetch_path url
     end
 
@@ -525,7 +524,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
 
     url = 'http://example.com/uri'
 
-    e = assert_raises Gem::RemoteFetcher::FetchError do
+    e = assert_raise Gem::RemoteFetcher::FetchError do
       fetcher.fetch_path url
     end
 
@@ -544,7 +543,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
 
     url = 'http://example.com/uri'
 
-    e = assert_raises Gem::RemoteFetcher::FetchError do
+    e = assert_raise Gem::RemoteFetcher::FetchError do
       fetcher.fetch_path url
     end
 
@@ -634,7 +633,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
       res
     end
 
-    e = assert_raises Gem::RemoteFetcher::FetchError do
+    e = assert_raise Gem::RemoteFetcher::FetchError do
       fetcher.fetch_http URI.parse(url)
     end
 
@@ -651,7 +650,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
       res
     end
 
-    e = assert_raises Gem::RemoteFetcher::FetchError do
+    e = assert_raise Gem::RemoteFetcher::FetchError do
       fetcher.fetch_http URI.parse(url)
     end
 
@@ -836,7 +835,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
     fetcher = Gem::RemoteFetcher.new nil
     @fetcher = fetcher
 
-    e = assert_raises Gem::RemoteFetcher::FetchError do
+    e = assert_raise Gem::RemoteFetcher::FetchError do
       fetcher.fetch_s3 URI.parse(url)
     end
 
@@ -952,7 +951,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
     with_configured_fetcher(
       ":ssl_ca_cert: #{temp_ca_cert}\n" +
       ":ssl_client_cert: #{temp_client_cert}\n") do |fetcher|
-      assert_raises Gem::RemoteFetcher::FetchError do
+      assert_raise Gem::RemoteFetcher::FetchError do
         fetcher.fetch_path("https://localhost:#{ssl_server.config[:Port]}/yaml")
       end
     end
@@ -961,7 +960,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
   def test_do_not_allow_insecure_ssl_connection_by_default
     ssl_server = start_ssl_server
     with_configured_fetcher do |fetcher|
-      assert_raises Gem::RemoteFetcher::FetchError do
+      assert_raise Gem::RemoteFetcher::FetchError do
         fetcher.fetch_path("https://localhost:#{ssl_server.config[:Port]}/yaml")
       end
     end
@@ -981,7 +980,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
       "redirecting to non-https resource: #{@server_uri} (https://localhost:#{ssl_server.config[:Port]}/insecure_redirect?to=#{@server_uri})"
 
     with_configured_fetcher(":ssl_ca_cert: #{temp_ca_cert}") do |fetcher|
-      err = assert_raises Gem::RemoteFetcher::FetchError do
+      err = assert_raise Gem::RemoteFetcher::FetchError do
         fetcher.fetch_path("https://localhost:#{ssl_server.config[:Port]}/insecure_redirect?to=#{@server_uri}")
       end
 
@@ -994,7 +993,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
     temp_ca_cert = nil
 
     with_configured_fetcher(":ssl_ca_cert: #{temp_ca_cert}") do |fetcher|
-      assert_raises Gem::RemoteFetcher::FetchError do
+      assert_raise Gem::RemoteFetcher::FetchError do
         fetcher.fetch_path("https://localhost:#{ssl_server.config[:Port]}")
       end
     end
@@ -1084,7 +1083,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
   end
 
   def start_ssl_server(config = {})
-    skip "starting this test server fails randomly on jruby" if Gem.java_platform?
+    pend "starting this test server fails randomly on jruby" if Gem.java_platform?
 
     null_logger = NilLog.new
     server = WEBrick::HTTPServer.new({