From aa390a3500ff1fe9803ba9ec982c5ea6edd4f85f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
Date: Wed, 12 May 2021 11:35:19 +0200
Subject: [PATCH] Copy files specific to testing rubygems to `test`

---
 Manifest.txt                                    | 8 ++++----
 {lib => test}/rubygems/installer_test_case.rb   | 0
 {lib => test}/rubygems/package/tar_test_case.rb | 0
 {lib => test}/rubygems/test_case.rb             | 2 +-
 {lib => test}/rubygems/test_utilities.rb        | 0
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename {lib => test}/rubygems/installer_test_case.rb (100%)
 rename {lib => test}/rubygems/package/tar_test_case.rb (100%)
 rename {lib => test}/rubygems/test_case.rb (99%)
 rename {lib => test}/rubygems/test_utilities.rb (100%)

diff --git a/Manifest.txt b/Manifest.txt
index bafc6b3e928f..681c5bc4786a 100644
--- a/Manifest.txt
+++ b/Manifest.txt
@@ -380,7 +380,6 @@ lib/rubygems/install_default_message.rb
 lib/rubygems/install_message.rb
 lib/rubygems/install_update_options.rb
 lib/rubygems/installer.rb
-lib/rubygems/installer_test_case.rb
 lib/rubygems/installer_uninstaller_utils.rb
 lib/rubygems/local_remote_options.rb
 lib/rubygems/mock_gem_ui.rb
@@ -395,7 +394,6 @@ lib/rubygems/package/source.rb
 lib/rubygems/package/tar_header.rb
 lib/rubygems/package/tar_reader.rb
 lib/rubygems/package/tar_reader/entry.rb
-lib/rubygems/package/tar_test_case.rb
 lib/rubygems/package/tar_writer.rb
 lib/rubygems/package_task.rb
 lib/rubygems/path_support.rb
@@ -488,8 +486,6 @@ lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA.pem
 lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem
 lib/rubygems/stub_specification.rb
 lib/rubygems/syck_hack.rb
-lib/rubygems/test_case.rb
-lib/rubygems/test_utilities.rb
 lib/rubygems/text.rb
 lib/rubygems/uninstaller.rb
 lib/rubygems/unknown_command_spell_checker.rb
@@ -530,6 +526,7 @@ test/rubygems/good_rake.rb
 test/rubygems/grandchild_cert.pem
 test/rubygems/grandchild_cert_32.pem
 test/rubygems/grandchild_key.pem
+test/rubygems/installer_test_case.rb
 test/rubygems/invalid_client.pem
 test/rubygems/invalid_issuer_cert.pem
 test/rubygems/invalid_issuer_cert_32.pem
@@ -539,6 +536,7 @@ test/rubygems/invalid_signer_cert_32.pem
 test/rubygems/invalidchild_cert.pem
 test/rubygems/invalidchild_cert_32.pem
 test/rubygems/invalidchild_key.pem
+test/rubygems/package/tar_test_case.rb
 test/rubygems/packages/ascii_binder-0.1.10.1.gem
 test/rubygems/plugin/exception/rubygems_plugin.rb
 test/rubygems/plugin/load/rubygems_plugin.rb
@@ -559,6 +557,7 @@ test/rubygems/specifications/rubyforge-0.0.1.gemspec
 test/rubygems/ssl_cert.pem
 test/rubygems/ssl_key.pem
 test/rubygems/test_bundled_ca.rb
+test/rubygems/test_case.rb
 test/rubygems/test_config.rb
 test/rubygems/test_deprecate.rb
 test/rubygems/test_gem.rb
@@ -691,6 +690,7 @@ test/rubygems/test_kernel.rb
 test/rubygems/test_project_sanity.rb
 test/rubygems/test_remote_fetch_error.rb
 test/rubygems/test_require.rb
+test/rubygems/test_utilities.rb
 test/rubygems/wrong_key_cert.pem
 test/rubygems/wrong_key_cert_32.pem
 test/test_changelog_generator.rb
diff --git a/lib/rubygems/installer_test_case.rb b/test/rubygems/installer_test_case.rb
similarity index 100%
rename from lib/rubygems/installer_test_case.rb
rename to test/rubygems/installer_test_case.rb
diff --git a/lib/rubygems/package/tar_test_case.rb b/test/rubygems/package/tar_test_case.rb
similarity index 100%
rename from lib/rubygems/package/tar_test_case.rb
rename to test/rubygems/package/tar_test_case.rb
diff --git a/lib/rubygems/test_case.rb b/test/rubygems/test_case.rb
similarity index 99%
rename from lib/rubygems/test_case.rb
rename to test/rubygems/test_case.rb
index b3e23360ed29..f13382227148 100644
--- a/lib/rubygems/test_case.rb
+++ b/test/rubygems/test_case.rb
@@ -1300,7 +1300,7 @@ def self.rubybin
   end
 
   def ruby_with_rubygems_in_load_path
-    [Gem.ruby, "-I", File.expand_path("..", __dir__)]
+    [Gem.ruby, "-I", File.expand_path("../../lib", __dir__)]
   end
 
   def with_clean_path_to_ruby
diff --git a/lib/rubygems/test_utilities.rb b/test/rubygems/test_utilities.rb
similarity index 100%
rename from lib/rubygems/test_utilities.rb
rename to test/rubygems/test_utilities.rb