diff options
Diffstat (limited to 'test/rubygems/test_gem.rb')
| -rw-r--r-- | test/rubygems/test_gem.rb | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb index 6d36a8bb62..40a473f8d6 100644 --- a/test/rubygems/test_gem.rb +++ b/test/rubygems/test_gem.rb @@ -11,7 +11,7 @@ require "rbconfig" class TestGem < Gem::TestCase PLUGINS_LOADED = [] # rubocop:disable Style/MutableConstant - PROJECT_DIR = File.expand_path("../..", __dir__).tap(&Gem::UNTAINT) + PROJECT_DIR = File.expand_path("../..", __dir__) def setup super @@ -96,7 +96,7 @@ class TestGem < Gem::TestCase gemhome2 = "#{@gemhome}2" - installed = Gem.install "a", "= 1", :install_dir => gemhome2 + installed = Gem.install "a", "= 1", install_dir: gemhome2 assert_equal %w[a-1], installed.map(&:full_name) @@ -115,7 +115,7 @@ class TestGem < Gem::TestCase begin raise "Error" rescue StandardError - Gem.install "a", "= 1", :install_dir => gemhome2 + Gem.install "a", "= 1", install_dir: gemhome2 end assert_equal %w[a-1], installed.map(&:full_name) end @@ -133,7 +133,7 @@ class TestGem < Gem::TestCase def test_self_install_permissions_umask_077 umask = File.umask(0o077) - assert_self_install_permissions + assert_self_install_permissions(data_mode: 0o600) ensure File.umask(umask) end @@ -151,14 +151,14 @@ class TestGem < Gem::TestCase Gem::Installer.exec_format = nil end - def assert_self_install_permissions(format_executable: false) + def assert_self_install_permissions(format_executable: false, data_mode: 0o640) mask = Gem.win_platform? ? 0o700 : 0o777 options = { - :dir_mode => 0o500, - :prog_mode => Gem.win_platform? ? 0o410 : 0o510, - :data_mode => 0o640, - :wrappers => true, - :format_executable => format_executable, + dir_mode: 0o500, + prog_mode: Gem.win_platform? ? 0o410 : 0o510, + data_mode: data_mode, + wrappers: true, + format_executable: format_executable, } Dir.chdir @tempdir do Dir.mkdir "bin" @@ -201,7 +201,7 @@ class TestGem < Gem::TestCase end assert_equal(expected, result) ensure - File.chmod(0o755, *Dir.glob(@gemhome + "/gems/**/").map {|path| path.tap(&Gem::UNTAINT) }) + File.chmod(0o755, *Dir.glob(@gemhome + "/gems/**/")) end def test_require_missing @@ -516,7 +516,10 @@ class TestGem < Gem::TestCase Gem.clear_paths - assert_nil Gem::Specification.send(:class_variable_get, :@@all) + with_env("GEM_HOME" => "foo", "GEM_PATH" => "bar") do + assert_equal("foo", Gem.dir) + assert_equal("bar", Gem.path.first) + end end def test_self_configuration @@ -1254,8 +1257,8 @@ class TestGem < Gem::TestCase Gem.try_activate "a_file" end - assert_match(/Could not find 'b' /, e.message) - assert_match(/at: #{a.spec_file}/, e.message) + assert_include(e.message, "Could not find 'b' ") + assert_include(e.message, "at: #{a.spec_file}") end def test_self_try_activate_missing_prerelease @@ -1281,7 +1284,6 @@ class TestGem < Gem::TestCase def test_self_try_activate_missing_extensions spec = util_spec "ext", "1" do |s| s.extensions = %w[ext/extconf.rb] - s.mark_version s.installed_by_version = v("2.2") end @@ -1552,9 +1554,9 @@ class TestGem < Gem::TestCase g = util_spec "g", "1", nil, "lib/g.rb" m = util_spec "m", "1", nil, "lib/m.rb" - install_gem g, :install_dir => Gem.dir - m0 = install_gem m, :install_dir => Gem.dir - m1 = install_gem m, :install_dir => Gem.user_dir + install_gem g, install_dir: Gem.dir + m0 = install_gem m, install_dir: Gem.dir + m1 = install_gem m, install_dir: Gem.user_dir assert_equal m0.gem_dir, File.join(Gem.dir, "gems", "m-1") assert_equal m1.gem_dir, File.join(Gem.user_dir, "gems", "m-1") @@ -1608,9 +1610,9 @@ class TestGem < Gem::TestCase g = util_spec "g", "1", nil, "lib/g.rb" m = util_spec "m", "1", nil, "lib/m.rb" - install_gem g, :install_dir => Gem.dir - install_gem m, :install_dir => Gem.dir - install_gem m, :install_dir => Gem.user_dir + install_gem g, install_dir: Gem.dir + install_gem m, install_dir: Gem.dir + install_gem m, install_dir: Gem.user_dir Gem.use_paths Gem.dir, [Gem.dir, Gem.user_dir] |