rubygems-update 3.2.17 → 3.2.18

data/test/rubygems/test_gem_ext_builder.rb

@@ -132,12 +132,12 @@ install:
       @builder.build_extensions
     end
 
-    assert_path_exists @spec.extension_dir
-    assert_path_exists @spec.gem_build_complete_path
-    assert_path_exists File.join @spec.extension_dir, 'gem_make.out'
-    assert_path_exists File.join @spec.extension_dir, 'a.rb'
-    assert_path_exists File.join @spec.gem_dir, 'lib', 'a.rb'
-    assert_path_exists File.join @spec.gem_dir, 'lib', 'a', 'b.rb'
+    assert_path_exist @spec.extension_dir
+    assert_path_exist @spec.gem_build_complete_path
+    assert_path_exist File.join @spec.extension_dir, 'gem_make.out'
+    assert_path_exist File.join @spec.extension_dir, 'a.rb'
+    assert_path_exist File.join @spec.gem_dir, 'lib', 'a.rb'
+    assert_path_exist File.join @spec.gem_dir, 'lib', 'a', 'b.rb'
   end
 
   def test_build_extensions_with_gemhome_with_space
@@ -188,12 +188,12 @@ install:
       @builder.build_extensions
     end
 
-    assert_path_exists @spec.extension_dir
-    assert_path_exists @spec.gem_build_complete_path
-    assert_path_exists File.join @spec.extension_dir, 'gem_make.out'
-    assert_path_exists File.join @spec.extension_dir, 'a.rb'
-    refute_path_exists File.join @spec.gem_dir, 'lib', 'a.rb'
-    refute_path_exists File.join @spec.gem_dir, 'lib', 'a', 'b.rb'
+    assert_path_exist @spec.extension_dir
+    assert_path_exist @spec.gem_build_complete_path
+    assert_path_exist File.join @spec.extension_dir, 'gem_make.out'
+    assert_path_exist File.join @spec.extension_dir, 'a.rb'
+    assert_path_not_exist File.join @spec.gem_dir, 'lib', 'a.rb'
+    assert_path_not_exist File.join @spec.gem_dir, 'lib', 'a', 'b.rb'
   ensure
     class << Gem
       remove_method :install_extension_in_lib
@@ -210,7 +210,7 @@ install:
     assert_equal '', @ui.output
     assert_equal '', @ui.error
 
-    refute_path_exists File.join @spec.extension_dir, 'gem_make.out'
+    assert_path_not_exist File.join @spec.extension_dir, 'gem_make.out'
   end
 
   def test_build_extensions_rebuild_failure
@@ -219,13 +219,13 @@ install:
 
     @spec.extensions << nil
 
-    assert_raises Gem::Ext::BuildError do
+    assert_raise Gem::Ext::BuildError do
       use_ui @ui do
         @builder.build_extensions
       end
     end
 
-    refute_path_exists @spec.gem_build_complete_path
+    assert_path_not_exist @spec.gem_build_complete_path
   end
 
   def test_build_extensions_extconf_bad
@@ -235,7 +235,7 @@ install:
 
     FileUtils.mkdir_p @spec.gem_dir
 
-    e = assert_raises Gem::Ext::BuildError do
+    e = assert_raise Gem::Ext::BuildError do
       use_ui @ui do
         @builder.build_extensions
       end
@@ -251,7 +251,7 @@ install:
     assert_match %r{#{Regexp.escape Gem.ruby} .* extconf\.rb}, cmd_make_out
     assert_match %r{: No such file}, cmd_make_out
 
-    refute_path_exists @spec.gem_build_complete_path
+    assert_path_not_exist @spec.gem_build_complete_path
 
     assert_equal cwd, Dir.pwd
   end
@@ -261,7 +261,7 @@ install:
     gem_make_out = File.join @spec.extension_dir, 'gem_make.out'
     @spec.extensions << nil
 
-    e = assert_raises Gem::Ext::BuildError do
+    e = assert_raise Gem::Ext::BuildError do
       use_ui @ui do
         @builder.build_extensions
       end
@@ -273,7 +273,7 @@ install:
 
     assert_equal "No builder for extension ''\n", File.read(gem_make_out)
 
-    refute_path_exists @spec.gem_build_complete_path
+    assert_path_not_exist @spec.gem_build_complete_path
   ensure
     FileUtils.rm_f gem_make_out
   end
@@ -308,7 +308,7 @@ install:
     path = File.join @spec.gem_dir, "extconf_args"
 
     assert_equal args.inspect, File.read(path).strip
-    assert_path_exists @spec.extension_dir
+    assert_path_exist @spec.extension_dir
   end
 
   def test_initialize

data/test/rubygems/test_gem_ext_cmake_builder.rb

@@ -7,13 +7,13 @@ class TestGemExtCmakeBuilder < Gem::TestCase
     super
 
     # Details: https://github.com/rubygems/rubygems/issues/1270#issuecomment-177368340
-    skip "CmakeBuilder doesn't work on Windows." if Gem.win_platform?
+    pend "CmakeBuilder doesn't work on Windows." if Gem.win_platform?
 
     begin
       _, status = Open3.capture2e('cmake')
-      skip 'cmake not present' unless status.success?
+      pend 'cmake not present' unless status.success?
     rescue Errno::ENOENT
-      skip 'cmake not present'
+      pend 'cmake not present'
     end
 
     @ext = File.join @tempdir, 'ext'
@@ -50,7 +50,7 @@ install (FILES test.txt DESTINATION bin)
   def test_self_build_fail
     output = []
 
-    error = assert_raises Gem::InstallError do
+    error = assert_raise Gem::InstallError do
       Gem::Ext::CmakeBuilder.build nil, @dest_path, output, [], nil, @ext
     end
 

data/test/rubygems/test_gem_ext_configure_builder.rb

@@ -17,7 +17,7 @@ class TestGemExtConfigureBuilder < Gem::TestCase
   end
 
   def test_self_build
-    skip("test_self_build skipped on MS Windows (VC++)") if vc_windows?
+    pend("test_self_build skipped on MS Windows (VC++)") if vc_windows?
 
     File.open File.join(@ext, './configure'), 'w' do |configure|
       configure.puts "#!/bin/sh\necho \"#{@makefile_body}\" > Makefile"
@@ -42,10 +42,10 @@ class TestGemExtConfigureBuilder < Gem::TestCase
   end
 
   def test_self_build_fail
-    skip("test_self_build_fail skipped on MS Windows (VC++)") if vc_windows?
+    pend("test_self_build_fail skipped on MS Windows (VC++)") if vc_windows?
     output = []
 
-    error = assert_raises Gem::InstallError do
+    error = assert_raise Gem::InstallError do
       Gem::Ext::ConfigureBuilder.build nil, @dest_path, output, [], nil, @ext
     end
 
@@ -62,7 +62,7 @@ class TestGemExtConfigureBuilder < Gem::TestCase
 
   def test_self_build_has_makefile
     if vc_windows? && !nmake_found?
-      skip("test_self_build_has_makefile skipped - nmake not found")
+      pend("test_self_build_has_makefile skipped - nmake not found")
     end
 
     File.open File.join(@ext, 'Makefile'), 'w' do |makefile|

data/test/rubygems/test_gem_ext_ext_conf_builder.rb

@@ -16,11 +16,11 @@ class TestGemExtExtConfBuilder < Gem::TestCase
 
   def test_class_build
     if java_platform?
-      skip("failing on jruby")
+      pend("failing on jruby")
     end
 
     if vc_windows? && !nmake_found?
-      skip("test_class_build skipped - nmake not found")
+      pend("test_class_build skipped - nmake not found")
     end
 
     File.open File.join(@ext, 'extconf.rb'), 'w' do |extconf|
@@ -41,11 +41,12 @@ class TestGemExtExtConfBuilder < Gem::TestCase
     assert_contains_make_command '', output[7]
     assert_contains_make_command 'install', output[10]
     assert_empty Dir.glob(File.join(@ext, 'siteconf*.rb'))
+    assert_empty Dir.glob(File.join(@ext, '.gem.*'))
   end
 
   def test_class_build_rbconfig_make_prog
     if java_platform?
-      skip("failing on jruby")
+      pend("failing on jruby")
     end
 
     configure_args do
@@ -70,7 +71,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
     ENV['MAKE'] = 'anothermake'
 
     if java_platform?
-      skip("failing on jruby")
+      pend("failing on jruby")
     end
 
     configure_args '' do
@@ -80,7 +81,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
 
       output = []
 
-      assert_raises Gem::InstallError do
+      assert_raise Gem::InstallError do
         Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output, [], nil, @ext
       end
 
@@ -93,7 +94,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
 
   def test_class_build_extconf_fail
     if vc_windows? && !nmake_found?
-      skip("test_class_build_extconf_fail skipped - nmake not found")
+      pend("test_class_build_extconf_fail skipped - nmake not found")
     end
 
     File.open File.join(@ext, 'extconf.rb'), 'w' do |extconf|
@@ -104,7 +105,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
 
     output = []
 
-    error = assert_raises Gem::InstallError do
+    error = assert_raise Gem::InstallError do
       Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output, [], nil, @ext
     end
 
@@ -114,12 +115,12 @@ class TestGemExtExtConfBuilder < Gem::TestCase
     assert_match(File.join(@dest_path, 'mkmf.log'), output[4])
     assert_includes(output, "To see why this extension failed to compile, please check the mkmf.log which can be found here:\n")
 
-    assert_path_exists File.join @dest_path, 'mkmf.log'
+    assert_path_exist File.join @dest_path, 'mkmf.log'
   end
 
   def test_class_build_extconf_success_without_warning
     if vc_windows? && !nmake_found?
-      skip("test_class_build_extconf_fail skipped - nmake not found")
+      pend("test_class_build_extconf_fail skipped - nmake not found")
     end
 
     File.open File.join(@ext, 'extconf.rb'), 'w' do |extconf|
@@ -134,12 +135,12 @@ class TestGemExtExtConfBuilder < Gem::TestCase
 
     refute_includes(output, "To see why this extension failed to compile, please check the mkmf.log which can be found here:\n")
 
-    assert_path_exists File.join @dest_path, 'mkmf.log'
+    assert_path_exist File.join @dest_path, 'mkmf.log'
   end
 
   def test_class_build_unconventional
     if vc_windows? && !nmake_found?
-      skip("test_class_build skipped - nmake not found")
+      pend("test_class_build skipped - nmake not found")
     end
 
     File.open File.join(@ext, 'extconf.rb'), 'w' do |extconf|
@@ -180,7 +181,7 @@ end
 
   def test_class_make
     if vc_windows? && !nmake_found?
-      skip("test_class_make skipped - nmake not found")
+      pend("test_class_make skipped - nmake not found")
     end
 
     output = []
@@ -202,7 +203,7 @@ end
   end
 
   def test_class_make_no_Makefile
-    error = assert_raises Gem::InstallError do
+    error = assert_raise Gem::InstallError do
       Gem::Ext::ExtConfBuilder.make @ext, ['output'], @ext
     end
 

data/test/rubygems/test_gem_ext_rake_builder.rb

@@ -90,7 +90,7 @@ class TestGemExtRakeBuilder < Gem::TestCase
     output = []
 
     build_rake_in(false) do |rake|
-      error = assert_raises Gem::InstallError do
+      error = assert_raise Gem::InstallError do
         Gem::Ext::RakeBuilder.build "mkrf_conf.rb", @dest_path, output, [], nil, @ext
       end
 

data/test/rubygems/test_gem_gemcutter_utilities.rb

@@ -101,7 +101,7 @@ class TestGemGemcutterUtilities < Gem::TestCase
     assert @fetcher.last_request["authorization"]
     assert_match %r{Signed in.}, @sign_in_ui.output
 
-    credentials = YAML.load_file Gem.configuration.credentials_path
+    credentials = load_yaml_file Gem.configuration.credentials_path
     assert_equal api_key, credentials[:rubygems_api_key]
   end
 
@@ -115,7 +115,7 @@ class TestGemGemcutterUtilities < Gem::TestCase
     assert @fetcher.last_request["authorization"]
     assert_match %r{Signed in.}, @sign_in_ui.output
 
-    credentials = YAML.load_file Gem.configuration.credentials_path
+    credentials = load_yaml_file Gem.configuration.credentials_path
     assert_equal api_key, credentials['http://example.com']
   end
 
@@ -129,7 +129,7 @@ class TestGemGemcutterUtilities < Gem::TestCase
     assert @fetcher.last_request["authorization"]
     assert_match %r{Signed in.}, @sign_in_ui.output
 
-    credentials = YAML.load_file Gem.configuration.credentials_path
+    credentials = load_yaml_file Gem.configuration.credentials_path
     assert_equal api_key, credentials[:rubygems_api_key]
   end
 
@@ -142,7 +142,7 @@ class TestGemGemcutterUtilities < Gem::TestCase
     assert @fetcher.last_request["authorization"]
     assert_match %r{Signed in.}, @sign_in_ui.output
 
-    credentials = YAML.load_file Gem.configuration.credentials_path
+    credentials = load_yaml_file Gem.configuration.credentials_path
     assert_equal api_key, credentials['http://example.com']
   end
 
@@ -177,13 +177,13 @@ class TestGemGemcutterUtilities < Gem::TestCase
     assert_match %r{Enter your RubyGems.org credentials.}, @sign_in_ui.output
     assert_match %r{Signed in.}, @sign_in_ui.output
 
-    credentials = YAML.load_file Gem.configuration.credentials_path
+    credentials = load_yaml_file Gem.configuration.credentials_path
     assert_equal api_key, credentials[:rubygems_api_key]
     assert_equal other_api_key, credentials[:other_api_key]
   end
 
   def test_sign_in_with_bad_credentials
-    assert_raises Gem::MockGemUi::TermError do
+    assert_raise Gem::MockGemUi::TermError do
       util_sign_in ['Access Denied.', 403, 'Forbidden']
     end
 
@@ -209,7 +209,7 @@ class TestGemGemcutterUtilities < Gem::TestCase
   def test_sign_in_with_incorrect_otp_code
     response = "You have enabled multifactor authentication but your request doesn't have the correct OTP code. Please check it and retry."
 
-    assert_raises Gem::MockGemUi::TermError do
+    assert_raise Gem::MockGemUi::TermError do
       util_sign_in [response, 401, 'Unauthorized'], nil, [], "111111\n"
     end
 
@@ -257,7 +257,7 @@ class TestGemGemcutterUtilities < Gem::TestCase
   end
 
   def test_verify_missing_api_key
-    assert_raises Gem::MockGemUi::TermError do
+    assert_raise Gem::MockGemUi::TermError do
       @cmd.verify_api_key :missing
     end
   end

data/test/rubygems/test_gem_install_update_options.rb

@@ -92,7 +92,7 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
   end
 
   def test_security_policy
-    skip 'openssl is missing' unless Gem::HAVE_OPENSSL
+    pend 'openssl is missing' unless Gem::HAVE_OPENSSL
 
     @cmd.handle_options %w[-P HighSecurity]
 
@@ -100,11 +100,11 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
   end
 
   def test_security_policy_unknown
-    skip 'openssl is missing' unless Gem::HAVE_OPENSSL
+    pend 'openssl is missing' unless Gem::HAVE_OPENSSL
 
     @cmd.add_install_update_options
 
-    e = assert_raises OptionParser::InvalidArgument do
+    e = assert_raise OptionParser::InvalidArgument do
       @cmd.handle_options %w[-P UnknownSecurity]
     end
     assert_includes e.message, "UnknownSecurity"
@@ -124,8 +124,8 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
 
     @installer = Gem::Installer.at @gem, @cmd.options
     @installer.install
-    assert_path_exists File.join(Gem.user_dir, 'gems')
-    assert_path_exists File.join(Gem.user_dir, 'gems', @spec.full_name)
+    assert_path_exist File.join(Gem.user_dir, 'gems')
+    assert_path_exist File.join(Gem.user_dir, 'gems', @spec.full_name)
   end
 
   def test_user_install_disabled_read_only
@@ -137,9 +137,9 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
     @gem = @spec.cache_file
 
     if win_platform?
-      skip('test_user_install_disabled_read_only test skipped on MS Windows')
+      pend('test_user_install_disabled_read_only test skipped on MS Windows')
     elsif Process.uid.zero?
-      skip('test_user_install_disabled_read_only test skipped in root privilege')
+      pend('test_user_install_disabled_read_only test skipped in root privilege')
     else
       @cmd.handle_options %w[--no-user-install]
 
@@ -150,7 +150,7 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
 
       Gem.use_paths @gemhome, @userhome
 
-      assert_raises(Gem::FilePermissionError) do
+      assert_raise(Gem::FilePermissionError) do
         Gem::Installer.at(@gem, @cmd.options).install
       end
     end
@@ -169,7 +169,7 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
 
   def test_vendor_missing
     vendordir(nil) do
-      e = assert_raises OptionParser::InvalidOption do
+      e = assert_raise OptionParser::InvalidOption do
         @cmd.handle_options %w[--vendor]
       end
 

data/test/rubygems/test_gem_installer.rb

@@ -76,7 +76,7 @@ end
     installer.generate_bin
 
     installed_exec = File.join util_inst_bindir, 'executable'
-    assert_path_exists installed_exec
+    assert_path_exist installed_exec
 
     wrapper = File.read installed_exec
     assert_match %r{generated by RubyGems}, wrapper
@@ -90,7 +90,7 @@ end
 
       ui = Gem::MockGemUi.new "n\n"
       use_ui ui do
-        e = assert_raises Gem::InstallError do
+        e = assert_raise Gem::InstallError do
           installer.generate_bin
         end
 
@@ -134,7 +134,7 @@ gem 'other', version
     installer.generate_bin # should not raise
 
     installed_exec = File.join util_inst_bindir, 'foo-executable-bar'
-    assert_path_exists installed_exec
+    assert_path_exist installed_exec
 
     wrapper = File.read installed_exec
     assert_match %r{generated by RubyGems}, wrapper
@@ -150,7 +150,7 @@ gem 'other', version
     ui = Gem::MockGemUi.new "n\n"
 
     use_ui ui do
-      e = assert_raises Gem::InstallError do
+      e = assert_raise Gem::InstallError do
         installer.generate_bin
       end
 
@@ -169,7 +169,7 @@ gem 'other', version
     installer.generate_bin
 
     installed_exec = File.join util_inst_bindir, 'executable'
-    assert_path_exists installed_exec
+    assert_path_exist installed_exec
 
     wrapper = File.read installed_exec
     assert_match %r{generated by RubyGems}, wrapper
@@ -184,7 +184,7 @@ gem 'other', version
     installer.generate_bin
 
     installed_exec = File.join util_inst_bindir, 'executable'
-    assert_path_exists installed_exec
+    assert_path_exist installed_exec
 
     wrapper = File.read installed_exec
     assert_match %r{generated by RubyGems}, wrapper
@@ -222,7 +222,7 @@ gem 'other', version
   end
 
   def test_check_that_user_bin_dir_is_in_path_tilde
-    skip "Tilde is PATH is not supported under MS Windows" if win_platform?
+    pend "Tilde is PATH is not supported under MS Windows" if win_platform?
 
     orig_PATH, ENV['PATH'] =
       ENV['PATH'], [ENV['PATH'], '~/bin'].join(File::PATH_SEPARATOR)
@@ -264,7 +264,7 @@ gem 'other', version
     assert installer.ensure_dependency(@spec, dep)
 
     dep = Gem::Dependency.new 'b', '> 2'
-    e = assert_raises Gem::InstallError do
+    e = assert_raise Gem::InstallError do
       installer.ensure_dependency @spec, dep
     end
 
@@ -278,7 +278,7 @@ gem 'other', version
 
     installer = Gem::Installer.at a_gem
 
-    e = assert_raises Gem::InstallError do
+    e = assert_raise Gem::InstallError do
       installer.ensure_loadable_spec
     end
 
@@ -287,7 +287,7 @@ gem 'other', version
   end
 
   def test_ensure_loadable_spec_security_policy
-    skip 'openssl is missing' unless Gem::HAVE_OPENSSL
+    pend 'openssl is missing' unless Gem::HAVE_OPENSSL
 
     _, a_gem = util_gem 'a', 2 do |s|
       s.add_dependency 'garbage ~> 5'
@@ -296,7 +296,7 @@ gem 'other', version
     policy = Gem::Security::HighSecurity
     installer = Gem::Installer.at a_gem, :security_policy => policy
 
-    assert_raises Gem::Security::Exception do
+    assert_raise Gem::Security::Exception do
       installer.ensure_loadable_spec
     end
   end
@@ -306,7 +306,7 @@ gem 'other', version
 
     installer.extract_files
 
-    assert_path_exists File.join @spec.gem_dir, 'bin/executable'
+    assert_path_exist File.join @spec.gem_dir, 'bin/executable'
   end
 
   def test_generate_bin_bindir
@@ -329,7 +329,7 @@ gem 'other', version
 
     assert_directory_exists util_inst_bindir
     installed_exec = File.join(util_inst_bindir, 'executable')
-    assert_path_exists installed_exec
+    assert_path_exist installed_exec
     assert_equal mask, File.stat(installed_exec).mode unless win_platform?
 
     wrapper = File.read installed_exec
@@ -372,7 +372,7 @@ gem 'other', version
     installer.generate_bin
     assert_directory_exists util_inst_bindir
     installed_exec = File.join util_inst_bindir, 'executable'
-    assert_path_exists installed_exec
+    assert_path_exist installed_exec
     assert_equal mask, File.stat(installed_exec).mode unless win_platform?
 
     wrapper = File.read installed_exec
@@ -391,7 +391,7 @@ gem 'other', version
     installer.generate_bin
     assert_directory_exists util_inst_bindir
     installed_exec = File.join util_inst_bindir, 'foo-executable-bar'
-    assert_path_exists installed_exec
+    assert_path_exist installed_exec
   ensure
     Gem::Installer.exec_format = nil
   end
@@ -407,7 +407,7 @@ gem 'other', version
     installer.generate_bin
     assert_directory_exists util_inst_bindir
     installed_exec = File.join util_inst_bindir, 'executable'
-    assert_path_exists installed_exec
+    assert_path_exist installed_exec
   ensure
     Gem::Installer.exec_format = nil
   end
@@ -431,7 +431,7 @@ gem 'other', version
     installer.generate_bin
 
     installed_exec = File.join("#{@gemhome}2", "bin", 'executable')
-    assert_path_exists installed_exec
+    assert_path_exist installed_exec
     assert_equal mask, File.stat(installed_exec).mode unless win_platform?
 
     wrapper = File.read installed_exec
@@ -446,7 +446,7 @@ gem 'other', version
     installer.wrappers = true
     installer.generate_bin
 
-    refute_path_exists util_inst_bindir, 'bin dir was created when not needed'
+    assert_path_not_exist util_inst_bindir, 'bin dir was created when not needed'
   end
 
   def test_generate_bin_script_no_perms
@@ -458,13 +458,13 @@ gem 'other', version
     Dir.mkdir util_inst_bindir
 
     if win_platform?
-      skip('test_generate_bin_script_no_perms skipped on MS Windows')
+      pend('test_generate_bin_script_no_perms skipped on MS Windows')
     elsif Process.uid.zero?
-      skip('test_generate_bin_script_no_perms skipped in root privilege')
+      pend('test_generate_bin_script_no_perms skipped in root privilege')
     else
       FileUtils.chmod 0000, util_inst_bindir
 
-      assert_raises Gem::FilePermissionError do
+      assert_raise Gem::FilePermissionError do
         installer.generate_bin
       end
     end
@@ -488,7 +488,7 @@ gem 'other', version
     installer.generate_bin
 
     installed_exec = File.join @gemhome, 'bin', 'executable'
-    assert_path_exists installed_exec
+    assert_path_exist installed_exec
     assert_equal mask, File.stat(installed_exec).mode unless win_platform?
 
     wrapper = File.read installed_exec
@@ -515,7 +515,7 @@ gem 'other', version
 
     installer.generate_bin
     assert_directory_exists util_inst_bindir
-    assert_path_exists installed_exec
+    assert_path_exist installed_exec
     assert_equal mask, File.stat(installed_exec).mode unless win_platform?
 
     assert_match %r{generated by RubyGems}, File.read(installed_exec)
@@ -525,7 +525,7 @@ gem 'other', version
   end
 
   def test_generate_bin_symlink
-    skip "Symlinks not supported or not enabled" unless symlink_supported?
+    pend "Symlinks not supported or not enabled" unless symlink_supported?
 
     installer = setup_base_installer
 
@@ -549,7 +549,7 @@ gem 'other', version
     installer.wrappers = false
     installer.generate_bin
 
-    refute_path_exists util_inst_bindir
+    assert_path_not_exist util_inst_bindir
   end
 
   def test_generate_bin_symlink_no_perms
@@ -562,13 +562,13 @@ gem 'other', version
     Dir.mkdir util_inst_bindir
 
     if win_platform?
-      skip('test_generate_bin_symlink_no_perms skipped on MS Windows')
+      pend('test_generate_bin_symlink_no_perms skipped on MS Windows')
     elsif Process.uid.zero?
-      skip('test_user_install_disabled_read_only test skipped in root privilege')
+      pend('test_user_install_disabled_read_only test skipped in root privilege')
     else
       FileUtils.chmod 0000, util_inst_bindir
 
-      assert_raises Gem::FilePermissionError do
+      assert_raise Gem::FilePermissionError do
         installer.generate_bin
       end
     end
@@ -577,7 +577,7 @@ gem 'other', version
   end
 
   def test_generate_bin_symlink_update_newer
-    skip "Symlinks not supported or not enabled" unless symlink_supported?
+    pend "Symlinks not supported or not enabled" unless symlink_supported?
 
     installer = setup_base_installer
 
@@ -609,7 +609,7 @@ gem 'other', version
   end
 
   def test_generate_bin_symlink_update_older
-    skip "Symlinks not supported or not enabled" unless symlink_supported?
+    pend "Symlinks not supported or not enabled" unless symlink_supported?
 
     installer = setup_base_installer
 
@@ -647,7 +647,7 @@ gem 'other', version
   end
 
   def test_generate_bin_symlink_update_remove_wrapper
-    skip "Symlinks not supported or not enabled" unless symlink_supported?
+    pend "Symlinks not supported or not enabled" unless symlink_supported?
 
     installer = setup_base_installer
 
@@ -658,7 +658,7 @@ gem 'other', version
     installer.generate_bin
 
     installed_exec = File.join util_inst_bindir, 'executable'
-    assert_path_exists installed_exec
+    assert_path_exist installed_exec
 
     @spec = Gem::Specification.new do |s|
       s.files = ['lib/code.rb']
@@ -701,7 +701,7 @@ gem 'other', version
 
     assert_directory_exists util_inst_bindir
     installed_exec = File.join(util_inst_bindir, 'executable')
-    assert_path_exists installed_exec
+    assert_path_exist installed_exec
 
     if symlink_supported?
       assert File.symlink?(installed_exec)
@@ -720,7 +720,7 @@ gem 'other', version
   end
 
   def test_generate_bin_uses_default_shebang
-    skip "Symlinks not supported or not enabled" unless symlink_supported?
+    pend "Symlinks not supported or not enabled" unless symlink_supported?
 
     installer = setup_base_installer
 
@@ -946,22 +946,22 @@ gem 'other', version
     spec_file  = File.join @gemhome, 'specifications', @spec.spec_name
 
     Gem.pre_install do
-      refute_path_exists cache_file, 'cache file must not exist yet'
-      refute_path_exists spec_file,  'spec file must not exist yet'
+      assert_path_not_exist cache_file, 'cache file must not exist yet'
+      assert_path_not_exist spec_file,  'spec file must not exist yet'
       true
     end
 
     Gem.post_build do
-      assert_path_exists gemdir, 'gem install dir must exist'
-      assert_path_exists rakefile, 'gem executable must exist'
-      refute_path_exists stub_exe, 'gem executable must not exist'
-      refute_path_exists spec_file, 'spec file must not exist yet'
+      assert_path_exist gemdir, 'gem install dir must exist'
+      assert_path_exist rakefile, 'gem executable must exist'
+      assert_path_not_exist stub_exe, 'gem executable must not exist'
+      assert_path_not_exist spec_file, 'spec file must not exist yet'
       true
     end
 
     Gem.post_install do
-      assert_path_exists cache_file, 'cache file must exist'
-      assert_path_exists spec_file,  'spec file must exist'
+      assert_path_exist cache_file, 'cache file must exist'
+      assert_path_exist spec_file,  'spec file must exist'
     end
 
     @newspec = nil
@@ -972,21 +972,21 @@ gem 'other', version
     end
 
     assert_equal @spec, @newspec
-    assert_path_exists gemdir
-    assert_path_exists stub_exe, 'gem executable must exist'
+    assert_path_exist gemdir
+    assert_path_exist stub_exe, 'gem executable must exist'
 
     exe = File.join gemdir, 'bin', 'executable'
-    assert_path_exists exe
+    assert_path_exist exe
 
     exe_mode = File.stat(exe).mode & 0111
     assert_equal 0111, exe_mode, "0%o" % exe_mode unless win_platform?
 
-    assert_path_exists File.join gemdir, 'lib', 'code.rb'
+    assert_path_exist File.join gemdir, 'lib', 'code.rb'
 
-    assert_path_exists rakefile
+    assert_path_exist rakefile
 
     assert_equal spec_file, @newspec.loaded_from
-    assert_path_exists spec_file
+    assert_path_exist spec_file
 
     assert_same installer, @post_build_hook_arg
     assert_same installer, @post_install_hook_arg
@@ -1009,7 +1009,7 @@ gem 'other', version
 
     exe = File.join gemdir, 'bin', 'executable'
 
-    e = assert_raises RuntimeError do
+    e = assert_raise RuntimeError do
       instance_eval File.read(exe)
     end
 
@@ -1055,7 +1055,7 @@ gem 'other', version
       end
     end
 
-    e = assert_raises RuntimeError do
+    e = assert_raise RuntimeError do
       instance_eval File.read(old_bin_file)
     end
 
@@ -1083,7 +1083,7 @@ gem 'other', version
     begin
       Gem::Specification.reset
 
-      e = assert_raises Gem::GemNotFoundException do
+      e = assert_raise Gem::GemNotFoundException do
         instance_eval File.read(exe)
       end
     ensure
@@ -1100,7 +1100,7 @@ gem 'other', version
 
     exe = File.join @gemhome, 'bin', 'executable'
 
-    assert_path_exists exe, "default gem's executable not installed"
+    assert_path_exist exe, "default gem's executable not installed"
 
     installer = util_setup_installer do |spec|
       spec.name = 'default'
@@ -1118,7 +1118,7 @@ gem 'other', version
       end
     end
 
-    e = assert_raises RuntimeError do
+    e = assert_raise RuntimeError do
       instance_eval File.read(exe)
     end
 
@@ -1145,7 +1145,7 @@ gem 'other', version
     begin
       Gem::Specification.reset
 
-      e = assert_raises RuntimeError do
+      e = assert_raise RuntimeError do
         instance_eval File.read(exe)
       end
     ensure
@@ -1165,7 +1165,7 @@ gem 'other', version
     end
 
     gemdir = File.join(@gemhome, 'gems', @spec.full_name)
-    assert_path_exists File.join gemdir, 'lib', 'code.rb'
+    assert_path_exist File.join gemdir, 'lib', 'code.rb'
 
     installer = util_setup_installer
 
@@ -1188,8 +1188,8 @@ gem 'other', version
       end
     end
 
-    assert_path_exists File.join gemdir, 'lib', 'other.rb'
-    refute_path_exists File.join gemdir, 'lib', 'code.rb',
+    assert_path_exist File.join gemdir, 'lib', 'other.rb'
+    assert_path_not_exist File.join gemdir, 'lib', 'code.rb',
            "code.rb from prior install of same gem shouldn't remain here"
   end
 
@@ -1204,7 +1204,7 @@ gem 'other', version
     end
 
     gem_dir = File.join(@gemhome, 'gems', 'missing_dep-1')
-    assert_path_exists gem_dir
+    assert_path_exist gem_dir
   end
 
   def test_install_build_root
@@ -1231,8 +1231,8 @@ gem 'other', version
     assert_directory_exists File.join(Gem.dir, 'doc')
     assert_directory_exists File.join(Gem.dir, 'specifications')
 
-    assert_path_exists File.join @gemhome, 'cache', @spec.file_name
-    assert_path_exists File.join @gemhome, 'specifications', @spec.spec_name
+    assert_path_exist File.join @gemhome, 'cache', @spec.file_name
+    assert_path_exist File.join @gemhome, 'specifications', @spec.spec_name
   end
 
   def test_install_post_build_false
@@ -1243,7 +1243,7 @@ gem 'other', version
     end
 
     use_ui @ui do
-      e = assert_raises Gem::InstallError do
+      e = assert_raise Gem::InstallError do
         installer.install
       end
 
@@ -1253,10 +1253,10 @@ gem 'other', version
     end
 
     spec_file = File.join @gemhome, 'specifications', @spec.spec_name
-    refute_path_exists spec_file
+    assert_path_not_exist spec_file
 
     gem_dir = File.join @gemhome, 'gems', @spec.full_name
-    refute_path_exists gem_dir
+    assert_path_not_exist gem_dir
   end
 
   def test_install_post_build_nil
@@ -1271,10 +1271,10 @@ gem 'other', version
     end
 
     spec_file = File.join @gemhome, 'specifications', @spec.spec_name
-    assert_path_exists spec_file
+    assert_path_exist spec_file
 
     gem_dir = File.join @gemhome, 'gems', @spec.full_name
-    assert_path_exists gem_dir
+    assert_path_exist gem_dir
   end
 
   def test_install_pre_install_false
@@ -1285,7 +1285,7 @@ gem 'other', version
     end
 
     use_ui @ui do
-      e = assert_raises Gem::InstallError do
+      e = assert_raise Gem::InstallError do
         installer.install
       end
 
@@ -1295,7 +1295,7 @@ gem 'other', version
     end
 
     spec_file = File.join @gemhome, 'specifications', @spec.spec_name
-    refute_path_exists spec_file
+    assert_path_not_exist spec_file
   end
 
   def test_install_pre_install_nil
@@ -1310,7 +1310,7 @@ gem 'other', version
     end
 
     spec_file = File.join @gemhome, 'specifications', @spec.spec_name
-    assert_path_exists spec_file
+    assert_path_exist spec_file
   end
 
   def test_install_with_message
@@ -1364,7 +1364,7 @@ gem 'other', version
 
     expected_makefile = File.join gemhome2, 'gems', @spec.full_name, 'Makefile'
 
-    assert_path_exists expected_makefile
+    assert_path_exist expected_makefile
   end
 
   def test_install_extension_dir_is_removed_on_reinstall
@@ -1393,7 +1393,7 @@ gem 'other', version
     write_file should_be_removed do |io|
       io.write "DELETE ME ON REINSTALL"
     end
-    assert_path_exists should_be_removed
+    assert_path_exist should_be_removed
 
     # reinstall the gem, this is also the same as pristine
     use_ui @ui do
@@ -1401,7 +1401,7 @@ gem 'other', version
       installer.install
     end
 
-    refute_path_exists should_be_removed
+    assert_path_not_exist should_be_removed
   end
 
   def test_install_user_extension_dir
@@ -1429,13 +1429,13 @@ gem 'other', version
 
     expected_makefile = File.join Gem.user_dir, 'gems', @spec.full_name, 'Makefile'
 
-    assert_path_exists expected_makefile
-    assert_path_exists expected_extension_dir
-    refute_path_exists File.join expected_extension_dir, 'gem_make.out'
+    assert_path_exist expected_makefile
+    assert_path_exist expected_extension_dir
+    assert_path_not_exist File.join expected_extension_dir, 'gem_make.out'
   end
 
   def test_find_lib_file_after_install
-    skip "extensions don't quite work on jruby" if Gem.java_platform?
+    pend "extensions don't quite work on jruby" if Gem.java_platform?
 
     @spec = setup_base_spec
     @spec.extensions << "extconf.rb"
@@ -1481,7 +1481,7 @@ gem 'other', version
   end
 
   def test_install_extension_and_script
-    skip "Makefile creation crashes on jruby" if Gem.java_platform?
+    pend "Makefile creation crashes on jruby" if Gem.java_platform?
 
     @spec = setup_base_spec
     @spec.extensions << "extconf.rb"
@@ -1509,65 +1509,67 @@ gem 'other', version
       RUBY
     end
 
-    refute_path_exists File.join @spec.gem_dir, rb
-    refute_path_exists File.join @spec.gem_dir, rb2
+    assert_path_not_exist File.join @spec.gem_dir, rb
+    assert_path_not_exist File.join @spec.gem_dir, rb2
     use_ui @ui do
       path = Gem::Package.build @spec
 
       installer = Gem::Installer.at path
       installer.install
     end
-    assert_path_exists File.join @spec.gem_dir, rb
-    assert_path_exists File.join @spec.gem_dir, rb2
+    assert_path_exist File.join @spec.gem_dir, rb
+    assert_path_exist File.join @spec.gem_dir, rb2
   end
 
   def test_install_extension_flat
-    skip "extensions don't quite work on jruby" if Gem.java_platform?
+    pend "extensions don't quite work on jruby" if Gem.java_platform?
 
-    @spec = setup_base_spec
-    @spec.require_paths = ["."]
+    begin
+      @spec = setup_base_spec
+      @spec.require_paths = ["."]
 
-    @spec.extensions << "extconf.rb"
+      @spec.extensions << "extconf.rb"
 
-    write_file File.join(@tempdir, "extconf.rb") do |io|
-      io.write <<-RUBY
-        require "mkmf"
+      write_file File.join(@tempdir, "extconf.rb") do |io|
+        io.write <<-RUBY
+          require "mkmf"
 
-        CONFIG['CC'] = '$(TOUCH) $@ ||'
-        CONFIG['LDSHARED'] = '$(TOUCH) $@ ||'
-        $ruby = '#{Gem.ruby}'
+          CONFIG['CC'] = '$(TOUCH) $@ ||'
+          CONFIG['LDSHARED'] = '$(TOUCH) $@ ||'
+          $ruby = '#{Gem.ruby}'
 
-        create_makefile("#{@spec.name}")
-      RUBY
-    end
+          create_makefile("#{@spec.name}")
+        RUBY
+      end
 
-    # empty depend file for no auto dependencies
-    @spec.files += %W[depend #{@spec.name}.c].each do |file|
-      write_file File.join(@tempdir, file)
-    end
+      # empty depend file for no auto dependencies
+      @spec.files += %W[depend #{@spec.name}.c].each do |file|
+        write_file File.join(@tempdir, file)
+      end
 
-    so = File.join(@spec.gem_dir, "#{@spec.name}.#{RbConfig::CONFIG["DLEXT"]}")
-    refute_path_exists so
-    use_ui @ui do
-      path = Gem::Package.build @spec
+      so = File.join(@spec.gem_dir, "#{@spec.name}.#{RbConfig::CONFIG["DLEXT"]}")
+      assert_path_not_exist so
+      use_ui @ui do
+        path = Gem::Package.build @spec
 
-      installer = Gem::Installer.at path
-      installer.install
-    end
-    assert_path_exists so
-  rescue
-    puts '-' * 78
-    puts File.read File.join(@gemhome, 'gems', 'a-2', 'Makefile')
-    puts '-' * 78
+        installer = Gem::Installer.at path
+        installer.install
+      end
+      assert_path_exist so
+    rescue
+      puts '-' * 78
+      puts File.read File.join(@gemhome, 'gems', 'a-2', 'Makefile')
+      puts '-' * 78
 
-    path = File.join(@gemhome, 'gems', 'a-2', 'gem_make.out')
+      path = File.join(@gemhome, 'gems', 'a-2', 'gem_make.out')
 
-    if File.exist?(path)
-      puts File.read(path)
-      puts '-' * 78
-    end
+      if File.exist?(path)
+        puts File.read(path)
+        puts '-' * 78
+      end
 
-    raise
+      raise
+    end
   end
 
   def test_installation_satisfies_dependency_eh
@@ -1600,7 +1602,7 @@ gem 'other', version
     installer.force = false
 
     use_ui @ui do
-      assert_raises Gem::InstallError do
+      assert_raise Gem::InstallError do
         installer.install
       end
     end
@@ -1659,7 +1661,7 @@ gem 'other', version
 
     use_ui @ui do
       installer = Gem::Installer.at gem
-      e = assert_raises Gem::InstallError do
+      e = assert_raise Gem::InstallError do
         installer.pre_install_checks
       end
       assert_equal '#<Gem::Specification name=../malicious version=1> has an invalid name', e.message
@@ -1679,7 +1681,7 @@ gem 'other', version
 
     use_ui @ui do
       installer = Gem::Installer.at gem
-      e = assert_raises Gem::InstallError do
+      e = assert_raise Gem::InstallError do
         installer.pre_install_checks
       end
       assert_equal "#<Gem::Specification name=malicious\n::Object.const_set(:FROM_EVAL, true)# version=1> has an invalid name", e.message
@@ -1701,7 +1703,7 @@ gem 'other', version
 
     use_ui @ui do
       installer = Gem::Installer.at gem
-      e = assert_raises Gem::InstallError do
+      e = assert_raise Gem::InstallError do
         installer.pre_install_checks
       end
       assert_equal "#<Gem::Specification name=malicious version=1> has an invalid require_paths", e.message
@@ -1709,7 +1711,7 @@ gem 'other', version
   end
 
   def test_pre_install_checks_malicious_extensions_before_eval
-    skip "mswin environment disallow to create file contained the carriage return code." if Gem.win_platform?
+    pend "mswin environment disallow to create file contained the carriage return code." if Gem.win_platform?
 
     spec = util_spec "malicious", '1'
     def spec.full_name # so the spec is buildable
@@ -1724,7 +1726,7 @@ gem 'other', version
 
     use_ui @ui do
       installer = Gem::Installer.at gem
-      e = assert_raises Gem::InstallError do
+      e = assert_raise Gem::InstallError do
         installer.pre_install_checks
       end
       assert_equal "#<Gem::Specification name=malicious version=1> has an invalid extensions", e.message
@@ -1745,7 +1747,7 @@ gem 'other', version
 
     use_ui @ui do
       installer = Gem::Installer.at gem
-      e = assert_raises Gem::InstallError do
+      e = assert_raise Gem::InstallError do
         installer.pre_install_checks
       end
       assert_equal "#<Gem::Specification name=malicious version=1> has an invalid specification_version", e.message
@@ -1767,7 +1769,7 @@ gem 'other', version
     use_ui @ui do
       installer = Gem::Installer.at gem
       installer.ignore_dependencies = true
-      e = assert_raises Gem::InstallError do
+      e = assert_raise Gem::InstallError do
         installer.pre_install_checks
       end
       assert_equal "#<Gem::Specification name=malicious version=1> has an invalid dependencies", e.message
@@ -1991,14 +1993,14 @@ gem 'other', version
       installer.unpack dest
     end
 
-    assert_path_exists File.join dest, 'lib', 'code.rb'
-    assert_path_exists File.join dest, 'bin', 'executable'
+    assert_path_exist File.join dest, 'lib', 'code.rb'
+    assert_path_exist File.join dest, 'bin', 'executable'
   end
 
   def test_write_build_info_file
     installer = setup_base_installer
 
-    refute_path_exists @spec.build_info_file
+    assert_path_not_exist @spec.build_info_file
 
     installer.build_args = %w[
       --with-libyaml-dir /usr/local/Cellar/libyaml/0.1.4
@@ -2006,7 +2008,7 @@ gem 'other', version
 
     installer.write_build_info_file
 
-    assert_path_exists @spec.build_info_file
+    assert_path_exist @spec.build_info_file
 
     expected = "--with-libyaml-dir\n/usr/local/Cellar/libyaml/0.1.4\n"
 
@@ -2016,11 +2018,11 @@ gem 'other', version
   def test_write_build_info_file_empty
     installer = setup_base_installer
 
-    refute_path_exists @spec.build_info_file
+    assert_path_not_exist @spec.build_info_file
 
     installer.write_build_info_file
 
-    refute_path_exists @spec.build_info_file
+    assert_path_not_exist @spec.build_info_file
   end
 
   def test_write_build_info_file_install_dir
@@ -2033,8 +2035,8 @@ gem 'other', version
 
     installer.write_build_info_file
 
-    refute_path_exists @spec.build_info_file
-    assert_path_exists \
+    assert_path_not_exist @spec.build_info_file
+    assert_path_exist \
       File.join("#{@gemhome}2", 'build_info', "#{@spec.full_name}.info")
   end
 
@@ -2044,27 +2046,27 @@ gem 'other', version
     gem = File.join @gemhome, @spec.file_name
 
     FileUtils.mv cache_file, gem
-    refute_path_exists cache_file
+    assert_path_not_exist cache_file
 
     installer = Gem::Installer.at gem
     installer.gem_home = @gemhome
 
     installer.write_cache_file
 
-    assert_path_exists cache_file
+    assert_path_exist cache_file
   end
 
   def test_write_spec
     @spec = setup_base_spec
     FileUtils.rm @spec.spec_file
-    refute_path_exists @spec.spec_file
+    assert_path_not_exist @spec.spec_file
 
     installer = Gem::Installer.for_spec @spec
     installer.gem_home = @gemhome
 
     installer.write_spec
 
-    assert_path_exists @spec.spec_file
+    assert_path_exist @spec.spec_file
 
     loaded = Gem::Specification.load @spec.spec_file
 
@@ -2076,7 +2078,7 @@ gem 'other', version
   def test_write_spec_writes_cached_spec
     @spec = setup_base_spec
     FileUtils.rm @spec.spec_file
-    refute_path_exists @spec.spec_file
+    assert_path_not_exist @spec.spec_file
 
     @spec.files = %w[a.rb b.rb c.rb]
 
@@ -2119,7 +2121,7 @@ gem 'other', version
 
     assert_directory_exists File.join(@spec.gem_dir, 'bin')
     installed_exec = File.join @spec.gem_dir, 'bin', 'executable'
-    assert_path_exists installed_exec
+    assert_path_exist installed_exec
 
     assert_directory_exists File.join(Gem.default_dir, 'specifications')
     assert_directory_exists File.join(Gem.default_dir, 'specifications', 'default')
@@ -2131,7 +2133,7 @@ gem 'other', version
     assert_directory_exists util_inst_bindir
 
     installed_exec = File.join util_inst_bindir, 'executable'
-    assert_path_exists installed_exec
+    assert_path_exist installed_exec
 
     wrapper = File.read installed_exec
 
@@ -2157,7 +2159,7 @@ gem 'other', version
     assert_directory_exists util_inst_bindir
 
     installed_exec = File.join util_inst_bindir, 'executable'
-    assert_path_exists installed_exec
+    assert_path_exist installed_exec
 
     wrapper = File.read installed_exec
     assert_match %r{generated by RubyGems}, wrapper
@@ -2183,7 +2185,7 @@ gem 'other', version
 
     assert_directory_exists File.join(@spec.gem_dir, 'exe')
     installed_exec = File.join @spec.gem_dir, 'exe', 'executable'
-    assert_path_exists installed_exec
+    assert_path_exist installed_exec
 
     assert_directory_exists File.join(Gem.default_dir, 'specifications')
     assert_directory_exists File.join(Gem.default_dir, 'specifications', 'default')