rubygems-update 2.7.11 → 3.0.0

data/test/rubygems/test_gem_stream_ui.rb

@@ -4,6 +4,7 @@ require 'rubygems/user_interaction'
 require 'timeout'
 
 class TestGemStreamUI < Gem::TestCase
+  SHORT_TIMEOUT = (defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?) ? 1.0 : 0.1 # increase timeout with MJIT for --jit-wait testing
 
   module IsTty
     attr_accessor :tty
@@ -36,9 +37,6 @@ class TestGemStreamUI < Gem::TestCase
   end
 
   def test_ask
-    skip 'TTY detection broken on windows' if
-      Gem.win_platform? && RUBY_VERSION <= '1.9.2'
-
     Timeout.timeout(1) do
       expected_answer = "Arthur, King of the Britons"
       @in.string = "#{expected_answer}\n"
@@ -48,21 +46,15 @@ class TestGemStreamUI < Gem::TestCase
   end
 
   def test_ask_no_tty
-    skip 'TTY detection broken on windows' if
-      Gem.win_platform? && RUBY_VERSION <= '1.9.2'
-
     @in.tty = false
 
-    Timeout.timeout(0.1) do
+    Timeout.timeout(SHORT_TIMEOUT) do
       answer = @sui.ask("what is your favorite color?")
       assert_nil answer
     end
   end
 
   def test_ask_for_password
-    skip 'Always uses $stdin on windows' if
-      Gem.win_platform? && RUBY_VERSION <= '1.9.2'
-
     Timeout.timeout(1) do
       expected_answer = "Arthur, King of the Britons"
       @in.string = "#{expected_answer}\n"
@@ -72,24 +64,18 @@ class TestGemStreamUI < Gem::TestCase
   end
 
   def test_ask_for_password_no_tty
-    skip 'TTY handling is broken on windows' if
-      Gem.win_platform? && RUBY_VERSION <= '1.9.2'
-
     @in.tty = false
 
-    Timeout.timeout(0.1) do
+    Timeout.timeout(SHORT_TIMEOUT) do
       answer = @sui.ask_for_password("what is the airspeed velocity of an unladen swallow?")
       assert_nil answer
     end
   end
 
   def test_ask_yes_no_no_tty_with_default
-    skip 'TTY handling is broken on windows' if
-      Gem.win_platform? && RUBY_VERSION <= '1.9.2'
-
     @in.tty = false
 
-    Timeout.timeout(0.1) do
+    Timeout.timeout(SHORT_TIMEOUT) do
       answer = @sui.ask_yes_no("do coconuts migrate?", false)
       assert_equal false, answer
 
@@ -99,12 +85,9 @@ class TestGemStreamUI < Gem::TestCase
   end
 
   def test_ask_yes_no_no_tty_without_default
-    skip 'TTY handling is broken on windows' if
-      Gem.win_platform? && RUBY_VERSION <= '1.9.2'
-
     @in.tty = false
 
-    Timeout.timeout(0.1) do
+    Timeout.timeout(SHORT_TIMEOUT) do
       assert_raises(Gem::OperationNotSupportedError) do
         @sui.ask_yes_no("do coconuts migrate?")
       end
@@ -174,14 +157,14 @@ class TestGemStreamUI < Gem::TestCase
   def test_download_reporter_anything
     @cfg.verbose = 0
     reporter = @sui.download_reporter
-    assert_kind_of Gem::StreamUI::VerboseDownloadReporter, reporter
+    assert_kind_of Gem::StreamUI::ThreadedDownloadReporter, reporter
   end
 
-  def test_verbose_download_reporter
+  def test_threaded_download_reporter
     @cfg.verbose = true
     reporter = @sui.download_reporter
     reporter.fetch 'a.gem', 1024
-    assert_equal "Fetching: a.gem", @out.string
+    assert_equal "Fetching a.gem\n", @out.string
   end
 
   def test_verbose_download_reporter_progress
@@ -189,7 +172,7 @@ class TestGemStreamUI < Gem::TestCase
     reporter = @sui.download_reporter
     reporter.fetch 'a.gem', 1024
     reporter.update 512
-    assert_equal "Fetching: a.gem\rFetching: a.gem ( 50%)", @out.string
+    assert_equal "Fetching a.gem\n", @out.string
   end
 
   def test_verbose_download_reporter_progress_once
@@ -198,7 +181,7 @@ class TestGemStreamUI < Gem::TestCase
     reporter.fetch 'a.gem', 1024
     reporter.update 510
     reporter.update 512
-    assert_equal "Fetching: a.gem\rFetching: a.gem ( 50%)", @out.string
+    assert_equal "Fetching a.gem\n", @out.string
   end
 
   def test_verbose_download_reporter_progress_complete
@@ -207,7 +190,7 @@ class TestGemStreamUI < Gem::TestCase
     reporter.fetch 'a.gem', 1024
     reporter.update 510
     reporter.done
-    assert_equal "Fetching: a.gem\rFetching: a.gem ( 50%)\rFetching: a.gem (100%)\n", @out.string
+    assert_equal "Fetching a.gem\n", @out.string
   end
 
   def test_verbose_download_reporter_progress_nil_length
@@ -216,7 +199,7 @@ class TestGemStreamUI < Gem::TestCase
     reporter.fetch 'a.gem', nil
     reporter.update 1024
     reporter.done
-    assert_equal "Fetching: a.gem\rFetching: a.gem (1024B)\rFetching: a.gem (1024B)\n", @out.string
+    assert_equal "Fetching a.gem\n", @out.string
   end
 
   def test_verbose_download_reporter_progress_zero_length
@@ -225,7 +208,7 @@ class TestGemStreamUI < Gem::TestCase
     reporter.fetch 'a.gem', 0
     reporter.update 1024
     reporter.done
-    assert_equal "Fetching: a.gem\rFetching: a.gem (1024B)\rFetching: a.gem (1024B)\n", @out.string
+    assert_equal "Fetching a.gem\n", @out.string
   end
 
   def test_verbose_download_reporter_no_tty

data/test/rubygems/test_gem_stub_specification.rb

@@ -240,7 +240,6 @@ end
 
       return stub
     end
-
   end
 
   def stub_with_extension
@@ -293,4 +292,3 @@ end
   end
 
 end
-

data/test/rubygems/test_gem_text.rb

@@ -21,6 +21,10 @@ class TestGemText < Gem::TestCase
     assert_equal "  text to wrap",    format_text("text to wrap", 40, 2)
   end
 
+  def test_format_text_no_space
+    assert_equal "texttowr\nap",     format_text("texttowrap", 8)
+  end
+
   def test_format_text_trailing # for two spaces after .
     text = <<-TEXT
 This line is really, really long.  So long, in fact, that it is more than eighty characters long!  The purpose of this line is for testing wrapping behavior because sometimes people don't wrap their text to eighty characters.  Without the wrapping, the text might not look good in the RSS feed.
@@ -85,9 +89,4 @@ Without the wrapping, the text might not look good in the RSS feed.
     s = "ab" * 500_001
     assert_equal "Truncating desc to 1,000,000 characters:\n#{s[0, 1_000_000]}", truncate_text(s, "desc", 1_000_000)
   end
-
-  def test_clean_text
-    assert_equal ".]2;nyan.", clean_text("\e]2;nyan\a")
-  end
-
 end

data/test/rubygems/test_gem_uninstaller.rb

@@ -177,10 +177,12 @@ class TestGemUninstaller < Gem::InstallerTestCase
     gem_dir = File.join @gemhome, 'gems', @spec.full_name
 
     Gem.pre_uninstall do
+      sleep(0.1) if win_platform?
       assert File.exist?(gem_dir), 'gem_dir should exist'
     end
 
     Gem.post_uninstall do
+      sleep(0.1) if win_platform?
       refute File.exist?(gem_dir), 'gem_dir should not exist'
     end
 
@@ -212,7 +214,7 @@ class TestGemUninstaller < Gem::InstallerTestCase
     default_spec = new_default_spec 'default', '2'
     install_default_gems default_spec
 
-    spec = new_spec 'default', '2'
+    spec = util_spec 'default', '2'
     install_gem spec
 
     Gem::Specification.reset
@@ -482,4 +484,22 @@ create_makefile '#{@spec.name}'
     assert_match %r!r-1 depends on q \(= 1, development\)!, lines.shift
     assert_match %r!Successfully uninstalled q-1!, lines.last
   end
+
+  def test_uninstall_no_permission
+    uninstaller = Gem::Uninstaller.new @spec.name, :executables => true
+
+    stub_rm_r = lambda do |*args|
+      _path = args.shift
+      options = args.shift || Hash.new
+      # Uninstaller calls a method in RDoc which also calls FileUtils.rm_rf which
+      # is an alias for FileUtils#rm_r, so skip if we're using the force option
+      raise Errno::EPERM unless options[:force]
+    end
+
+    FileUtils.stub :rm_r, stub_rm_r do
+      assert_raises Gem::UninstallError do
+        uninstaller.uninstall
+      end
+    end
+  end
 end

data/test/rubygems/test_gem_unsatisfiable_dependency_error.rb

@@ -30,4 +30,3 @@ class TestGemUnsatisfiableDependencyError < Gem::TestCase
   end
 
 end
-

data/test/rubygems/test_gem_uri_formatter.rb

@@ -26,4 +26,3 @@ class TestGemUriFormatter < Gem::TestCase
   end
 
 end
-

data/test/rubygems/test_gem_util.rb

@@ -5,8 +5,7 @@ require 'rubygems/util'
 class TestGemUtil < Gem::TestCase
 
   def test_class_popen
-    skip "MJIT executes process and it's caught by Process.wait(-1)" if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?
-    assert_equal "0\n", Gem::Util.popen(Gem.ruby, '-e', 'p 0')
+    assert_equal "0\n", Gem::Util.popen(Gem.ruby, '-I', File.expand_path('../../../lib', __FILE__), '-e', 'p 0')
 
     assert_raises Errno::ECHILD do
       Process.wait(-1)
@@ -15,7 +14,7 @@ class TestGemUtil < Gem::TestCase
 
   def test_silent_system
     assert_silent do
-      Gem::Util.silent_system Gem.ruby, '-e', 'puts "hello"; warn "hello"'
+      Gem::Util.silent_system Gem.ruby, '-I', File.expand_path('../../../lib', __FILE__), '-e', 'puts "hello"; warn "hello"'
     end
   end
 
@@ -38,17 +37,14 @@ class TestGemUtil < Gem::TestCase
     # impossible to cd into it and its children
     FileUtils.chmod(0666, 'd/e')
 
+    skip 'skipped in root privilege' if Process.uid.zero?
+
     paths = Gem::Util.traverse_parents('d/e/f').to_a
 
     assert_equal File.join(@tempdir, 'd'), paths[0]
     assert_equal @tempdir, paths[1]
-    if File.respond_to?(:realpath)
-      assert_equal File.realpath(Dir.tmpdir), paths[2]
-      assert_equal File.realpath("..", Dir.tmpdir), paths[3]
-    elsif RUBY_PLATFORM !~ /darwin/
-      assert_equal Dir.tmpdir, paths[2]
-      assert_equal '/', paths[3]
-    end
+    assert_equal File.realpath(Dir.tmpdir), paths[2]
+    assert_equal File.realpath("..", Dir.tmpdir), paths[3]
   ensure
     # restore default permissions, allow the directory to be removed
     FileUtils.chmod(0775, 'd/e') unless win_platform?
@@ -63,4 +59,3 @@ class TestGemUtil < Gem::TestCase
   end
 
 end
-

data/test/rubygems/test_gem_validator.rb

@@ -43,4 +43,3 @@ class TestGemValidator < Gem::TestCase
   end
 
 end
-

data/test/rubygems/test_gem_version.rb

@@ -212,19 +212,19 @@ class TestGemVersion < Gem::TestCase
 
   # Asserts that +version+ is a prerelease.
 
-  def assert_prerelease version
+  def assert_prerelease(version)
     assert v(version).prerelease?, "#{version} is a prerelease"
   end
 
   # Assert that +expected+ is the "approximate" recommendation for +version+.
 
-  def assert_approximate_equal expected, version
+  def assert_approximate_equal(expected, version)
     assert_equal expected, v(version).approximate_recommendation
   end
 
   # Assert that the "approximate" recommendation for +version+ satifies +version+.
 
-  def assert_approximate_satisfies_itself version
+  def assert_approximate_satisfies_itself(version)
     gem_version = v(version)
 
     assert Gem::Requirement.new(gem_version.approximate_recommendation).satisfied_by?(gem_version)
@@ -232,33 +232,33 @@ class TestGemVersion < Gem::TestCase
 
   # Assert that bumping the +unbumped+ version yields the +expected+.
 
-  def assert_bumped_version_equal expected, unbumped
+  def assert_bumped_version_equal(expected, unbumped)
     assert_version_equal expected, v(unbumped).bump
   end
 
   # Assert that +release+ is the correct non-prerelease +version+.
 
-  def assert_release_equal release, version
+  def assert_release_equal(release, version)
     assert_version_equal release, v(version).release
   end
 
   # Assert that two versions are equal. Handles strings or
   # Gem::Version instances.
 
-  def assert_version_equal expected, actual
+  def assert_version_equal(expected, actual)
     assert_equal v(expected), v(actual)
     assert_equal v(expected).hash, v(actual).hash, "since #{actual} == #{expected}, they must have the same hash"
   end
 
   # Assert that two versions are eql?. Checks both directions.
 
-  def assert_version_eql first, second
+  def assert_version_eql(first, second)
     first, second = v(first), v(second)
     assert first.eql?(second), "#{first} is eql? #{second}"
     assert second.eql?(first), "#{second} is eql? #{first}"
   end
 
-  def assert_less_than left, right
+  def assert_less_than(left, right)
     l = v(left)
     r = v(right)
     assert l < r, "#{left} not less than #{right}"
@@ -266,14 +266,14 @@ class TestGemVersion < Gem::TestCase
 
   # Refute the assumption that +version+ is a prerelease.
 
-  def refute_prerelease version
+  def refute_prerelease(version)
     refute v(version).prerelease?, "#{version} is NOT a prerelease"
   end
 
   # Refute the assumption that two versions are eql?. Checks both
   # directions.
 
-  def refute_version_eql first, second
+  def refute_version_eql(first, second)
     first, second = v(first), v(second)
     refute first.eql?(second), "#{first} is NOT eql? #{second}"
     refute second.eql?(first), "#{second} is NOT eql? #{first}"
@@ -281,7 +281,7 @@ class TestGemVersion < Gem::TestCase
 
   # Refute the assumption that the two versions are equal?.
 
-  def refute_version_equal unexpected, actual
+  def refute_version_equal(unexpected, actual)
     refute_equal v(unexpected), v(actual)
   end
 end

data/test/rubygems/test_gem_version_option.rb

@@ -164,4 +164,3 @@ class TestGemVersionOption < Gem::TestCase
   end
 
 end
-

data/test/rubygems/test_remote_fetch_error.rb

@@ -18,4 +18,3 @@ class TestRemoteFetchError < Gem::TestCase
     assert_equal error.to_s, 'There was an error fetching (https://gemsource.org)'
   end
 end
-

data/test/rubygems/test_require.rb

@@ -4,7 +4,7 @@ require 'rubygems'
 
 class TestGemRequire < Gem::TestCase
   class Latch
-    def initialize count = 1
+    def initialize(count = 1)
       @count = count
       @lock  = Monitor.new
       @cv    = @lock.new_cond
@@ -40,10 +40,10 @@ class TestGemRequire < Gem::TestCase
 
   # Providing -I on the commandline should always beat gems
   def test_dash_i_beats_gems
-    a1 = new_spec "a", "1", {"b" => "= 1"}, "lib/test_gem_require_a.rb"
-    b1 = new_spec "b", "1", {"c" => "> 0"}, "lib/b/c.rb"
-    c1 = new_spec "c", "1", nil, "lib/c/c.rb"
-    c2 = new_spec "c", "2", nil, "lib/c/c.rb"
+    a1 = util_spec "a", "1", {"b" => "= 1"}, "lib/test_gem_require_a.rb"
+    b1 = util_spec "b", "1", {"c" => "> 0"}, "lib/b/c.rb"
+    c1 = util_spec "c", "1", nil, "lib/c/c.rb"
+    c2 = util_spec "c", "2", nil, "lib/c/c.rb"
 
     install_specs c1, c2, b1, a1
 
@@ -80,13 +80,11 @@ class TestGemRequire < Gem::TestCase
   end
 
   def test_concurrent_require
-    skip 'deadlock' if /^1\.8\./ =~ RUBY_VERSION
-
     Object.const_set :FILE_ENTERED_LATCH, Latch.new(2)
     Object.const_set :FILE_EXIT_LATCH, Latch.new(1)
 
-    a1 = new_spec "a", "1", nil, "lib/a.rb"
-    b1 = new_spec "b", "1", nil, "lib/b.rb"
+    a1 = util_spec "a", "1", nil, "lib/a.rb"
+    b1 = util_spec "b", "1", nil, "lib/b.rb"
 
     install_specs a1, b1
 
@@ -107,9 +105,9 @@ class TestGemRequire < Gem::TestCase
   end
 
   def test_require_is_not_lazy_with_exact_req
-    a1 = new_spec "a", "1", {"b" => "= 1"}, "lib/test_gem_require_a.rb"
-    b1 = new_spec "b", "1", nil, "lib/b/c.rb"
-    b2 = new_spec "b", "2", nil, "lib/b/c.rb"
+    a1 = util_spec "a", "1", {"b" => "= 1"}, "lib/test_gem_require_a.rb"
+    b1 = util_spec "b", "1", nil, "lib/b/c.rb"
+    b2 = util_spec "b", "2", nil, "lib/b/c.rb"
 
     install_specs b1, b2, a1
 
@@ -122,9 +120,9 @@ class TestGemRequire < Gem::TestCase
   end
 
   def test_require_is_lazy_with_inexact_req
-    a1 = new_spec "a", "1", {"b" => ">= 1"}, "lib/test_gem_require_a.rb"
-    b1 = new_spec "b", "1", nil, "lib/b/c.rb"
-    b2 = new_spec "b", "2", nil, "lib/b/c.rb"
+    a1 = util_spec "a", "1", {"b" => ">= 1"}, "lib/test_gem_require_a.rb"
+    b1 = util_spec "b", "1", nil, "lib/b/c.rb"
+    b2 = util_spec "b", "2", nil, "lib/b/c.rb"
 
     install_specs b1, b2, a1
 
@@ -137,8 +135,8 @@ class TestGemRequire < Gem::TestCase
   end
 
   def test_require_is_not_lazy_with_one_possible
-    a1 = new_spec "a", "1", {"b" => ">= 1"}, "lib/test_gem_require_a.rb"
-    b1 = new_spec "b", "1", nil, "lib/b/c.rb"
+    a1 = util_spec "a", "1", {"b" => ">= 1"}, "lib/test_gem_require_a.rb"
+    b1 = util_spec "b", "1", nil, "lib/b/c.rb"
 
     install_specs b1, a1
 
@@ -151,7 +149,7 @@ class TestGemRequire < Gem::TestCase
   end
 
   def test_require_can_use_a_pathname_object
-    a1 = new_spec "a", "1", nil, "lib/test_gem_require_a.rb"
+    a1 = util_spec "a", "1", nil, "lib/test_gem_require_a.rb"
 
     install_specs a1
 
@@ -161,9 +159,9 @@ class TestGemRequire < Gem::TestCase
   end
 
   def test_activate_via_require_respects_loaded_files
-    a1 = new_spec "a", "1", {"b" => ">= 1"}, "lib/test_gem_require_a.rb"
-    b1 = new_spec "b", "1", nil, "lib/benchmark.rb"
-    b2 = new_spec "b", "2", nil, "lib/benchmark.rb"
+    a1 = util_spec "a", "1", {"b" => ">= 1"}, "lib/test_gem_require_a.rb"
+    b1 = util_spec "b", "1", nil, "lib/benchmark.rb"
+    b2 = util_spec "b", "2", nil, "lib/benchmark.rb"
 
     install_specs b1, b2, a1
 
@@ -181,11 +179,11 @@ class TestGemRequire < Gem::TestCase
   end
 
   def test_already_activated_direct_conflict
-    a1 = new_spec "a", "1", { "b" => "> 0" }
-    b1 = new_spec "b", "1", { "c" => ">= 1" }, "lib/ib.rb"
-    b2 = new_spec "b", "2", { "c" => ">= 2" }, "lib/ib.rb"
-    c1 = new_spec "c", "1", nil, "lib/d.rb"
-    c2 = new_spec("c", "2", nil, "lib/d.rb")
+    a1 = util_spec "a", "1", { "b" => "> 0" }
+    b1 = util_spec "b", "1", { "c" => ">= 1" }, "lib/ib.rb"
+    b2 = util_spec "b", "2", { "c" => ">= 2" }, "lib/ib.rb"
+    c1 = util_spec "c", "1", nil, "lib/d.rb"
+    c2 = util_spec("c", "2", nil, "lib/d.rb")
 
     install_specs c1, c2, b1, b2, a1
 
@@ -201,13 +199,13 @@ class TestGemRequire < Gem::TestCase
   end
 
   def test_multiple_gems_with_the_same_path
-    a1 = new_spec "a", "1", { "b" => "> 0", "x" => "> 0" }
-    b1 = new_spec "b", "1", { "c" => ">= 1" }, "lib/ib.rb"
-    b2 = new_spec "b", "2", { "c" => ">= 2" }, "lib/ib.rb"
-    x1 = new_spec "x", "1", nil, "lib/ib.rb"
-    x2 = new_spec "x", "2", nil, "lib/ib.rb"
-    c1 = new_spec "c", "1", nil, "lib/d.rb"
-    c2 = new_spec("c", "2", nil, "lib/d.rb")
+    a1 = util_spec "a", "1", { "b" => "> 0", "x" => "> 0" }
+    b1 = util_spec "b", "1", { "c" => ">= 1" }, "lib/ib.rb"
+    b2 = util_spec "b", "2", { "c" => ">= 2" }, "lib/ib.rb"
+    x1 = util_spec "x", "1", nil, "lib/ib.rb"
+    x2 = util_spec "x", "2", nil, "lib/ib.rb"
+    c1 = util_spec "c", "1", nil, "lib/d.rb"
+    c2 = util_spec("c", "2", nil, "lib/d.rb")
 
     install_specs c1, c2, x1, x2, b1, b2, a1
 
@@ -224,13 +222,13 @@ class TestGemRequire < Gem::TestCase
   end
 
   def test_unable_to_find_good_unresolved_version
-    a1 = new_spec "a", "1", { "b" => "> 0" }
-    b1 = new_spec "b", "1", { "c" => ">= 2" }, "lib/ib.rb"
-    b2 = new_spec "b", "2", { "c" => ">= 3" }, "lib/ib.rb"
+    a1 = util_spec "a", "1", { "b" => "> 0" }
+    b1 = util_spec "b", "1", { "c" => ">= 2" }, "lib/ib.rb"
+    b2 = util_spec "b", "2", { "c" => ">= 3" }, "lib/ib.rb"
 
-    c1 = new_spec "c", "1", nil, "lib/d.rb"
-    c2 = new_spec "c", "2", nil, "lib/d.rb"
-    c3 = new_spec "c", "3", nil, "lib/d.rb"
+    c1 = util_spec "c", "1", nil, "lib/d.rb"
+    c2 = util_spec "c", "2", nil, "lib/d.rb"
+    c3 = util_spec "c", "3", nil, "lib/d.rb"
 
     install_specs c1, c2, c3, b1, b2, a1
 
@@ -273,10 +271,10 @@ class TestGemRequire < Gem::TestCase
   end
 
   def test_require_doesnt_traverse_development_dependencies
-    a = new_spec("a", "1", nil, "lib/a.rb")
-    z = new_spec("z", "1", "w" => "> 0")
-    w1 = new_spec("w", "1") { |s| s.add_development_dependency "non-existent" }
-    w2 = new_spec("w", "2") { |s| s.add_development_dependency "non-existent" }
+    a = util_spec("a", "1", nil, "lib/a.rb")
+    z = util_spec("z", "1", "w" => "> 0")
+    w1 = util_spec("w", "1") { |s| s.add_development_dependency "non-existent" }
+    w2 = util_spec("w", "2") { |s| s.add_development_dependency "non-existent" }
 
     install_specs a, w1, w2, z
 
@@ -296,7 +294,6 @@ class TestGemRequire < Gem::TestCase
   end
 
   def test_realworld_default_gem
-    skip "no default gems on ruby < 2.0" unless RUBY_VERSION >= "2"
     begin
       gem 'json'
     rescue Gem::MissingSpecError
@@ -316,7 +313,7 @@ class TestGemRequire < Gem::TestCase
     default_gem_spec = new_default_spec("default", "2.0.0.0",
                                         nil, "default/gem.rb")
     install_default_specs(default_gem_spec)
-    normal_gem_spec = new_spec("default", "3.0", nil,
+    normal_gem_spec = util_spec("default", "3.0", nil,
                                "lib/default/gem.rb")
     install_specs(normal_gem_spec)
     assert_require "default/gem"
@@ -366,7 +363,7 @@ class TestGemRequire < Gem::TestCase
   end
 
   def test_require_default_when_gem_defined
-    a = new_spec("a", "1", nil, "lib/a.rb")
+    a = util_spec("a", "1", nil, "lib/a.rb")
     install_specs a
     c = Class.new do
       def self.gem(*args)
@@ -379,8 +376,8 @@ class TestGemRequire < Gem::TestCase
 
 
   def test_require_bundler
-    b1 = new_spec('bundler', '1', nil, "lib/bundler/setup.rb")
-    b2a = new_spec('bundler', '2.a', nil, "lib/bundler/setup.rb")
+    b1 = util_spec('bundler', '1', nil, "lib/bundler/setup.rb")
+    b2a = util_spec('bundler', '2.a', nil, "lib/bundler/setup.rb")
     install_specs b1, b2a
 
     require "rubygems/bundler_version_finder"
@@ -392,8 +389,8 @@ class TestGemRequire < Gem::TestCase
 
   def test_require_bundler_missing_bundler_version
     Gem::BundlerVersionFinder.stub(:bundler_version_with_reason, ["55", "reason"]) do
-      b1 = new_spec('bundler', '1.999999999', nil, "lib/bundler/setup.rb")
-      b2a = new_spec('bundler', '2.a', nil, "lib/bundler/setup.rb")
+      b1 = util_spec('bundler', '1.999999999', nil, "lib/bundler/setup.rb")
+      b2a = util_spec('bundler', '2.a', nil, "lib/bundler/setup.rb")
       install_specs b1, b2a
 
       e = assert_raises Gem::MissingSpecVersionError do
@@ -405,8 +402,8 @@ class TestGemRequire < Gem::TestCase
 
   def test_require_bundler_with_bundler_version
     Gem::BundlerVersionFinder.stub(:bundler_version_with_reason, ["1", "reason"]) do
-      b1 = new_spec('bundler', '1.999999999', nil, "lib/bundler/setup.rb")
-      b2 = new_spec('bundler', '2', nil, "lib/bundler/setup.rb")
+      b1 = util_spec('bundler', '1.999999999', nil, "lib/bundler/setup.rb")
+      b2 = util_spec('bundler', '2', nil, "lib/bundler/setup.rb")
       install_specs b1, b2
 
       $:.clear
@@ -415,6 +412,24 @@ class TestGemRequire < Gem::TestCase
     end
   end
 
+  if RUBY_VERSION >= "2.5"
+    def test_no_kernel_require_in_warn_with_uplevel
+      lib = File.realpath("../../../lib", __FILE__)
+      Dir.mktmpdir("warn_test") do |dir|
+        File.write(dir + "/sub.rb", "warn 'uplevel', 'test', uplevel: 1\n")
+        File.write(dir + "/main.rb", "require 'sub'\n")
+        _, err = capture_subprocess_io do
+          system(@@ruby, "-w", "-rpp", "--disable=gems", "-I", lib, "-C", dir, "-I.", "main.rb")
+        end
+        assert_equal "main.rb:1: warning: uplevel\ntest\n", err
+        _, err = capture_subprocess_io do
+          system(@@ruby, "-w", "-rpp", "--enable=gems", "-I", lib, "-C", dir, "-I.", "main.rb")
+        end
+        assert_equal "main.rb:1: warning: uplevel\ntest\n", err
+      end
+    end
+  end
+
   def silence_warnings
     old_verbose, $VERBOSE = $VERBOSE, false
     yield