Merge RubyGems and Bundler master

  from https://github.com/rubygems/rubygems/commit/0635c1423db5d7c461d53bf0c3329bca75de7609

7 files changed, 12 insertions, 12 deletions

diff --git a/test/rubygems/helper.rb b/test/rubygems/helper.rb
index aab875fec9..c4c69be75e 100644
--- a/test/rubygems/helper.rb
+++ b/test/rubygems/helper.rb
@@ -1555,7 +1555,7 @@ Also, a list:
   # :stopdoc:
   # only available in RubyGems tests
 
-  PRIVATE_KEY_PASSPHRASE = "Foo bar".freeze
+  PRIVATE_KEY_PASSPHRASE = "Foo bar"
 
   begin
     PRIVATE_KEY                 = load_key "private"
diff --git a/test/rubygems/simple_gem.rb b/test/rubygems/simple_gem.rb
index 0f2ea48198..1650910aaf 100644
--- a/test/rubygems/simple_gem.rb
+++ b/test/rubygems/simple_gem.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-SIMPLE_GEM = <<-GEMDATA.freeze
+SIMPLE_GEM = <<-GEMDATA
         MD5SUM = "989bf34a1cbecd52e0ea66b662b3a405"
         if $0 == __FILE__
           require 'optparse'
diff --git a/test/rubygems/test_gem_commands_setup_command.rb b/test/rubygems/test_gem_commands_setup_command.rb
index dd688a4421..02c6a1b957 100644
--- a/test/rubygems/test_gem_commands_setup_command.rb
+++ b/test/rubygems/test_gem_commands_setup_command.rb
@@ -8,7 +8,7 @@ class TestGemCommandsSetupCommand < Gem::TestCase
   if File.exist?(bundler_gemspec)
     BUNDLER_VERS = File.read(bundler_gemspec).match(/VERSION = "(#{Gem::Version::VERSION_PATTERN})"/)[1]
   else
-    BUNDLER_VERS = "2.0.1".freeze
+    BUNDLER_VERS = "2.0.1"
   end
 
   def setup
diff --git a/test/rubygems/test_gem_remote_fetcher.rb b/test/rubygems/test_gem_remote_fetcher.rb
index 5f54230c77..098df5a538 100644
--- a/test/rubygems/test_gem_remote_fetcher.rb
+++ b/test/rubygems/test_gem_remote_fetcher.rb
@@ -28,7 +28,7 @@ require "rubygems/package"
 class TestGemRemoteFetcher < Gem::TestCase
   include Gem::DefaultUserInteraction
 
-  SERVER_DATA = <<-EOY.freeze
+  SERVER_DATA = <<-EOY
 --- !ruby/object:Gem::Cache
 gems:
   rake-0.4.11: !ruby/object:Gem::Specification
diff --git a/test/rubygems/test_gem_request_set_lockfile_parser.rb b/test/rubygems/test_gem_request_set_lockfile_parser.rb
index 757c764dc1..ecb145e697 100644
--- a/test/rubygems/test_gem_request_set_lockfile_parser.rb
+++ b/test/rubygems/test_gem_request_set_lockfile_parser.rb
@@ -275,7 +275,7 @@ DEPENDENCIES
       Gem::Resolver::LockSet === set
     end
 
-    refute lockfile_set, "fount a LockSet"
+    refute lockfile_set, "found a LockSet"
 
     git_set = @set.sets.find do |set|
       Gem::Resolver::GitSet === set
@@ -318,7 +318,7 @@ DEPENDENCIES
       Gem::Resolver::LockSet === set
     end
 
-    refute lockfile_set, "fount a LockSet"
+    refute lockfile_set, "found a LockSet"
 
     git_set = @set.sets.find do |set|
       Gem::Resolver::GitSet === set
@@ -355,7 +355,7 @@ DEPENDENCIES
       Gem::Resolver::LockSet === set
     end
 
-    refute lockfile_set, "fount a LockSet"
+    refute lockfile_set, "found a LockSet"
 
     git_set = @set.sets.find do |set|
       Gem::Resolver::GitSet === set
@@ -392,7 +392,7 @@ DEPENDENCIES
       Gem::Resolver::LockSet === set
     end
 
-    refute lockfile_set, "fount a LockSet"
+    refute lockfile_set, "found a LockSet"
 
     git_set = @set.sets.find do |set|
       Gem::Resolver::GitSet === set
diff --git a/test/rubygems/test_gem_specification.rb b/test/rubygems/test_gem_specification.rb
index dda47e6bdf..b20e8b321a 100644
--- a/test/rubygems/test_gem_specification.rb
+++ b/test/rubygems/test_gem_specification.rb
@@ -10,7 +10,7 @@ require "rubygems/installer"
 require "rubygems/platform"
 
 class TestGemSpecification < Gem::TestCase
-  LEGACY_YAML_SPEC = <<-EOF.freeze
+  LEGACY_YAML_SPEC = <<-EOF
 --- !ruby/object:Gem::Specification
 rubygems_version: "1.0"
 name: keyedlist
@@ -29,7 +29,7 @@ email: flgr@ccan.de
 has_rdoc: true
   EOF
 
-  LEGACY_RUBY_SPEC = <<-EOF.freeze
+  LEGACY_RUBY_SPEC = <<-EOF
 Gem::Specification.new do |s|
   s.name = %q{keyedlist}
   s.version = %q{0.4.0}
diff --git a/test/rubygems/test_gem_version.rb b/test/rubygems/test_gem_version.rb
index 9237608d4a..f45c72b29c 100644
--- a/test/rubygems/test_gem_version.rb
+++ b/test/rubygems/test_gem_version.rb
@@ -43,7 +43,7 @@ class TestGemVersion < Gem::TestCase
 
     assert_equal v("5.1"), Gem::Version.create("5.1")
 
-    ver = "1.1".freeze
+    ver = "1.1"
     assert_equal v("1.1"), Gem::Version.create(ver)
   end
 
@@ -88,7 +88,7 @@ class TestGemVersion < Gem::TestCase
   end
 
   def test_initialize
-    ["1.0", "1.0 ", " 1.0 ", "1.0\n", "\n1.0\n", "1.0".freeze].each do |good|
+    ["1.0", "1.0 ", " 1.0 ", "1.0\n", "\n1.0\n", "1.0"].each do |good|
       assert_version_equal "1.0", good
     end