* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems-2.5.2.

  It supports to enable frozen string literal and add `--norc` option for
  disable to `.gemrc` configuration.
  See 2.5.2 release notes for other fixes and enhancements.
  https://github.com/rubygems/rubygems/blob/a8aa3bac723f045c52471c7b9328310a048561e0/History.txt#L3

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53707 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

140 files changed, 449 insertions, 327 deletions

diff --git a/test/rubygems/bad_rake.rb b/test/rubygems/bad_rake.rb
index dc603fdec1..a08aa7dacc 100644
--- a/test/rubygems/bad_rake.rb
+++ b/test/rubygems/bad_rake.rb
@@ -1,2 +1,2 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 exit 1
diff --git a/test/rubygems/bogussources.rb b/test/rubygems/bogussources.rb
index f51ff60c37..4f783c3bd2 100644
--- a/test/rubygems/bogussources.rb
+++ b/test/rubygems/bogussources.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
 # All rights reserved.
diff --git a/test/rubygems/fake_certlib/openssl.rb b/test/rubygems/fake_certlib/openssl.rb
index 2b026df0d8..c7f85140a1 100644
--- a/test/rubygems/fake_certlib/openssl.rb
+++ b/test/rubygems/fake_certlib/openssl.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
 # All rights reserved.
diff --git a/test/rubygems/fix_openssl_warnings.rb b/test/rubygems/fix_openssl_warnings.rb
index e34551c8a9..1f5b8b5e0a 100644
--- a/test/rubygems/fix_openssl_warnings.rb
+++ b/test/rubygems/fix_openssl_warnings.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 ##
 # HACK: this drives me BONKERS
 
diff --git a/test/rubygems/foo/discover.rb b/test/rubygems/foo/discover.rb
index 1effd1c8b0..8e9b8f90fa 100644
--- a/test/rubygems/foo/discover.rb
+++ b/test/rubygems/foo/discover.rb
@@ -1 +1 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
diff --git a/test/rubygems/good_rake.rb b/test/rubygems/good_rake.rb
index 2d5c76c13a..4a05ae4a13 100644
--- a/test/rubygems/good_rake.rb
+++ b/test/rubygems/good_rake.rb
@@ -1,2 +1,2 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 exit 0
diff --git a/test/rubygems/plugin/exception/rubygems_plugin.rb b/test/rubygems/plugin/exception/rubygems_plugin.rb
index 1ab8c553e2..9a6f557b5c 100644
--- a/test/rubygems/plugin/exception/rubygems_plugin.rb
+++ b/test/rubygems/plugin/exception/rubygems_plugin.rb
@@ -1,3 +1,3 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 TestGem::TEST_PLUGIN_EXCEPTION = :loaded
 raise Exception.new('boom')
diff --git a/test/rubygems/plugin/load/rubygems_plugin.rb b/test/rubygems/plugin/load/rubygems_plugin.rb
index 7336fd2b55..7cc6bef90b 100644
--- a/test/rubygems/plugin/load/rubygems_plugin.rb
+++ b/test/rubygems/plugin/load/rubygems_plugin.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 class TestGem
   TEST_PLUGIN_LOAD = :loaded
 end
diff --git a/test/rubygems/plugin/standarderror/rubygems_plugin.rb b/test/rubygems/plugin/standarderror/rubygems_plugin.rb
index a0850bf98e..94cf4e8a52 100644
--- a/test/rubygems/plugin/standarderror/rubygems_plugin.rb
+++ b/test/rubygems/plugin/standarderror/rubygems_plugin.rb
@@ -1,3 +1,3 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 TestGem::TEST_PLUGIN_STANDARDERROR = :loaded
 raise StandardError.new('boom')
diff --git a/test/rubygems/rubygems/commands/crash_command.rb b/test/rubygems/rubygems/commands/crash_command.rb
index 07692b4609..a27a79f8dc 100644
--- a/test/rubygems/rubygems/commands/crash_command.rb
+++ b/test/rubygems/rubygems/commands/crash_command.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 class Gem::Commands::CrashCommand < Gem::Command
 
   raise "crash"
diff --git a/test/rubygems/rubygems_plugin.rb b/test/rubygems/rubygems_plugin.rb
index 80f78443b5..0195a2139a 100644
--- a/test/rubygems/rubygems_plugin.rb
+++ b/test/rubygems/rubygems_plugin.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/command_manager'
 
 ##
diff --git a/test/rubygems/sff/discover.rb b/test/rubygems/sff/discover.rb
index 1effd1c8b0..8e9b8f90fa 100644
--- a/test/rubygems/sff/discover.rb
+++ b/test/rubygems/sff/discover.rb
@@ -1 +1 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
diff --git a/test/rubygems/simple_gem.rb b/test/rubygems/simple_gem.rb
index a6af71eef4..1650910aaf 100644
--- a/test/rubygems/simple_gem.rb
+++ b/test/rubygems/simple_gem.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 SIMPLE_GEM = <<-GEMDATA
         MD5SUM = "989bf34a1cbecd52e0ea66b662b3a405"
         if $0 == __FILE__
diff --git a/test/rubygems/specifications/foo-0.0.1.gemspec b/test/rubygems/specifications/foo-0.0.1.gemspec
deleted file mode 100644
index 7fbc56429f..0000000000
--- a/test/rubygems/specifications/foo-0.0.1.gemspec
+++ /dev/null
diff --git a/test/rubygems/test_bundled_ca.rb b/test/rubygems/test_bundled_ca.rb
index 0f8b6bd6a9..f3da13b1b5 100644
--- a/test/rubygems/test_bundled_ca.rb
+++ b/test/rubygems/test_bundled_ca.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'net/https'
 require 'rubygems/request'
@@ -7,55 +7,53 @@ require 'rubygems/request'
 #
 # The tested hosts are explained in detail here: https://github.com/rubygems/rubygems/commit/5e16a5428f973667cabfa07e94ff939e7a83ebd9
 #
-class TestBundledCA < Gem::TestCase
 
-  THIS_FILE = File.expand_path __FILE__
+if ENV["TRAVIS"] || ENV["TEST_SSL"]
+  class TestBundledCA < Gem::TestCase
 
-  def bundled_certificate_store
-    store = OpenSSL::X509::Store.new
+    THIS_FILE = File.expand_path __FILE__
 
-    ssl_cert_glob =
-      File.expand_path '../../../lib/rubygems/ssl_certs/*.pem', THIS_FILE
+    def bundled_certificate_store
+      store = OpenSSL::X509::Store.new
 
-    Dir[ssl_cert_glob].each do |ssl_cert|
-      store.add_file ssl_cert
-    end
+      ssl_cert_glob =
+        File.expand_path '../../../lib/rubygems/ssl_certs/*.pem', THIS_FILE
 
-    store
-  end
+      Dir[ssl_cert_glob].each do |ssl_cert|
+        store.add_file ssl_cert
+      end
 
-  def assert_https(host)
-    if self.respond_to? :_assertions # minitest <= 4
-      self._assertions += 1
-    else # minitest >= 5
-      self.assertions += 1
+      store
     end
-    http = Net::HTTP.new(host, 443)
-    http.use_ssl = true
-    http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-    http.cert_store = bundled_certificate_store
-    http.get('/')
-  rescue Errno::ENOENT, Errno::ETIMEDOUT
-    skip "#{host} seems offline, I can't tell whether ssl would work."
-  rescue OpenSSL::SSL::SSLError => e
-    # Only fail for certificate verification errors
-    if e.message =~ /certificate verify failed/
-      flunk "#{host} is not verifiable using the included certificates. Error was: #{e.message}"
+
+    def assert_https(host)
+      if self.respond_to? :_assertions # minitest <= 4
+        self._assertions += 1
+      else # minitest >= 5
+        self.assertions += 1
+      end
+      http = Net::HTTP.new(host, 443)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      http.cert_store = bundled_certificate_store
+      http.get('/')
+    rescue Errno::ENOENT, Errno::ETIMEDOUT
+      skip "#{host} seems offline, I can't tell whether ssl would work."
+    rescue OpenSSL::SSL::SSLError => e
+      # Only fail for certificate verification errors
+      if e.message =~ /certificate verify failed/
+        flunk "#{host} is not verifiable using the included certificates. Error was: #{e.message}"
+      end
+      raise
     end
-    raise
-  end
 
-  def test_accessing_rubygems
-    assert_https('rubygems.org')
-  end
+    def test_accessing_rubygems
+      assert_https('rubygems.org')
+    end
 
-  def test_accessing_cloudfront
-    assert_https('d2chzxaqi4y7f8.cloudfront.net')
-  end
+    def test_accessing_fastly
+      assert_https('rubygems.global.ssl.fastly.net')
+    end
 
-  def test_accessing_fastly
-    assert_https('rubygems.global.ssl.fastly.net')
   end
-
-end if ENV['TRAVIS']
-
+end
diff --git a/test/rubygems/test_config.rb b/test/rubygems/test_config.rb
index 207085b62d..79f300fd9c 100644
--- a/test/rubygems/test_config.rb
+++ b/test/rubygems/test_config.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems'
 
diff --git a/test/rubygems/test_deprecate.rb b/test/rubygems/test_deprecate.rb
index a29b565859..fab4f33b86 100644
--- a/test/rubygems/test_deprecate.rb
+++ b/test/rubygems/test_deprecate.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 # require 'rubygems/builder'
 # require 'rubygems/package'
diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
index 75ec9df06e..aec9d98c9a 100644
--- a/test/rubygems/test_gem.rb
+++ b/test/rubygems/test_gem.rb
@@ -1,5 +1,4 @@
 # coding: US-ASCII
-# frozen_string_literal: false
 require 'rubygems/test_case'
 require 'rubygems'
 require 'rubygems/command'
@@ -1285,7 +1284,7 @@ class TestGem < Gem::TestCase
     assert_equal [a,b,c], Gem.detect_gemdeps.sort_by { |s| s.name }
   end
 
-  LIB_PATH = File.expand_path "../../../lib".untaint, __FILE__.untaint
+  LIB_PATH = File.expand_path "../../../lib".dup.untaint, __FILE__.dup.untaint
 
   def test_looks_for_gemdeps_files_automatically_on_start
     util_clear_gems
diff --git a/test/rubygems/test_gem_available_set.rb b/test/rubygems/test_gem_available_set.rb
index 85551f0272..d4042c94f5 100644
--- a/test/rubygems/test_gem_available_set.rb
+++ b/test/rubygems/test_gem_available_set.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/available_set'
 require 'rubygems/security'
diff --git a/test/rubygems/test_gem_command.rb b/test/rubygems/test_gem_command.rb
index 5c1c0718ec..61b73874fd 100644
--- a/test/rubygems/test_gem_command.rb
+++ b/test/rubygems/test_gem_command.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/command'
 
diff --git a/test/rubygems/test_gem_command_manager.rb b/test/rubygems/test_gem_command_manager.rb
index fd25750c28..2d2fc7d7a0 100644
--- a/test/rubygems/test_gem_command_manager.rb
+++ b/test/rubygems/test_gem_command_manager.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/command_manager'
 
diff --git a/test/rubygems/test_gem_commands_build_command.rb b/test/rubygems/test_gem_commands_build_command.rb
index 1fb80e1dda..847f640ac6 100644
--- a/test/rubygems/test_gem_commands_build_command.rb
+++ b/test/rubygems/test_gem_commands_build_command.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/commands/build_command'
 require 'rubygems/package'
@@ -62,6 +62,16 @@ class TestGemCommandsBuildCommand < Gem::TestCase
     assert_equal '', @ui.output
     assert_equal "ERROR:  Gemspec file not found: some_gem\n", @ui.error
   end
+  
+  def test_can_find_gemspecs_without_dot_gemspec
+    gemspec_file = File.join(@tempdir, @gem.spec_name)
+
+    File.open gemspec_file + ".gemspec", 'w' do |gs|
+      gs.write @gem.to_ruby
+    end
+
+    util_test_build_gem @gem, gemspec_file
+  end
 
   def util_test_build_gem(gem, gemspec_file, check_licenses=true)
     @cmd.options[:args] = [gemspec_file]
diff --git a/test/rubygems/test_gem_commands_cert_command.rb b/test/rubygems/test_gem_commands_cert_command.rb
index 5179327211..a9a78336aa 100644
--- a/test/rubygems/test_gem_commands_cert_command.rb
+++ b/test/rubygems/test_gem_commands_cert_command.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/commands/cert_command'
 require 'rubygems/fix_openssl_warnings' if RUBY_VERSION < "1.9"
diff --git a/test/rubygems/test_gem_commands_check_command.rb b/test/rubygems/test_gem_commands_check_command.rb
index 6b76349fbe..b220b4d36c 100644
--- a/test/rubygems/test_gem_commands_check_command.rb
+++ b/test/rubygems/test_gem_commands_check_command.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/commands/check_command'
 
diff --git a/test/rubygems/test_gem_commands_cleanup_command.rb b/test/rubygems/test_gem_commands_cleanup_command.rb
index 4a6dae8ae5..f988f81e55 100644
--- a/test/rubygems/test_gem_commands_cleanup_command.rb
+++ b/test/rubygems/test_gem_commands_cleanup_command.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/commands/cleanup_command'
 require 'rubygems/installer'
diff --git a/test/rubygems/test_gem_commands_contents_command.rb b/test/rubygems/test_gem_commands_contents_command.rb
index ae02503524..65644f476b 100644
--- a/test/rubygems/test_gem_commands_contents_command.rb
+++ b/test/rubygems/test_gem_commands_contents_command.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/commands/contents_command'
 
diff --git a/test/rubygems/test_gem_commands_dependency_command.rb b/test/rubygems/test_gem_commands_dependency_command.rb
index 058b9a893f..d0389ccf55 100644
--- a/test/rubygems/test_gem_commands_dependency_command.rb
+++ b/test/rubygems/test_gem_commands_dependency_command.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/commands/dependency_command'
 
diff --git a/test/rubygems/test_gem_commands_environment_command.rb b/test/rubygems/test_gem_commands_environment_command.rb
index 2def4175fe..7ffcbb5454 100644
--- a/test/rubygems/test_gem_commands_environment_command.rb
+++ b/test/rubygems/test_gem_commands_environment_command.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/commands/environment_command'
 
diff --git a/test/rubygems/test_gem_commands_fetch_command.rb b/test/rubygems/test_gem_commands_fetch_command.rb
index 4a57b93f50..6858327ed3 100644
--- a/test/rubygems/test_gem_commands_fetch_command.rb
+++ b/test/rubygems/test_gem_commands_fetch_command.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/package'
 require 'rubygems/security'
diff --git a/test/rubygems/test_gem_commands_generate_index_command.rb b/test/rubygems/test_gem_commands_generate_index_command.rb
index 1c7213983e..7e30a6dccf 100644
--- a/test/rubygems/test_gem_commands_generate_index_command.rb
+++ b/test/rubygems/test_gem_commands_generate_index_command.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/indexer'
 require 'rubygems/commands/generate_index_command'
diff --git a/test/rubygems/test_gem_commands_help_command.rb b/test/rubygems/test_gem_commands_help_command.rb
index 36512cb642..986df1a9a5 100644
--- a/test/rubygems/test_gem_commands_help_command.rb
+++ b/test/rubygems/test_gem_commands_help_command.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require "rubygems"
 require "rubygems/test_case"
 require "rubygems/commands/help_command"
diff --git a/test/rubygems/test_gem_commands_install_command.rb b/test/rubygems/test_gem_commands_install_command.rb
index b8ddc97d7d..2525f26789 100644
--- a/test/rubygems/test_gem_commands_install_command.rb
+++ b/test/rubygems/test_gem_commands_install_command.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/commands/install_command'
 require 'rubygems/request_set'
diff --git a/test/rubygems/test_gem_commands_list_command.rb b/test/rubygems/test_gem_commands_list_command.rb
index 67e5980576..a44ccb4175 100644
--- a/test/rubygems/test_gem_commands_list_command.rb
+++ b/test/rubygems/test_gem_commands_list_command.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/commands/list_command'
 
diff --git a/test/rubygems/test_gem_commands_lock_command.rb b/test/rubygems/test_gem_commands_lock_command.rb
index ae85c4653f..af1fce999c 100644
--- a/test/rubygems/test_gem_commands_lock_command.rb
+++ b/test/rubygems/test_gem_commands_lock_command.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/commands/lock_command'
 
diff --git a/test/rubygems/test_gem_commands_mirror.rb b/test/rubygems/test_gem_commands_mirror.rb
index c20ed3b4c8..1a29755911 100644
--- a/test/rubygems/test_gem_commands_mirror.rb
+++ b/test/rubygems/test_gem_commands_mirror.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/commands/mirror_command'
 
diff --git a/test/rubygems/test_gem_commands_open_command.rb b/test/rubygems/test_gem_commands_open_command.rb
index e342c2c60c..e6cbb43355 100644
--- a/test/rubygems/test_gem_commands_open_command.rb
+++ b/test/rubygems/test_gem_commands_open_command.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/commands/open_command'
 
diff --git a/test/rubygems/test_gem_commands_outdated_command.rb b/test/rubygems/test_gem_commands_outdated_command.rb
index ee48d070fb..626b29057d 100644
--- a/test/rubygems/test_gem_commands_outdated_command.rb
+++ b/test/rubygems/test_gem_commands_outdated_command.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/commands/outdated_command'
 
diff --git a/test/rubygems/test_gem_commands_owner_command.rb b/test/rubygems/test_gem_commands_owner_command.rb
index 6d8275227f..7217f5cff0 100644
--- a/test/rubygems/test_gem_commands_owner_command.rb
+++ b/test/rubygems/test_gem_commands_owner_command.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/commands/owner_command'
 
diff --git a/test/rubygems/test_gem_commands_pristine_command.rb b/test/rubygems/test_gem_commands_pristine_command.rb
index 1160c37b61..dfec78b848 100644
--- a/test/rubygems/test_gem_commands_pristine_command.rb
+++ b/test/rubygems/test_gem_commands_pristine_command.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/commands/pristine_command'
 
diff --git a/test/rubygems/test_gem_commands_push_command.rb b/test/rubygems/test_gem_commands_push_command.rb
index 06967e0990..729de46f9d 100644
--- a/test/rubygems/test_gem_commands_push_command.rb
+++ b/test/rubygems/test_gem_commands_push_command.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/commands/push_command'
 
@@ -178,6 +178,33 @@ class TestGemCommandsPushCommand < Gem::TestCase
     send_battery
   end
 
+  def test_sending_gem_to_allowed_push_host_with_basic_credentials
+    @sanitized_host = "http://privategemserver.com"
+    @host           = "http://user:password@privategemserver.com"
+
+    @spec, @path = util_gem "freebird", "1.0.1" do |spec|
+      spec.metadata['allowed_push_host'] = @sanitized_host
+    end
+
+    @api_key = "DOESNTMATTER"
+
+    keys = {
+      :rubygems_api_key => @api_key,
+    }
+
+    FileUtils.mkdir_p File.dirname Gem.configuration.credentials_path
+    open Gem.configuration.credentials_path, 'w' do |f|
+      f.write keys.to_yaml
+    end
+    Gem.configuration.load_api_keys
+
+    FileUtils.rm Gem.configuration.credentials_path
+
+    @response = "Successfully registered gem: freebird (1.0.1)"
+    @fetcher.data["#{@host}/api/v1/gems"]  = [@response, 200, 'OK']
+    send_battery
+  end
+
   def test_sending_gem_to_disallowed_default_host
     @spec, @path = util_gem "freebird", "1.0.1" do |spec|
       spec.metadata['allowed_push_host'] = "https://privategemserver.com"
diff --git a/test/rubygems/test_gem_commands_query_command.rb b/test/rubygems/test_gem_commands_query_command.rb
index da777312f0..78c15a1770 100644
--- a/test/rubygems/test_gem_commands_query_command.rb
+++ b/test/rubygems/test_gem_commands_query_command.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/commands/query_command'
 
@@ -622,6 +622,29 @@ pl (1)
     assert_equal expected, @ui.output
   end
 
+  def test_execute_exact
+    spec_fetcher do |fetcher|
+      fetcher.spec 'coolgem-omg', 3
+      fetcher.spec 'coolgem', '4.2.1'
+      fetcher.spec 'wow_coolgem', 1
+    end
+
+    @cmd.handle_options %w[--remote --exact coolgem]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    expected = <<-EOF
+
+*** REMOTE GEMS ***
+
+coolgem (4.2.1)
+    EOF
+
+    assert_equal expected, @ui.output
+  end
+
   private
 
   def add_gems_to_fetcher
diff --git a/test/rubygems/test_gem_commands_search_command.rb b/test/rubygems/test_gem_commands_search_command.rb
index 1bb3eb90f2..61caff1fc9 100644
--- a/test/rubygems/test_gem_commands_search_command.rb
+++ b/test/rubygems/test_gem_commands_search_command.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/commands/search_command'
 
diff --git a/test/rubygems/test_gem_commands_server_command.rb b/test/rubygems/test_gem_commands_server_command.rb
index 4186667061..b61fc30e9b 100644
--- a/test/rubygems/test_gem_commands_server_command.rb
+++ b/test/rubygems/test_gem_commands_server_command.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/commands/server_command'
 
diff --git a/test/rubygems/test_gem_commands_setup_command.rb b/test/rubygems/test_gem_commands_setup_command.rb
index 9748db79d5..e0c4f20b41 100644
--- a/test/rubygems/test_gem_commands_setup_command.rb
+++ b/test/rubygems/test_gem_commands_setup_command.rb
@@ -1,5 +1,5 @@
 # coding: UTF-8
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 require 'rubygems/test_case'
 require 'rubygems/commands/setup_command'
@@ -134,4 +134,3 @@ class TestGemCommandsSetupCommand < Gem::TestCase
   end
 
 end
-
diff --git a/test/rubygems/test_gem_commands_sources_command.rb b/test/rubygems/test_gem_commands_sources_command.rb
index f7af9d5962..014b4b4c12 100644
--- a/test/rubygems/test_gem_commands_sources_command.rb
+++ b/test/rubygems/test_gem_commands_sources_command.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/commands/sources_command'
 
diff --git a/test/rubygems/test_gem_commands_specification_command.rb b/test/rubygems/test_gem_commands_specification_command.rb
index 4759ba47c0..c3650649ae 100644
--- a/test/rubygems/test_gem_commands_specification_command.rb
+++ b/test/rubygems/test_gem_commands_specification_command.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/commands/specification_command'
 
diff --git a/test/rubygems/test_gem_commands_stale_command.rb b/test/rubygems/test_gem_commands_stale_command.rb
index c7b23574da..4d2f5349f0 100644
--- a/test/rubygems/test_gem_commands_stale_command.rb
+++ b/test/rubygems/test_gem_commands_stale_command.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/commands/stale_command'
 
diff --git a/test/rubygems/test_gem_commands_uninstall_command.rb b/test/rubygems/test_gem_commands_uninstall_command.rb
index b001b7f2a8..e64bc77123 100644
--- a/test/rubygems/test_gem_commands_uninstall_command.rb
+++ b/test/rubygems/test_gem_commands_uninstall_command.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/installer_test_case'
 require 'rubygems/commands/uninstall_command'
 
diff --git a/test/rubygems/test_gem_commands_unpack_command.rb b/test/rubygems/test_gem_commands_unpack_command.rb
index 1420c8fa60..61f671da7d 100644
--- a/test/rubygems/test_gem_commands_unpack_command.rb
+++ b/test/rubygems/test_gem_commands_unpack_command.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/commands/unpack_command'
 
diff --git a/test/rubygems/test_gem_commands_update_command.rb b/test/rubygems/test_gem_commands_update_command.rb
index a49cc3ace1..4a9f496cbe 100644
--- a/test/rubygems/test_gem_commands_update_command.rb
+++ b/test/rubygems/test_gem_commands_update_command.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/commands/update_command'
 
diff --git a/test/rubygems/test_gem_commands_which_command.rb b/test/rubygems/test_gem_commands_which_command.rb
index 2549579c84..c55bb370cd 100644
--- a/test/rubygems/test_gem_commands_which_command.rb
+++ b/test/rubygems/test_gem_commands_which_command.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/commands/which_command'
 
diff --git a/test/rubygems/test_gem_commands_yank_command.rb b/test/rubygems/test_gem_commands_yank_command.rb
index 49e8eda6e5..70aa2263a6 100644
--- a/test/rubygems/test_gem_commands_yank_command.rb
+++ b/test/rubygems/test_gem_commands_yank_command.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/commands/yank_command'
 
@@ -7,7 +7,7 @@ class TestGemCommandsYankCommand < Gem::TestCase
     super
 
     @cmd = Gem::Commands::YankCommand.new
-    @cmd.host = 'http://example'
+    @cmd.options[:host] = 'http://example'
 
     @fetcher = Gem::RemoteFetcher.fetcher
 
@@ -16,10 +16,11 @@ class TestGemCommandsYankCommand < Gem::TestCase
   end
 
   def test_handle_options
-    @cmd.handle_options %w[a --version 1.0 --platform x86-darwin -k KEY]
+    @cmd.handle_options %w[a --version 1.0 --platform x86-darwin -k KEY --host HOST]
 
     assert_equal %w[a],        @cmd.options[:args]
     assert_equal :KEY,         @cmd.options[:key]
+    assert_equal "HOST",       @cmd.options[:host]
     assert_nil                 @cmd.options[:platform]
     assert_equal req('= 1.0'), @cmd.options[:version]
   end
@@ -73,25 +74,26 @@ class TestGemCommandsYankCommand < Gem::TestCase
     assert_equal 'other', @fetcher.last_request['Authorization']
   end
 
-  def test_execute_undo
-    unyank_uri = 'http://example/api/v1/gems/unyank'
-    @fetcher.data[unyank_uri] = ['Successfully unyanked', 200, 'OK']
+  def test_execute_host
+    host = 'https://other.example'
+    yank_uri = "#{host}/api/v1/gems/yank"
+    @fetcher.data[yank_uri] = ['Successfully yanked', 200, 'OK']
 
     @cmd.options[:args]    = %w[a]
     @cmd.options[:version] = req('= 1.0')
-    @cmd.options[:undo]    = true
+    @cmd.options[:host]    = host
 
     use_ui @ui do
       @cmd.execute
     end
 
-    assert_match %r%Unyanking gem from http://example%, @ui.output
-    assert_match %r%Successfully unyanked%,      @ui.output
+    assert_match %r%Yanking gem from https://other.example%, @ui.output
+    assert_match %r%Successfully yanked%,      @ui.output
 
     body = @fetcher.last_request.body.split('&').sort
     assert_equal %w[gem_name=a version=1.0], body
-
-    assert_equal [unyank_uri], @fetcher.paths
+    assert_equal 'key', @fetcher.last_request['Authorization']
+    assert_equal [yank_uri], @fetcher.paths
   end
 
 end
diff --git a/test/rubygems/test_gem_config_file.rb b/test/rubygems/test_gem_config_file.rb
index 6ed240f306..9b5f0b96f8 100644
--- a/test/rubygems/test_gem_config_file.rb
+++ b/test/rubygems/test_gem_config_file.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/config_file'
 
@@ -270,6 +270,29 @@ if you believe they were disclosed to a third party.
     assert_equal true, @cfg.backtrace
   end
 
+  def test_handle_arguments_norc
+    assert_equal @temp_conf, @cfg.config_file_name
+
+    File.open @temp_conf, 'w' do |fp|
+      fp.puts ":backtrace: true"
+      fp.puts ":update_sources: false"
+      fp.puts ":bulk_threshold: 10"
+      fp.puts ":verbose: false"
+      fp.puts ":sources:"
+      fp.puts "  - http://more-gems.example.com"
+    end
+
+    args = %W[--norc]
+
+    util_config_file args
+
+    assert_equal false, @cfg.backtrace
+    assert_equal true, @cfg.update_sources
+    assert_equal Gem::ConfigFile::DEFAULT_BULK_THRESHOLD, @cfg.bulk_threshold
+    assert_equal true, @cfg.verbose
+    assert_equal [@gem_repo], Gem.sources
+  end
+
   def test_load_api_keys
     temp_cred = File.join Gem.user_home, '.gem', 'credentials'
     FileUtils.mkdir File.dirname(temp_cred)
diff --git a/test/rubygems/test_gem_dependency.rb b/test/rubygems/test_gem_dependency.rb
index dcb722687b..cbc741c3c4 100644
--- a/test/rubygems/test_gem_dependency.rb
+++ b/test/rubygems/test_gem_dependency.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/dependency'
 
diff --git a/test/rubygems/test_gem_dependency_installer.rb b/test/rubygems/test_gem_dependency_installer.rb
index dfa9494a49..e55cc75682 100644
--- a/test/rubygems/test_gem_dependency_installer.rb
+++ b/test/rubygems/test_gem_dependency_installer.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/dependency_installer'
 require 'rubygems/security'
diff --git a/test/rubygems/test_gem_dependency_list.rb b/test/rubygems/test_gem_dependency_list.rb
index 8c63206f90..d03a8fdfea 100644
--- a/test/rubygems/test_gem_dependency_list.rb
+++ b/test/rubygems/test_gem_dependency_list.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/dependency_list'
 
diff --git a/test/rubygems/test_gem_dependency_resolution_error.rb b/test/rubygems/test_gem_dependency_resolution_error.rb
index bae561c804..b9625a3c02 100644
--- a/test/rubygems/test_gem_dependency_resolution_error.rb
+++ b/test/rubygems/test_gem_dependency_resolution_error.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestGemDependencyResolutionError < Gem::TestCase
diff --git a/test/rubygems/test_gem_doctor.rb b/test/rubygems/test_gem_doctor.rb
index 5eb190377d..39b8a11692 100644
--- a/test/rubygems/test_gem_doctor.rb
+++ b/test/rubygems/test_gem_doctor.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/doctor'
 
diff --git a/test/rubygems/test_gem_ext_builder.rb b/test/rubygems/test_gem_ext_builder.rb
index e8cc5aa57c..370ebf8d14 100644
--- a/test/rubygems/test_gem_ext_builder.rb
+++ b/test/rubygems/test_gem_ext_builder.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/ext'
 require 'rubygems/installer'
@@ -134,6 +134,11 @@ install:
   end
 
   def test_build_extensions_with_gemhome_with_space
+    # Details: https://github.com/rubygems/rubygems/issues/977#issuecomment-171544940
+    if win_platform? && RUBY_VERSION <= '2.0'
+      skip 'gemhome with spaces does not work with Ruby 1.9.x on Windows'
+    end
+
     new_gemhome = File.join @tempdir, 'gem home'
     File.rename(@gemhome, new_gemhome)
     @gemhome = new_gemhome
@@ -334,4 +339,3 @@ install:
   end
 
 end
-
diff --git a/test/rubygems/test_gem_ext_cmake_builder.rb b/test/rubygems/test_gem_ext_cmake_builder.rb
index 7a296ccfd5..b54399ad3d 100644
--- a/test/rubygems/test_gem_ext_cmake_builder.rb
+++ b/test/rubygems/test_gem_ext_cmake_builder.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/ext'
 
diff --git a/test/rubygems/test_gem_ext_configure_builder.rb b/test/rubygems/test_gem_ext_configure_builder.rb
index 6cbe8ba560..6fd28770d3 100644
--- a/test/rubygems/test_gem_ext_configure_builder.rb
+++ b/test/rubygems/test_gem_ext_configure_builder.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/ext'
 
diff --git a/test/rubygems/test_gem_ext_ext_conf_builder.rb b/test/rubygems/test_gem_ext_ext_conf_builder.rb
index d71529b61b..f5d10fae50 100644
--- a/test/rubygems/test_gem_ext_ext_conf_builder.rb
+++ b/test/rubygems/test_gem_ext_ext_conf_builder.rb
@@ -1,5 +1,5 @@
 # coding: UTF-8
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 require 'rubygems/test_case'
 require 'rubygems/ext'
diff --git a/test/rubygems/test_gem_ext_rake_builder.rb b/test/rubygems/test_gem_ext_rake_builder.rb
index 8eaa3f43c3..b728f8f30a 100644
--- a/test/rubygems/test_gem_ext_rake_builder.rb
+++ b/test/rubygems/test_gem_ext_rake_builder.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/ext'
 
diff --git a/test/rubygems/test_gem_gem_runner.rb b/test/rubygems/test_gem_gem_runner.rb
index 0ca66c9078..d68ac4da81 100644
--- a/test/rubygems/test_gem_gem_runner.rb
+++ b/test/rubygems/test_gem_gem_runner.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/gem_runner'
 
diff --git a/test/rubygems/test_gem_gemcutter_utilities.rb b/test/rubygems/test_gem_gemcutter_utilities.rb
index 79be8b0477..bd84d4b25a 100644
--- a/test/rubygems/test_gem_gemcutter_utilities.rb
+++ b/test/rubygems/test_gem_gemcutter_utilities.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems'
 require 'rubygems/command'
diff --git a/test/rubygems/test_gem_impossible_dependencies_error.rb b/test/rubygems/test_gem_impossible_dependencies_error.rb
index 6a6c9c04cf..027c99a9e5 100644
--- a/test/rubygems/test_gem_impossible_dependencies_error.rb
+++ b/test/rubygems/test_gem_impossible_dependencies_error.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestGemImpossibleDependenciesError < Gem::TestCase
diff --git a/test/rubygems/test_gem_indexer.rb b/test/rubygems/test_gem_indexer.rb
index 1f255ff715..a4a966e8de 100644
--- a/test/rubygems/test_gem_indexer.rb
+++ b/test/rubygems/test_gem_indexer.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/indexer'
 
diff --git a/test/rubygems/test_gem_install_update_options.rb b/test/rubygems/test_gem_install_update_options.rb
index d81fa86e9c..e25259f4d1 100644
--- a/test/rubygems/test_gem_install_update_options.rb
+++ b/test/rubygems/test_gem_install_update_options.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/installer_test_case'
 require 'rubygems/install_update_options'
 require 'rubygems/command'
@@ -28,6 +28,7 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
       -i /install_to
       -w
       --vendor
+      --post-install-message
     ]
 
     args.concat %w[-P HighSecurity] if defined?(OpenSSL::SSL)
@@ -182,4 +183,15 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
     RbConfig::CONFIG['vendordir'] = orig_vendordir
   end
 
+  def test_post_install_message_no
+    @cmd.handle_options %w[--no-post-install-message]
+
+    assert_equal false, @cmd.options[:post_install_message]
+  end
+
+  def test_post_install_message
+    @cmd.handle_options %w[--post-install-message]
+
+    assert_equal true, @cmd.options[:post_install_message]
+  end
 end
diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb
index 129c235abb..5ec71d0a01 100644
--- a/test/rubygems/test_gem_installer.rb
+++ b/test/rubygems/test_gem_installer.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/installer_test_case'
 
 class TestGemInstaller < Gem::InstallerTestCase
@@ -48,7 +48,6 @@ if ARGV.first
   end
 end
 
-gem 'a', version
 load Gem.bin_path('a', 'executable', version)
     EOF
 
@@ -803,14 +802,14 @@ gem 'other', version
     begin
       Gem::Specification.reset
 
-      e = assert_raises Gem::LoadError do
+      e = assert_raises Gem::GemNotFoundException do
         instance_eval File.read(exe)
       end
     ensure
       ARGV.shift if ARGV.first == "_3.0_"
     end
 
-    assert_match(/\(= 3\.0\)/, e.message)
+    assert_includes(e.message, "can't find gem a (= 3.0)")
   end
 
   def test_install_creates_binstub_that_dont_trust_encoding
@@ -831,7 +830,7 @@ gem 'other', version
 
     exe = File.join @gemhome, 'bin', 'executable'
 
-    extra_arg = "\xE4pfel".force_encoding("UTF-8")
+    extra_arg = "\xE4pfel".dup.force_encoding("UTF-8")
     ARGV.unshift extra_arg
 
     begin
@@ -1001,6 +1000,19 @@ gem 'other', version
     assert_match %r|I am a shiny gem!|, @ui.output
   end
 
+  def test_install_with_skipped_message
+    @spec.post_install_message = 'I am a shiny gem!'
+
+    use_ui @ui do
+      path = Gem::Package.build @spec
+
+      @installer = Gem::Installer.at path, :post_install_message => false
+      @installer.install
+    end
+
+    refute_match %r|I am a shiny gem!|, @ui.output
+  end
+
   def test_install_extension_dir
     gemhome2 = "#{@gemhome}2"
 
diff --git a/test/rubygems/test_gem_local_remote_options.rb b/test/rubygems/test_gem_local_remote_options.rb
index 4e02e2adeb..272623be74 100644
--- a/test/rubygems/test_gem_local_remote_options.rb
+++ b/test/rubygems/test_gem_local_remote_options.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/local_remote_options'
 require 'rubygems/command'
diff --git a/test/rubygems/test_gem_name_tuple.rb b/test/rubygems/test_gem_name_tuple.rb
index 250a167994..9bc2924cf6 100644
--- a/test/rubygems/test_gem_name_tuple.rb
+++ b/test/rubygems/test_gem_name_tuple.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/name_tuple'
 
diff --git a/test/rubygems/test_gem_package.rb b/test/rubygems/test_gem_package.rb
index 7848bc2428..2f8747bc97 100644
--- a/test/rubygems/test_gem_package.rb
+++ b/test/rubygems/test_gem_package.rb
@@ -1,5 +1,5 @@
 # coding: UTF-8
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 require 'rubygems/package/tar_test_case'
 require 'rubygems/simple_gem'
@@ -428,19 +428,25 @@ class TestGemPackage < Gem::Package::TarTestCase
                  "#{@destination} is not allowed", e.message)
   end
 
-  def test_extract_tar_gz_symlink_absolute
+  def test_extract_tar_gz_symlink_relative_path
+    skip 'symlink not supported' if Gem.win_platform?
+
     package = Gem::Package.new @gem
 
     tgz_io = util_tar_gz do |tar|
-      tar.add_symlink 'code.rb', '/absolute.rb', 0644
+      tar.add_file    'relative.rb', 0644 do |io| io.write 'hi' end
+      tar.mkdir       'lib',         0755
+      tar.add_symlink 'lib/foo.rb', '../relative.rb', 0644
     end
 
-    e = assert_raises Gem::Package::PathError do
-      package.extract_tar_gz tgz_io, @destination
-    end
+    package.extract_tar_gz tgz_io, @destination
 
-    assert_equal("installing into parent path /absolute.rb of " +
-                 "#{@destination} is not allowed", e.message)
+    extracted = File.join @destination, 'lib/foo.rb'
+    assert_path_exists extracted
+    assert_equal '../relative.rb',
+                 File.readlink(extracted)
+    assert_equal 'hi',
+                 File.read(extracted)
   end
 
   def test_extract_tar_gz_directory
@@ -490,7 +496,7 @@ class TestGemPackage < Gem::Package::TarTestCase
   def test_install_location
     package = Gem::Package.new @gem
 
-    file = 'file.rb'
+    file = 'file.rb'.dup
     file.taint
 
     destination = package.install_location file, @destination
@@ -530,7 +536,7 @@ class TestGemPackage < Gem::Package::TarTestCase
     skip 'no File.realpath on 1.8' if RUBY_VERSION < '1.9'
     package = Gem::Package.new @gem
 
-    file = 'foo//file.rb'
+    file = 'foo//file.rb'.dup
     file.taint
 
     destination = @destination.sub '/', '//'
diff --git a/test/rubygems/test_gem_package_old.rb b/test/rubygems/test_gem_package_old.rb
index ddc4e01abb..c15475b0c7 100644
--- a/test/rubygems/test_gem_package_old.rb
+++ b/test/rubygems/test_gem_package_old.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/simple_gem'
 
diff --git a/test/rubygems/test_gem_package_tar_header.rb b/test/rubygems/test_gem_package_tar_header.rb
index f1ece66aa7..d33877057d 100644
--- a/test/rubygems/test_gem_package_tar_header.rb
+++ b/test/rubygems/test_gem_package_tar_header.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/package/tar_test_case'
 require 'rubygems/package'
 
diff --git a/test/rubygems/test_gem_package_tar_reader.rb b/test/rubygems/test_gem_package_tar_reader.rb
index 2b6b81e287..e8a902c311 100644
--- a/test/rubygems/test_gem_package_tar_reader.rb
+++ b/test/rubygems/test_gem_package_tar_reader.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/package/tar_test_case'
 require 'rubygems/package'
 
diff --git a/test/rubygems/test_gem_package_tar_reader_entry.rb b/test/rubygems/test_gem_package_tar_reader_entry.rb
index 1138436f00..dba1987d4d 100644
--- a/test/rubygems/test_gem_package_tar_reader_entry.rb
+++ b/test/rubygems/test_gem_package_tar_reader_entry.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/package/tar_test_case'
 require 'rubygems/package'
 
@@ -9,7 +9,7 @@ class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
 
     @contents = ('a'..'z').to_a.join * 100
 
-    @tar = ''
+    @tar = String.new
     @tar << tar_file_header("lib/foo", "", 0, @contents.size, Time.now)
     @tar << @contents
     @tar << "\0" * (512 - (@tar.size % 512))
diff --git a/test/rubygems/test_gem_package_tar_writer.rb b/test/rubygems/test_gem_package_tar_writer.rb
index 29b7fdb3b9..48d480ec53 100644
--- a/test/rubygems/test_gem_package_tar_writer.rb
+++ b/test/rubygems/test_gem_package_tar_writer.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/package/tar_test_case'
 require 'rubygems/package/tar_writer'
 require 'minitest/mock'
diff --git a/test/rubygems/test_gem_package_task.rb b/test/rubygems/test_gem_package_task.rb
index f93fc4cc54..f69ee36bd3 100644
--- a/test/rubygems/test_gem_package_task.rb
+++ b/test/rubygems/test_gem_package_task.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems'
 begin
diff --git a/test/rubygems/test_gem_path_support.rb b/test/rubygems/test_gem_path_support.rb
index e9e22d0fdc..a4be66fe61 100644
--- a/test/rubygems/test_gem_path_support.rb
+++ b/test/rubygems/test_gem_path_support.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems'
 require 'fileutils'
diff --git a/test/rubygems/test_gem_platform.rb b/test/rubygems/test_gem_platform.rb
index 9636afc77f..c9abd08868 100644
--- a/test/rubygems/test_gem_platform.rb
+++ b/test/rubygems/test_gem_platform.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/platform'
 require 'rbconfig'
diff --git a/test/rubygems/test_gem_rdoc.rb b/test/rubygems/test_gem_rdoc.rb
index 69d4e2071f..76ca8c45a9 100644
--- a/test/rubygems/test_gem_rdoc.rb
+++ b/test/rubygems/test_gem_rdoc.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems'
 require 'rubygems/test_case'
 require 'rubygems/rdoc'
diff --git a/test/rubygems/test_gem_remote_fetcher.rb b/test/rubygems/test_gem_remote_fetcher.rb
index 3439194858..f8d2cf2516 100644
--- a/test/rubygems/test_gem_remote_fetcher.rb
+++ b/test/rubygems/test_gem_remote_fetcher.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 require 'webrick'
@@ -924,7 +924,6 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
         @ssl_server_thread.kill.join
         @ssl_server_thread = nil
       end
-      WEBrick::Utils::TimeoutHandler.terminate
     end
 
     def normal_server_port
diff --git a/test/rubygems/test_gem_request.rb b/test/rubygems/test_gem_request.rb
index 98cdc80af4..a44b6d9d13 100644
--- a/test/rubygems/test_gem_request.rb
+++ b/test/rubygems/test_gem_request.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/request'
 require 'ostruct'
diff --git a/test/rubygems/test_gem_request_connection_pools.rb b/test/rubygems/test_gem_request_connection_pools.rb
index 30f273029b..a9bddb900e 100644
--- a/test/rubygems/test_gem_request_connection_pools.rb
+++ b/test/rubygems/test_gem_request_connection_pools.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/request'
 require 'timeout'
diff --git a/test/rubygems/test_gem_request_set.rb b/test/rubygems/test_gem_request_set.rb
index 136990264e..3a48827481 100644
--- a/test/rubygems/test_gem_request_set.rb
+++ b/test/rubygems/test_gem_request_set.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/request_set'
 
@@ -355,7 +355,7 @@ ruby "0"
 
     assert_equal %w[a-1], names
 
-    assert_equal [@DR::BestSet, @DR::GitSet, @DR::VendorSet],
+    assert_equal [@DR::BestSet, @DR::GitSet, @DR::VendorSet, @DR::SourceSet],
                  rs.sets.map { |set| set.class }
   end
 
@@ -419,7 +419,7 @@ ruby "0"
 
     assert_equal ["a-1", "b-2"], names
 
-    assert_equal [@DR::BestSet, @DR::GitSet, @DR::VendorSet],
+    assert_equal [@DR::BestSet, @DR::GitSet, @DR::VendorSet, @DR::SourceSet],
                  rs.sets.map { |set| set.class }
   end
 
diff --git a/test/rubygems/test_gem_request_set_gem_dependency_api.rb b/test/rubygems/test_gem_request_set_gem_dependency_api.rb
index 6bbe8a6d4f..509d49890d 100644
--- a/test/rubygems/test_gem_request_set_gem_dependency_api.rb
+++ b/test/rubygems/test_gem_request_set_gem_dependency_api.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/request_set'
 
@@ -52,22 +52,14 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
   end
 
   def test_gempspec_with_multiple_runtime_deps
-    gda = Class.new(@GDA) do
-      # implement find_gemspec so we don't need one on the FS
-      def find_gemspec name, path
-        Gem::Specification.new do |s|
-          s.name = 'foo'
-          s.version = '1.0'
-          s.add_runtime_dependency 'bar', '>= 1.6.0', '< 1.6.4'
-        end
-      end
+    save_gemspec 'foo', '1.0' do |s|
+      s.add_runtime_dependency 'bar', '>= 1.6.0', '< 1.6.4'
     end
-    instance = gda.new @set, __FILE__
-    instance.gemspec
+    @gda.gemspec
     assert_equal %w{ foo bar }.sort, @set.dependencies.map(&:name).sort
     bar = @set.dependencies.find { |d| d.name == 'bar' }
-    assert_equal [[">=", Gem::Version.create('1.6.0')],
-                  ["<", Gem::Version.create('1.6.4')]], bar.requirement.requirements
+    assert_equal [["<", Gem::Version.create('1.6.4')],
+                  [">=", Gem::Version.create('1.6.0')]], bar.requirement.requirements.sort
   end
 
   def test_gemspec_without_group
@@ -145,7 +137,11 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
   end
 
   def test_gem_git_branch
-    @gda.gem 'a', :git => 'git/a', :branch => 'other', :tag => 'v1'
+    _, err = capture_io do
+      @gda.gem 'a', :git => 'git/a', :branch => 'other', :tag => 'v1'
+    end
+    expected = "Gem dependencies file gem.deps.rb includes git reference for both ref/branch and tag but only ref/branch is used."
+    assert_match expected, err
 
     assert_equal [dep('a')], @set.dependencies
 
@@ -162,7 +158,11 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
   end
 
   def test_gem_git_ref
-    @gda.gem 'a', :git => 'git/a', :ref => 'abcd123', :branch => 'other'
+    _, err = capture_io do
+      @gda.gem 'a', :git => 'git/a', :ref => 'abcd123', :branch => 'other'
+    end
+    expected = "Gem dependencies file gem.deps.rb includes git reference for both ref and branch but only ref is used."
+    assert_match expected, err
 
     assert_equal [dep('a')], @set.dependencies
 
@@ -471,11 +471,9 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
   end
 
   def test_gemspec
-    spec = util_spec 'a', 1, 'b' => 2
-    spec.add_development_dependency 'c', 3
-
-    open 'a.gemspec', 'w' do |io|
-      io.write spec.to_ruby_for_cache
+    save_gemspec 'a', 1 do |s|
+      s.add_dependency 'b', 2
+      s.add_development_dependency 'c', 3
     end
 
     @gda.gemspec
@@ -507,11 +505,9 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
   end
 
   def test_gemspec_development_group
-    spec = util_spec 'a', 1, 'b' => 2
-    spec.add_development_dependency 'c', 3
-
-    open 'a.gemspec', 'w' do |io|
-      io.write spec.to_ruby_for_cache
+    save_gemspec 'a', 1 do |s|
+      s.add_dependency 'b', 2
+      s.add_development_dependency 'c', 3
     end
 
     @gda.without_groups << :other
@@ -524,14 +520,12 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
   end
 
   def test_gemspec_multiple
-    open 'a.gemspec', 'w' do |io|
-      spec = util_spec 'a', 1, 'b' => 2
-      io.write spec.to_ruby_for_cache
+    save_gemspec 'a', 1 do |s|
+      s.add_dependency 'b', 2
     end
 
-    open 'b.gemspec', 'w' do |io|
-      spec = util_spec 'b', 2, 'c' => 3
-      io.write spec.to_ruby_for_cache
+    save_gemspec 'b', 2 do |s|
+      s.add_dependency 'c', 3
     end
 
     e = assert_raises ArgumentError do
@@ -542,14 +536,12 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
   end
 
   def test_gemspec_name
-    open 'a.gemspec', 'w' do |io|
-      spec = util_spec 'a', 1, 'b' => 2
-      io.write spec.to_ruby_for_cache
+    save_gemspec 'a', 1 do |s|
+      s.add_dependency 'b', 2
     end
 
-    open 'b.gemspec', 'w' do |io|
-      spec = util_spec 'b', 2, 'c' => 3
-      io.write spec.to_ruby_for_cache
+    save_gemspec 'b', 2 do |s|
+      s.add_dependency 'c', 3
     end
 
     @gda.gemspec :name => 'b'
@@ -558,10 +550,8 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
   end
 
   def test_gemspec_named
-    spec = util_spec 'a', 1, 'b' => 2
-
-    open 'other.gemspec', 'w' do |io|
-      io.write spec.to_ruby_for_cache
+    save_gemspec 'a', 1 do |s|
+      s.add_dependency 'b', 2
     end
 
     @gda.gemspec
@@ -578,12 +568,10 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
   end
 
   def test_gemspec_path
-    spec = util_spec 'a', 1, 'b' => 2
-
     FileUtils.mkdir 'other'
 
-    open 'other/a.gemspec', 'w' do |io|
-      io.write spec.to_ruby_for_cache
+    save_gemspec 'a', 1, 'other' do |s|
+      s.add_dependency 'b', 2
     end
 
     @gda.gemspec :path => 'other'
diff --git a/test/rubygems/test_gem_request_set_lockfile.rb b/test/rubygems/test_gem_request_set_lockfile.rb
index 3d30a9aa63..908f97303e 100644
--- a/test/rubygems/test_gem_request_set_lockfile.rb
+++ b/test/rubygems/test_gem_request_set_lockfile.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/request_set'
 require 'rubygems/request_set/lockfile'
diff --git a/test/rubygems/test_gem_request_set_lockfile_parser.rb b/test/rubygems/test_gem_request_set_lockfile_parser.rb
index afb92e2840..9946c522d9 100644
--- a/test/rubygems/test_gem_request_set_lockfile_parser.rb
+++ b/test/rubygems/test_gem_request_set_lockfile_parser.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/request_set'
 require 'rubygems/request_set/lockfile'
@@ -246,10 +246,15 @@ DEPENDENCIES
 
     assert lockfile_set, 'found a LockSet'
 
-    assert_equal %w[a-2 a-2], lockfile_set.specs.map { |s| s.full_name }
+    assert_equal %w[a-2], lockfile_set.specs.map { |s| s.full_name }
 
-    assert_equal %w[https://gems.example/ https://other.example/],
-                 lockfile_set.specs.map { |s| s.source.uri.to_s }
+    if [].respond_to? :flat_map
+      assert_equal %w[https://gems.example/ https://other.example/],
+                   lockfile_set.specs.flat_map { |s| s.sources.map{ |src| src.uri.to_s } }
+    else # FIXME: remove when 1.8 is dropped
+      assert_equal %w[https://gems.example/ https://other.example/],
+                   lockfile_set.specs.map { |s| s.sources.map{ |src| src.uri.to_s } }.flatten(1)
+    end
   end
 
   def test_parse_GIT
diff --git a/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb b/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb
index 230d6118bf..ab506a14e6 100644
--- a/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb
+++ b/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/request_set'
 require 'rubygems/request_set/lockfile'
diff --git a/test/rubygems/test_gem_requirement.rb b/test/rubygems/test_gem_requirement.rb
index f608d9458d..c110009840 100644
--- a/test/rubygems/test_gem_requirement.rb
+++ b/test/rubygems/test_gem_requirement.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require "rubygems/requirement"
 
diff --git a/test/rubygems/test_gem_resolver.rb b/test/rubygems/test_gem_resolver.rb
index 54e4817808..dd480b023a 100644
--- a/test/rubygems/test_gem_resolver.rb
+++ b/test/rubygems/test_gem_resolver.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestGemResolver < Gem::TestCase
diff --git a/test/rubygems/test_gem_resolver_activation_request.rb b/test/rubygems/test_gem_resolver_activation_request.rb
index 3456c42722..ee1b38887a 100644
--- a/test/rubygems/test_gem_resolver_activation_request.rb
+++ b/test/rubygems/test_gem_resolver_activation_request.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestGemResolverActivationRequest < Gem::TestCase
diff --git a/test/rubygems/test_gem_resolver_api_set.rb b/test/rubygems/test_gem_resolver_api_set.rb
index beb580f347..5746614039 100644
--- a/test/rubygems/test_gem_resolver_api_set.rb
+++ b/test/rubygems/test_gem_resolver_api_set.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestGemResolverAPISet < Gem::TestCase
diff --git a/test/rubygems/test_gem_resolver_api_specification.rb b/test/rubygems/test_gem_resolver_api_specification.rb
index f4335c74f7..4f198ea395 100644
--- a/test/rubygems/test_gem_resolver_api_specification.rb
+++ b/test/rubygems/test_gem_resolver_api_specification.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestGemResolverAPISpecification < Gem::TestCase
diff --git a/test/rubygems/test_gem_resolver_best_set.rb b/test/rubygems/test_gem_resolver_best_set.rb
index db2cbea101..556f0e8349 100644
--- a/test/rubygems/test_gem_resolver_best_set.rb
+++ b/test/rubygems/test_gem_resolver_best_set.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestGemResolverBestSet < Gem::TestCase
diff --git a/test/rubygems/test_gem_resolver_composed_set.rb b/test/rubygems/test_gem_resolver_composed_set.rb
index 6032bcf7e2..f1c2da0454 100644
--- a/test/rubygems/test_gem_resolver_composed_set.rb
+++ b/test/rubygems/test_gem_resolver_composed_set.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestGemResolverComposedSet < Gem::TestCase
diff --git a/test/rubygems/test_gem_resolver_conflict.rb b/test/rubygems/test_gem_resolver_conflict.rb
index d4d81fab6c..56f048d91b 100644
--- a/test/rubygems/test_gem_resolver_conflict.rb
+++ b/test/rubygems/test_gem_resolver_conflict.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestGemResolverConflict < Gem::TestCase
diff --git a/test/rubygems/test_gem_resolver_dependency_request.rb b/test/rubygems/test_gem_resolver_dependency_request.rb
index 2587c645db..ac8f48a526 100644
--- a/test/rubygems/test_gem_resolver_dependency_request.rb
+++ b/test/rubygems/test_gem_resolver_dependency_request.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestGemResolverDependencyRequest < Gem::TestCase
diff --git a/test/rubygems/test_gem_resolver_git_set.rb b/test/rubygems/test_gem_resolver_git_set.rb
index c6fca20905..b87a80d44e 100644
--- a/test/rubygems/test_gem_resolver_git_set.rb
+++ b/test/rubygems/test_gem_resolver_git_set.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestGemResolverGitSet < Gem::TestCase
diff --git a/test/rubygems/test_gem_resolver_git_specification.rb b/test/rubygems/test_gem_resolver_git_specification.rb
index f484b1c779..9e8e2c5715 100644
--- a/test/rubygems/test_gem_resolver_git_specification.rb
+++ b/test/rubygems/test_gem_resolver_git_specification.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/installer'
 
diff --git a/test/rubygems/test_gem_resolver_index_set.rb b/test/rubygems/test_gem_resolver_index_set.rb
index abac704712..0f18572904 100644
--- a/test/rubygems/test_gem_resolver_index_set.rb
+++ b/test/rubygems/test_gem_resolver_index_set.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestGemResolverIndexSet < Gem::TestCase
diff --git a/test/rubygems/test_gem_resolver_index_specification.rb b/test/rubygems/test_gem_resolver_index_specification.rb
index 6e9605218d..6565892750 100644
--- a/test/rubygems/test_gem_resolver_index_specification.rb
+++ b/test/rubygems/test_gem_resolver_index_specification.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/available_set'
 
diff --git a/test/rubygems/test_gem_resolver_installed_specification.rb b/test/rubygems/test_gem_resolver_installed_specification.rb
index f24d9ec223..1dfbb054f3 100644
--- a/test/rubygems/test_gem_resolver_installed_specification.rb
+++ b/test/rubygems/test_gem_resolver_installed_specification.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestGemResolverInstalledSpecification < Gem::TestCase
diff --git a/test/rubygems/test_gem_resolver_installer_set.rb b/test/rubygems/test_gem_resolver_installer_set.rb
index a8627ed141..e8d82d93b7 100644
--- a/test/rubygems/test_gem_resolver_installer_set.rb
+++ b/test/rubygems/test_gem_resolver_installer_set.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestGemResolverInstallerSet < Gem::TestCase
diff --git a/test/rubygems/test_gem_resolver_local_specification.rb b/test/rubygems/test_gem_resolver_local_specification.rb
index 8eac442171..d04d1ec8b3 100644
--- a/test/rubygems/test_gem_resolver_local_specification.rb
+++ b/test/rubygems/test_gem_resolver_local_specification.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/available_set'
 
diff --git a/test/rubygems/test_gem_resolver_lock_set.rb b/test/rubygems/test_gem_resolver_lock_set.rb
index 745b5dd85b..969f13fa8b 100644
--- a/test/rubygems/test_gem_resolver_lock_set.rb
+++ b/test/rubygems/test_gem_resolver_lock_set.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestGemResolverLockSet < Gem::TestCase
diff --git a/test/rubygems/test_gem_resolver_lock_specification.rb b/test/rubygems/test_gem_resolver_lock_specification.rb
index eabfec0a0d..3105ad65b3 100644
--- a/test/rubygems/test_gem_resolver_lock_specification.rb
+++ b/test/rubygems/test_gem_resolver_lock_specification.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/installer'
 require 'rubygems/resolver'
@@ -15,7 +15,7 @@ class TestGemResolverLockSpecification < Gem::TestCase
   end
 
   def test_initialize
-    spec = @LS.new @set, 'a', v(2), @source, Gem::Platform::RUBY
+    spec = @LS.new @set, 'a', v(2), [@source], Gem::Platform::RUBY
 
     assert_equal 'a',                 spec.name
     assert_equal v(2),                spec.version
@@ -25,7 +25,7 @@ class TestGemResolverLockSpecification < Gem::TestCase
   end
 
   def test_add_dependency
-    l_spec = @LS.new @set, 'a', v(2), @source, Gem::Platform::RUBY
+    l_spec = @LS.new @set, 'a', v(2), [@source], Gem::Platform::RUBY
 
     b_dep = dep('b', '>= 0')
 
@@ -39,7 +39,7 @@ class TestGemResolverLockSpecification < Gem::TestCase
       fetcher.download 'a', 2
     end
 
-    spec = @LS.new @set, 'a', v(2), @source, Gem::Platform::RUBY
+    spec = @LS.new @set, 'a', v(2), [@source], Gem::Platform::RUBY
 
     called = false
 
@@ -51,7 +51,7 @@ class TestGemResolverLockSpecification < Gem::TestCase
   end
 
   def test_install_installed
-    spec = @LS.new @set, 'a', v(2), @source, Gem::Platform::RUBY
+    spec = @LS.new @set, 'a', v(2), [@source], Gem::Platform::RUBY
 
     FileUtils.touch File.join(@gemhome, 'specifications', spec.spec.spec_name)
 
@@ -67,7 +67,7 @@ class TestGemResolverLockSpecification < Gem::TestCase
   def test_spec
     version = v(2)
 
-    l_spec = @LS.new @set, 'a', version, @source, Gem::Platform::RUBY
+    l_spec = @LS.new @set, 'a', version, [@source], Gem::Platform::RUBY
 
     b_dep = dep 'b', '>= 0'
     c_dep = dep 'c', '~> 1'
@@ -91,7 +91,7 @@ class TestGemResolverLockSpecification < Gem::TestCase
 
     version = v(2)
 
-    l_spec = @LS.new @set, 'a', version, @source, Gem::Platform::RUBY
+    l_spec = @LS.new @set, 'a', version, [@source], Gem::Platform::RUBY
 
     assert_same real_spec, l_spec.spec
   end
diff --git a/test/rubygems/test_gem_resolver_requirement_list.rb b/test/rubygems/test_gem_resolver_requirement_list.rb
index c7192475b8..6361dc32e6 100644
--- a/test/rubygems/test_gem_resolver_requirement_list.rb
+++ b/test/rubygems/test_gem_resolver_requirement_list.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestGemResolverRequirementList < Gem::TestCase
diff --git a/test/rubygems/test_gem_resolver_specification.rb b/test/rubygems/test_gem_resolver_specification.rb
index 73bda1f989..50ac7ec3a1 100644
--- a/test/rubygems/test_gem_resolver_specification.rb
+++ b/test/rubygems/test_gem_resolver_specification.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestGemResolverSpecification < Gem::TestCase
diff --git a/test/rubygems/test_gem_resolver_vendor_set.rb b/test/rubygems/test_gem_resolver_vendor_set.rb
index 6bb282ad04..c5b9ad019f 100644
--- a/test/rubygems/test_gem_resolver_vendor_set.rb
+++ b/test/rubygems/test_gem_resolver_vendor_set.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestGemResolverVendorSet < Gem::TestCase
diff --git a/test/rubygems/test_gem_resolver_vendor_specification.rb b/test/rubygems/test_gem_resolver_vendor_specification.rb
index 4d72e34810..1f9337c3fa 100644
--- a/test/rubygems/test_gem_resolver_vendor_specification.rb
+++ b/test/rubygems/test_gem_resolver_vendor_specification.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestGemResolverVendorSpecification < Gem::TestCase
diff --git a/test/rubygems/test_gem_security.rb b/test/rubygems/test_gem_security.rb
index d653d2c262..acd83f4dca 100644
--- a/test/rubygems/test_gem_security.rb
+++ b/test/rubygems/test_gem_security.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/security'
 require 'rubygems/fix_openssl_warnings' if RUBY_VERSION < "1.9"
diff --git a/test/rubygems/test_gem_security_policy.rb b/test/rubygems/test_gem_security_policy.rb
index b911d528df..bee0973f64 100644
--- a/test/rubygems/test_gem_security_policy.rb
+++ b/test/rubygems/test_gem_security_policy.rb
@@ -1,5 +1,5 @@
 # coding: UTF-8
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 require 'rubygems/test_case'
 
diff --git a/test/rubygems/test_gem_security_signer.rb b/test/rubygems/test_gem_security_signer.rb
index f473d40604..fe161762e5 100644
--- a/test/rubygems/test_gem_security_signer.rb
+++ b/test/rubygems/test_gem_security_signer.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 unless defined?(OpenSSL::SSL) then
diff --git a/test/rubygems/test_gem_security_trust_dir.rb b/test/rubygems/test_gem_security_trust_dir.rb
index 387c0925b6..a0fbef809a 100644
--- a/test/rubygems/test_gem_security_trust_dir.rb
+++ b/test/rubygems/test_gem_security_trust_dir.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 unless defined?(OpenSSL::SSL) then
diff --git a/test/rubygems/test_gem_server.rb b/test/rubygems/test_gem_server.rb
index 0ebc7d573a..0ece6d67ef 100644
--- a/test/rubygems/test_gem_server.rb
+++ b/test/rubygems/test_gem_server.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/server'
 require 'stringio'
diff --git a/test/rubygems/test_gem_silent_ui.rb b/test/rubygems/test_gem_silent_ui.rb
index 0caf362d46..497e2c0eb1 100644
--- a/test/rubygems/test_gem_silent_ui.rb
+++ b/test/rubygems/test_gem_silent_ui.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/user_interaction'
 require 'timeout'
diff --git a/test/rubygems/test_gem_source.rb b/test/rubygems/test_gem_source.rb
index d4a8a0142d..64dfa42468 100644
--- a/test/rubygems/test_gem_source.rb
+++ b/test/rubygems/test_gem_source.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/source'
 require 'rubygems/indexer'
diff --git a/test/rubygems/test_gem_source_fetch_problem.rb b/test/rubygems/test_gem_source_fetch_problem.rb
index 34ac743da7..7392a1ef0a 100644
--- a/test/rubygems/test_gem_source_fetch_problem.rb
+++ b/test/rubygems/test_gem_source_fetch_problem.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestGemSourceFetchProblem < Gem::TestCase
diff --git a/test/rubygems/test_gem_source_git.rb b/test/rubygems/test_gem_source_git.rb
index ea86d6657b..0e13a11e7e 100644
--- a/test/rubygems/test_gem_source_git.rb
+++ b/test/rubygems/test_gem_source_git.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/source'
 
diff --git a/test/rubygems/test_gem_source_installed.rb b/test/rubygems/test_gem_source_installed.rb
index 0337036410..6c7974831f 100644
--- a/test/rubygems/test_gem_source_installed.rb
+++ b/test/rubygems/test_gem_source_installed.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/source'
 
diff --git a/test/rubygems/test_gem_source_list.rb b/test/rubygems/test_gem_source_list.rb
index 23ae749aff..15aff9c9b4 100644
--- a/test/rubygems/test_gem_source_list.rb
+++ b/test/rubygems/test_gem_source_list.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/source_list'
 require 'rubygems/test_case'
 
diff --git a/test/rubygems/test_gem_source_local.rb b/test/rubygems/test_gem_source_local.rb
index 05c4c7e57c..7a42cbc76f 100644
--- a/test/rubygems/test_gem_source_local.rb
+++ b/test/rubygems/test_gem_source_local.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/source'
 
diff --git a/test/rubygems/test_gem_source_lock.rb b/test/rubygems/test_gem_source_lock.rb
index c5596d248b..6bd4002b6c 100644
--- a/test/rubygems/test_gem_source_lock.rb
+++ b/test/rubygems/test_gem_source_lock.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestGemSourceLock < Gem::TestCase
diff --git a/test/rubygems/test_gem_source_specific_file.rb b/test/rubygems/test_gem_source_specific_file.rb
index a54260dfc6..5199f0d1b0 100644
--- a/test/rubygems/test_gem_source_specific_file.rb
+++ b/test/rubygems/test_gem_source_specific_file.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/source'
 
diff --git a/test/rubygems/test_gem_source_vendor.rb b/test/rubygems/test_gem_source_vendor.rb
index f59e6a7fdf..01b20bdd51 100644
--- a/test/rubygems/test_gem_source_vendor.rb
+++ b/test/rubygems/test_gem_source_vendor.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/source'
 
diff --git a/test/rubygems/test_gem_spec_fetcher.rb b/test/rubygems/test_gem_spec_fetcher.rb
index 876094f9b7..53bb31a910 100644
--- a/test/rubygems/test_gem_spec_fetcher.rb
+++ b/test/rubygems/test_gem_spec_fetcher.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/spec_fetcher'
 
diff --git a/test/rubygems/test_gem_specification.rb b/test/rubygems/test_gem_specification.rb
index cfca49a18f..bc1c8d2ca7 100644
--- a/test/rubygems/test_gem_specification.rb
+++ b/test/rubygems/test_gem_specification.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'benchmark'
 require 'rubygems/test_case'
 require 'pathname'
@@ -1002,7 +1002,7 @@ dependencies: []
     silence_warnings { Encoding.default_internal = 'US-ASCII' }
 
     spec2 = @a2.dup
-    bin = "\u5678"
+    bin = "\u5678".dup
     spec2.authors = [bin]
     full_path = spec2.spec_file
     write_file full_path do |io|
@@ -2284,30 +2284,30 @@ dependencies: []
 # stub: a 2 ruby lib\0other
 
 Gem::Specification.new do |s|
-  s.name = "a"
+  s.name = "a".freeze
   s.version = "2"
 
-  s.required_rubygems_version = Gem::Requirement.new(\"> 0\") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib", "other"]
-  s.authors = ["A User"]
+  s.required_rubygems_version = Gem::Requirement.new(\"> 0\".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze, "other".freeze]
+  s.authors = ["A User".freeze]
   s.date = "#{Gem::Specification::TODAY.strftime "%Y-%m-%d"}"
-  s.description = "This is a test description"
-  s.email = "example@example.com"
-  s.files = ["lib/code.rb"]
-  s.homepage = "http://example.com"
-  s.rubygems_version = "#{Gem::VERSION}"
-  s.summary = "this is a summary"
+  s.description = "This is a test description".freeze
+  s.email = "example@example.com".freeze
+  s.files = ["lib/code.rb".freeze]
+  s.homepage = "http://example.com".freeze
+  s.rubygems_version = "#{Gem::VERSION}".freeze
+  s.summary = "this is a summary".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = #{Gem::Specification::CURRENT_SPECIFICATION_VERSION}
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<b>, [\"= 1\"])
+      s.add_runtime_dependency(%q<b>.freeze, [\"= 1\"])
     else
-      s.add_dependency(%q<b>, [\"= 1\"])
+      s.add_dependency(%q<b>.freeze, [\"= 1\"])
     end
   else
-    s.add_dependency(%q<b>, [\"= 1\"])
+    s.add_dependency(%q<b>.freeze, [\"= 1\"])
   end
 end
     SPEC
@@ -2333,18 +2333,18 @@ end
 # stub: a 2 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "a"
+  s.name = "a".freeze
   s.version = "2"
 
-  s.required_rubygems_version = Gem::Requirement.new(\"> 0\") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["A User"]
+  s.required_rubygems_version = Gem::Requirement.new(\"> 0\".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["A User".freeze]
   s.date = "#{Gem::Specification::TODAY.strftime "%Y-%m-%d"}"
-  s.description = "This is a test description"
-  s.email = "example@example.com"
-  s.homepage = "http://example.com"
-  s.rubygems_version = "#{Gem::VERSION}"
-  s.summary = "this is a summary"
+  s.description = "This is a test description".freeze
+  s.email = "example@example.com".freeze
+  s.homepage = "http://example.com".freeze
+  s.rubygems_version = "#{Gem::VERSION}".freeze
+  s.summary = "this is a summary".freeze
 
   s.installed_by_version = "#{Gem::VERSION}" if s.respond_to? :installed_by_version
 
@@ -2352,12 +2352,12 @@ Gem::Specification.new do |s|
     s.specification_version = #{Gem::Specification::CURRENT_SPECIFICATION_VERSION}
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<b>, [\"= 1\"])
+      s.add_runtime_dependency(%q<b>.freeze, [\"= 1\"])
     else
-      s.add_dependency(%q<b>, [\"= 1\"])
+      s.add_dependency(%q<b>.freeze, [\"= 1\"])
     end
   else
-    s.add_dependency(%q<b>, [\"= 1\"])
+    s.add_dependency(%q<b>.freeze, [\"= 1\"])
   end
 end
     SPEC
@@ -2389,43 +2389,43 @@ end
 # stub: #{extensions}
 
 Gem::Specification.new do |s|
-  s.name = "a"
+  s.name = "a".freeze
   s.version = "1"
   s.platform = Gem::Platform.new(#{expected_platform})
 
-  s.required_rubygems_version = Gem::Requirement.new(\">= 0\") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["A User"]
+  s.required_rubygems_version = Gem::Requirement.new(\">= 0\".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["A User".freeze]
   s.date = "#{Gem::Specification::TODAY.strftime "%Y-%m-%d"}"
-  s.description = "This is a test description"
-  s.email = "example@example.com"
-  s.executables = ["exec"]
-  s.extensions = ["ext/a/extconf.rb"]
-  s.files = ["bin/exec", "ext/a/extconf.rb", "lib/code.rb", "test/suite.rb"]
-  s.homepage = "http://example.com"
-  s.licenses = ["MIT"]
-  s.requirements = ["A working computer"]
-  s.rubyforge_project = "example"
-  s.rubygems_version = "#{Gem::VERSION}"
-  s.summary = "this is a summary"
-  s.test_files = ["test/suite.rb"]
+  s.description = "This is a test description".freeze
+  s.email = "example@example.com".freeze
+  s.executables = ["exec".freeze]
+  s.extensions = ["ext/a/extconf.rb".freeze]
+  s.files = ["bin/exec".freeze, "ext/a/extconf.rb".freeze, "lib/code.rb".freeze, "test/suite.rb".freeze]
+  s.homepage = "http://example.com".freeze
+  s.licenses = ["MIT".freeze]
+  s.requirements = ["A working computer".freeze]
+  s.rubyforge_project = "example".freeze
+  s.rubygems_version = "#{Gem::VERSION}".freeze
+  s.summary = "this is a summary".freeze
+  s.test_files = ["test/suite.rb".freeze]
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rake>, [\"> 0.4\"])
-      s.add_runtime_dependency(%q<jabber4r>, [\"> 0.0.0\"])
-      s.add_runtime_dependency(%q<pqa>, [\"<= 0.6\", \"> 0.4\"])
+      s.add_runtime_dependency(%q<rake>.freeze, [\"> 0.4\"])
+      s.add_runtime_dependency(%q<jabber4r>.freeze, [\"> 0.0.0\"])
+      s.add_runtime_dependency(%q<pqa>.freeze, [\"<= 0.6\", \"> 0.4\"])
     else
-      s.add_dependency(%q<rake>, [\"> 0.4\"])
-      s.add_dependency(%q<jabber4r>, [\"> 0.0.0\"])
-      s.add_dependency(%q<pqa>, [\"<= 0.6\", \"> 0.4\"])
+      s.add_dependency(%q<rake>.freeze, [\"> 0.4\"])
+      s.add_dependency(%q<jabber4r>.freeze, [\"> 0.0.0\"])
+      s.add_dependency(%q<pqa>.freeze, [\"<= 0.6\", \"> 0.4\"])
     end
   else
-    s.add_dependency(%q<rake>, [\"> 0.4\"])
-    s.add_dependency(%q<jabber4r>, [\"> 0.0.0\"])
-    s.add_dependency(%q<pqa>, [\"<= 0.6\", \"> 0.4\"])
+    s.add_dependency(%q<rake>.freeze, [\"> 0.4\"])
+    s.add_dependency(%q<jabber4r>.freeze, [\"> 0.0.0\"])
+    s.add_dependency(%q<pqa>.freeze, [\"<= 0.6\", \"> 0.4\"])
   end
 end
     SPEC
@@ -2906,7 +2906,7 @@ http://spdx.org/licenses or 'Nonstandard' for a nonstandard license.
     end
 
     assert_match <<-warning, @ui.error
-WARNING: license value 'BSD' is invalid.  Use a license identifier from
+WARNING:  license value 'BSD' is invalid.  Use a license identifier from
 http://spdx.org/licenses or 'Nonstandard' for a nonstandard license.
     warning
   end
@@ -2942,15 +2942,30 @@ http://spdx.org/licenses or 'Nonstandard' for a nonstandard license.
     end
 
     assert_match <<-warning, @ui.error
-WARNING: license value 'GPL-2.0+ FOO' is invalid.  Use a license identifier from
+WARNING:  license value 'GPL-2.0+ FOO' is invalid.  Use a license identifier from
 http://spdx.org/licenses or 'Nonstandard' for a nonstandard license.
     warning
     assert_match <<-warning, @ui.error
-WARNING: license value 'GPL-2.0 FOO' is invalid.  Use a license identifier from
+WARNING:  license value 'GPL-2.0 FOO' is invalid.  Use a license identifier from
 http://spdx.org/licenses or 'Nonstandard' for a nonstandard license.
     warning
   end
 
+  def test_validate_license_gives_suggestions
+    util_setup_validate
+
+    use_ui @ui do
+      @a1.licenses = ['ruby']
+      @a1.validate
+    end
+
+    assert_match <<-warning, @ui.error
+WARNING:  license value 'ruby' is invalid.  Use a license identifier from
+http://spdx.org/licenses or 'Nonstandard' for a nonstandard license.
+Did you mean 'Ruby'?
+    warning
+  end
+
   def test_validate_name
     util_setup_validate
 
@@ -3279,20 +3294,20 @@ http://spdx.org/licenses or 'Nonstandard' for a nonstandard license.
 # stub: m 1 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "m"
+  s.name = "m".freeze
   s.version = "1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.metadata = { "one" => "two", "two" => "three" } if s.respond_to? :metadata=
-  s.require_paths = ["lib"]
-  s.authors = ["A User"]
+  s.require_paths = ["lib".freeze]
+  s.authors = ["A User".freeze]
   s.date = "#{Gem::Specification::TODAY.strftime("%Y-%m-%d")}"
-  s.description = "This is a test description"
-  s.email = "example@example.com"
-  s.files = ["lib/code.rb"]
-  s.homepage = "http://example.com"
-  s.rubygems_version = "#{Gem::VERSION}"
-  s.summary = "this is a summary"
+  s.description = "This is a test description".freeze
+  s.email = "example@example.com".freeze
+  s.files = ["lib/code.rb".freeze]
+  s.homepage = "http://example.com".freeze
+  s.rubygems_version = "#{Gem::VERSION}".freeze
+  s.summary = "this is a summary".freeze
 end
     EOF
 
diff --git a/test/rubygems/test_gem_stream_ui.rb b/test/rubygems/test_gem_stream_ui.rb
index aa6b19f8be..9518ebc88e 100644
--- a/test/rubygems/test_gem_stream_ui.rb
+++ b/test/rubygems/test_gem_stream_ui.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/user_interaction'
 require 'timeout'
diff --git a/test/rubygems/test_gem_stub_specification.rb b/test/rubygems/test_gem_stub_specification.rb
index 5ffbc57a9a..4cba13e139 100644
--- a/test/rubygems/test_gem_stub_specification.rb
+++ b/test/rubygems/test_gem_stub_specification.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require "rubygems/test_case"
 require "rubygems/stub_specification"
 
diff --git a/test/rubygems/test_gem_text.rb b/test/rubygems/test_gem_text.rb
index 855e9ac09d..a6e22e04da 100644
--- a/test/rubygems/test_gem_text.rb
+++ b/test/rubygems/test_gem_text.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require "rubygems/text"
 
diff --git a/test/rubygems/test_gem_uninstaller.rb b/test/rubygems/test_gem_uninstaller.rb
index 13cc6eb39f..d005130895 100644
--- a/test/rubygems/test_gem_uninstaller.rb
+++ b/test/rubygems/test_gem_uninstaller.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/installer_test_case'
 require 'rubygems/uninstaller'
 
diff --git a/test/rubygems/test_gem_unsatisfiable_dependency_error.rb b/test/rubygems/test_gem_unsatisfiable_dependency_error.rb
index c7aba3d54a..8b9c5604c9 100644
--- a/test/rubygems/test_gem_unsatisfiable_dependency_error.rb
+++ b/test/rubygems/test_gem_unsatisfiable_dependency_error.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestGemUnsatisfiableDependencyError < Gem::TestCase
diff --git a/test/rubygems/test_gem_uri_formatter.rb b/test/rubygems/test_gem_uri_formatter.rb
index 036e7cd673..c16ce98d23 100644
--- a/test/rubygems/test_gem_uri_formatter.rb
+++ b/test/rubygems/test_gem_uri_formatter.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/uri_formatter'
 
diff --git a/test/rubygems/test_gem_util.rb b/test/rubygems/test_gem_util.rb
index 8b763f0ff1..eb974427aa 100644
--- a/test/rubygems/test_gem_util.rb
+++ b/test/rubygems/test_gem_util.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/util'
 
diff --git a/test/rubygems/test_gem_validator.rb b/test/rubygems/test_gem_validator.rb
index 4770bdfb64..5365a1dabb 100644
--- a/test/rubygems/test_gem_validator.rb
+++ b/test/rubygems/test_gem_validator.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require "rubygems/simple_gem"
 require 'rubygems/validator'
diff --git a/test/rubygems/test_gem_version.rb b/test/rubygems/test_gem_version.rb
index ffe4d028f5..53e2020aba 100644
--- a/test/rubygems/test_gem_version.rb
+++ b/test/rubygems/test_gem_version.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require "rubygems/version"
 
diff --git a/test/rubygems/test_gem_version_option.rb b/test/rubygems/test_gem_version_option.rb
index 9af7c63bde..d4699313c2 100644
--- a/test/rubygems/test_gem_version_option.rb
+++ b/test/rubygems/test_gem_version_option.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/command'
 require 'rubygems/version_option'
diff --git a/test/rubygems/test_kernel.rb b/test/rubygems/test_kernel.rb
index f78fe1d317..d79b21c639 100644
--- a/test/rubygems/test_kernel.rb
+++ b/test/rubygems/test_kernel.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 
 class TestKernel < Gem::TestCase
diff --git a/test/rubygems/test_require.rb b/test/rubygems/test_require.rb
index c05387a871..ec0c48ac68 100644
--- a/test/rubygems/test_require.rb
+++ b/test/rubygems/test_require.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems'