diff --git a/test/rubygems/test_case.rb b/test/rubygems/helper.rb similarity index 99% rename from test/rubygems/test_case.rb rename to test/rubygems/helper.rb index e268df1277..2a37e383e6 100644 --- a/test/rubygems/test_case.rb +++ b/test/rubygems/helper.rb @@ -1596,4 +1596,4 @@ class Object end end -require_relative 'test_utilities' +require_relative 'utilities' diff --git a/test/rubygems/installer_test_case.rb b/test/rubygems/installer_test_case.rb index 67e4cc39d5..824ac53a82 100644 --- a/test/rubygems/installer_test_case.rb +++ b/test/rubygems/installer_test_case.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/installer' class Gem::Installer diff --git a/test/rubygems/package/tar_test_case.rb b/test/rubygems/package/tar_test_case.rb index 019f1f2782..99f503a23f 100644 --- a/test/rubygems/package/tar_test_case.rb +++ b/test/rubygems/package/tar_test_case.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative '../test_case' +require_relative '../helper' require 'rubygems/package' ## diff --git a/test/rubygems/test_bundled_ca.rb b/test/rubygems/test_bundled_ca.rb index 18985cbebd..fff5904aba 100644 --- a/test/rubygems/test_bundled_ca.rb +++ b/test/rubygems/test_bundled_ca.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'net/http' require 'rubygems/openssl' diff --git a/test/rubygems/test_config.rb b/test/rubygems/test_config.rb index e73518cd62..fff539c816 100644 --- a/test/rubygems/test_config.rb +++ b/test/rubygems/test_config.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems' require 'shellwords' diff --git a/test/rubygems/test_deprecate.rb b/test/rubygems/test_deprecate.rb index 502e95bebc..a619eccb37 100644 --- a/test/rubygems/test_deprecate.rb +++ b/test/rubygems/test_deprecate.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/deprecate' class TestDeprecate < Gem::TestCase diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb index ae161701f6..79ea89e2fa 100644 --- a/test/rubygems/test_gem.rb +++ b/test/rubygems/test_gem.rb @@ -1,5 +1,5 @@ # coding: US-ASCII -require_relative 'test_case' +require_relative 'helper' require 'rubygems' require 'rubygems/command' require 'rubygems/installer' diff --git a/test/rubygems/test_gem_available_set.rb b/test/rubygems/test_gem_available_set.rb index 0ead5d6d5c..c4164d77f2 100644 --- a/test/rubygems/test_gem_available_set.rb +++ b/test/rubygems/test_gem_available_set.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/available_set' require 'rubygems/security' diff --git a/test/rubygems/test_gem_bundler_version_finder.rb b/test/rubygems/test_gem_bundler_version_finder.rb index 6bc05978cf..4ba3b9accf 100644 --- a/test/rubygems/test_gem_bundler_version_finder.rb +++ b/test/rubygems/test_gem_bundler_version_finder.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' class TestGemBundlerVersionFinder < Gem::TestCase def setup diff --git a/test/rubygems/test_gem_command.rb b/test/rubygems/test_gem_command.rb index bab7a2eef4..669740fceb 100644 --- a/test/rubygems/test_gem_command.rb +++ b/test/rubygems/test_gem_command.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/command' class Gem::Command diff --git a/test/rubygems/test_gem_command_manager.rb b/test/rubygems/test_gem_command_manager.rb index 197eb0307f..f6a82908b3 100644 --- a/test/rubygems/test_gem_command_manager.rb +++ b/test/rubygems/test_gem_command_manager.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/command_manager' class TestGemCommandManager < Gem::TestCase diff --git a/test/rubygems/test_gem_commands_build_command.rb b/test/rubygems/test_gem_commands_build_command.rb index a99423675c..1304beb580 100644 --- a/test/rubygems/test_gem_commands_build_command.rb +++ b/test/rubygems/test_gem_commands_build_command.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/commands/build_command' require 'rubygems/package' diff --git a/test/rubygems/test_gem_commands_cert_command.rb b/test/rubygems/test_gem_commands_cert_command.rb index 98a23543eb..f722678a19 100644 --- a/test/rubygems/test_gem_commands_cert_command.rb +++ b/test/rubygems/test_gem_commands_cert_command.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/commands/cert_command' unless Gem::HAVE_OPENSSL diff --git a/test/rubygems/test_gem_commands_check_command.rb b/test/rubygems/test_gem_commands_check_command.rb index 47888a8aca..f280b060c4 100644 --- a/test/rubygems/test_gem_commands_check_command.rb +++ b/test/rubygems/test_gem_commands_check_command.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/commands/check_command' class TestGemCommandsCheckCommand < Gem::TestCase diff --git a/test/rubygems/test_gem_commands_cleanup_command.rb b/test/rubygems/test_gem_commands_cleanup_command.rb index 2ac146991c..fc98998012 100644 --- a/test/rubygems/test_gem_commands_cleanup_command.rb +++ b/test/rubygems/test_gem_commands_cleanup_command.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' 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 c9a6289045..d79174717b 100644 --- a/test/rubygems/test_gem_commands_contents_command.rb +++ b/test/rubygems/test_gem_commands_contents_command.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/commands/contents_command' class TestGemCommandsContentsCommand < Gem::TestCase diff --git a/test/rubygems/test_gem_commands_dependency_command.rb b/test/rubygems/test_gem_commands_dependency_command.rb index cd830ca3fa..13c7c065b5 100644 --- a/test/rubygems/test_gem_commands_dependency_command.rb +++ b/test/rubygems/test_gem_commands_dependency_command.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/commands/dependency_command' class TestGemCommandsDependencyCommand < Gem::TestCase diff --git a/test/rubygems/test_gem_commands_environment_command.rb b/test/rubygems/test_gem_commands_environment_command.rb index fdc05f607e..2bf80d8d85 100644 --- a/test/rubygems/test_gem_commands_environment_command.rb +++ b/test/rubygems/test_gem_commands_environment_command.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/commands/environment_command' class TestGemCommandsEnvironmentCommand < Gem::TestCase diff --git a/test/rubygems/test_gem_commands_fetch_command.rb b/test/rubygems/test_gem_commands_fetch_command.rb index 2558544f29..35ee00f763 100644 --- a/test/rubygems/test_gem_commands_fetch_command.rb +++ b/test/rubygems/test_gem_commands_fetch_command.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/package' require 'rubygems/security' require 'rubygems/commands/fetch_command' diff --git a/test/rubygems/test_gem_commands_generate_index_command.rb b/test/rubygems/test_gem_commands_generate_index_command.rb index 9f79632f9b..5b7b37a446 100644 --- a/test/rubygems/test_gem_commands_generate_index_command.rb +++ b/test/rubygems/test_gem_commands_generate_index_command.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' 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 f6d6dc798f..ac315538cc 100644 --- a/test/rubygems/test_gem_commands_help_command.rb +++ b/test/rubygems/test_gem_commands_help_command.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true require "rubygems" -require_relative "test_case" +require_relative "helper" require "rubygems/commands/help_command" require "rubygems/package" require "rubygems/command_manager" diff --git a/test/rubygems/test_gem_commands_info_command.rb b/test/rubygems/test_gem_commands_info_command.rb index 866ed88bd1..462075f98c 100644 --- a/test/rubygems/test_gem_commands_info_command.rb +++ b/test/rubygems/test_gem_commands_info_command.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/commands/info_command' class TestGemCommandsInfoCommand < Gem::TestCase diff --git a/test/rubygems/test_gem_commands_install_command.rb b/test/rubygems/test_gem_commands_install_command.rb index b56ec8aa51..48ac040d0e 100644 --- a/test/rubygems/test_gem_commands_install_command.rb +++ b/test/rubygems/test_gem_commands_install_command.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/commands/install_command' require 'rubygems/request_set' require 'rubygems/rdoc' diff --git a/test/rubygems/test_gem_commands_list_command.rb b/test/rubygems/test_gem_commands_list_command.rb index f917b862b6..d8cffce7a3 100644 --- a/test/rubygems/test_gem_commands_list_command.rb +++ b/test/rubygems/test_gem_commands_list_command.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/commands/list_command' class TestGemCommandsListCommand < Gem::TestCase diff --git a/test/rubygems/test_gem_commands_lock_command.rb b/test/rubygems/test_gem_commands_lock_command.rb index 9ab75ab95e..f8afca1e29 100644 --- a/test/rubygems/test_gem_commands_lock_command.rb +++ b/test/rubygems/test_gem_commands_lock_command.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/commands/lock_command' class TestGemCommandsLockCommand < Gem::TestCase diff --git a/test/rubygems/test_gem_commands_mirror.rb b/test/rubygems/test_gem_commands_mirror.rb index 375c4c5203..470f1c30fa 100644 --- a/test/rubygems/test_gem_commands_mirror.rb +++ b/test/rubygems/test_gem_commands_mirror.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/commands/mirror_command' class TestGemCommandsMirrorCommand < Gem::TestCase diff --git a/test/rubygems/test_gem_commands_open_command.rb b/test/rubygems/test_gem_commands_open_command.rb index cef5c904ea..2d62149cc4 100644 --- a/test/rubygems/test_gem_commands_open_command.rb +++ b/test/rubygems/test_gem_commands_open_command.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/commands/open_command' class TestGemCommandsOpenCommand < Gem::TestCase diff --git a/test/rubygems/test_gem_commands_outdated_command.rb b/test/rubygems/test_gem_commands_outdated_command.rb index eaba46214b..dc5c40a782 100644 --- a/test/rubygems/test_gem_commands_outdated_command.rb +++ b/test/rubygems/test_gem_commands_outdated_command.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/commands/outdated_command' class TestGemCommandsOutdatedCommand < Gem::TestCase diff --git a/test/rubygems/test_gem_commands_owner_command.rb b/test/rubygems/test_gem_commands_owner_command.rb index f5efe0178b..5b06b628c2 100644 --- a/test/rubygems/test_gem_commands_owner_command.rb +++ b/test/rubygems/test_gem_commands_owner_command.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/commands/owner_command' class TestGemCommandsOwnerCommand < Gem::TestCase diff --git a/test/rubygems/test_gem_commands_pristine_command.rb b/test/rubygems/test_gem_commands_pristine_command.rb index 53e417a62a..f4000f4657 100644 --- a/test/rubygems/test_gem_commands_pristine_command.rb +++ b/test/rubygems/test_gem_commands_pristine_command.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/commands/pristine_command' class TestGemCommandsPristineCommand < Gem::TestCase diff --git a/test/rubygems/test_gem_commands_push_command.rb b/test/rubygems/test_gem_commands_push_command.rb index ab386114d1..e1bc22dbae 100644 --- a/test/rubygems/test_gem_commands_push_command.rb +++ b/test/rubygems/test_gem_commands_push_command.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/commands/push_command' class TestGemCommandsPushCommand < Gem::TestCase diff --git a/test/rubygems/test_gem_commands_query_command.rb b/test/rubygems/test_gem_commands_query_command.rb index 0a818427fb..0cc88b1685 100644 --- a/test/rubygems/test_gem_commands_query_command.rb +++ b/test/rubygems/test_gem_commands_query_command.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/commands/query_command' module TestGemCommandsQueryCommandSetup diff --git a/test/rubygems/test_gem_commands_search_command.rb b/test/rubygems/test_gem_commands_search_command.rb index 6f1928cae1..6397dbd4d4 100644 --- a/test/rubygems/test_gem_commands_search_command.rb +++ b/test/rubygems/test_gem_commands_search_command.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/commands/search_command' class TestGemCommandsSearchCommand < Gem::TestCase diff --git a/test/rubygems/test_gem_commands_server_command.rb b/test/rubygems/test_gem_commands_server_command.rb index 4d85627662..09cec63c15 100644 --- a/test/rubygems/test_gem_commands_server_command.rb +++ b/test/rubygems/test_gem_commands_server_command.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/commands/server_command' class TestGemCommandsServerCommand < Gem::TestCase diff --git a/test/rubygems/test_gem_commands_setup_command.rb b/test/rubygems/test_gem_commands_setup_command.rb index ee6a8e44a1..21e2e9e6e4 100644 --- a/test/rubygems/test_gem_commands_setup_command.rb +++ b/test/rubygems/test_gem_commands_setup_command.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/commands/setup_command' class TestGemCommandsSetupCommand < Gem::TestCase diff --git a/test/rubygems/test_gem_commands_signin_command.rb b/test/rubygems/test_gem_commands_signin_command.rb index c483a5e2da..8f2477035c 100644 --- a/test/rubygems/test_gem_commands_signin_command.rb +++ b/test/rubygems/test_gem_commands_signin_command.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/commands/signin_command' require 'rubygems/installer' diff --git a/test/rubygems/test_gem_commands_signout_command.rb b/test/rubygems/test_gem_commands_signout_command.rb index 750f1fb0be..aa6300b6ab 100644 --- a/test/rubygems/test_gem_commands_signout_command.rb +++ b/test/rubygems/test_gem_commands_signout_command.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/commands/signout_command' require 'rubygems/installer' diff --git a/test/rubygems/test_gem_commands_sources_command.rb b/test/rubygems/test_gem_commands_sources_command.rb index fff90b560a..7bca0f3803 100644 --- a/test/rubygems/test_gem_commands_sources_command.rb +++ b/test/rubygems/test_gem_commands_sources_command.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/commands/sources_command' class TestGemCommandsSourcesCommand < Gem::TestCase diff --git a/test/rubygems/test_gem_commands_specification_command.rb b/test/rubygems/test_gem_commands_specification_command.rb index 106a32a28e..c8cb7df32e 100644 --- a/test/rubygems/test_gem_commands_specification_command.rb +++ b/test/rubygems/test_gem_commands_specification_command.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/commands/specification_command' class TestGemCommandsSpecificationCommand < Gem::TestCase diff --git a/test/rubygems/test_gem_commands_stale_command.rb b/test/rubygems/test_gem_commands_stale_command.rb index 5aa88dc71c..83bd3e5def 100644 --- a/test/rubygems/test_gem_commands_stale_command.rb +++ b/test/rubygems/test_gem_commands_stale_command.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/commands/stale_command' class TestGemCommandsStaleCommand < Gem::TestCase diff --git a/test/rubygems/test_gem_commands_unpack_command.rb b/test/rubygems/test_gem_commands_unpack_command.rb index 2ba38a07df..55369f1eeb 100644 --- a/test/rubygems/test_gem_commands_unpack_command.rb +++ b/test/rubygems/test_gem_commands_unpack_command.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/commands/unpack_command' class TestGemCommandsUnpackCommand < Gem::TestCase diff --git a/test/rubygems/test_gem_commands_update_command.rb b/test/rubygems/test_gem_commands_update_command.rb index 54f1b2309f..e9264f6d14 100644 --- a/test/rubygems/test_gem_commands_update_command.rb +++ b/test/rubygems/test_gem_commands_update_command.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/commands/update_command' class TestGemCommandsUpdateCommand < Gem::TestCase diff --git a/test/rubygems/test_gem_commands_which_command.rb b/test/rubygems/test_gem_commands_which_command.rb index 03ba51ca2d..a398dc5708 100644 --- a/test/rubygems/test_gem_commands_which_command.rb +++ b/test/rubygems/test_gem_commands_which_command.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/commands/which_command' class TestGemCommandsWhichCommand < Gem::TestCase diff --git a/test/rubygems/test_gem_commands_yank_command.rb b/test/rubygems/test_gem_commands_yank_command.rb index f3ee3452e4..3b0956e1c4 100644 --- a/test/rubygems/test_gem_commands_yank_command.rb +++ b/test/rubygems/test_gem_commands_yank_command.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/commands/yank_command' class TestGemCommandsYankCommand < Gem::TestCase diff --git a/test/rubygems/test_gem_config_file.rb b/test/rubygems/test_gem_config_file.rb index c1e2dcb56c..32375e6936 100644 --- a/test/rubygems/test_gem_config_file.rb +++ b/test/rubygems/test_gem_config_file.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/config_file' class TestGemConfigFile < Gem::TestCase diff --git a/test/rubygems/test_gem_dependency.rb b/test/rubygems/test_gem_dependency.rb index a231fa4d62..828021c119 100644 --- a/test/rubygems/test_gem_dependency.rb +++ b/test/rubygems/test_gem_dependency.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/dependency' class TestGemDependency < Gem::TestCase diff --git a/test/rubygems/test_gem_dependency_installer.rb b/test/rubygems/test_gem_dependency_installer.rb index ea5e745f83..9cbdcefea4 100644 --- a/test/rubygems/test_gem_dependency_installer.rb +++ b/test/rubygems/test_gem_dependency_installer.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' 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 25541e07f2..15c50de199 100644 --- a/test/rubygems/test_gem_dependency_list.rb +++ b/test/rubygems/test_gem_dependency_list.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/dependency_list' class TestGemDependencyList < Gem::TestCase diff --git a/test/rubygems/test_gem_dependency_resolution_error.rb b/test/rubygems/test_gem_dependency_resolution_error.rb index 77f698aec0..0e4a2fe31a 100644 --- a/test/rubygems/test_gem_dependency_resolution_error.rb +++ b/test/rubygems/test_gem_dependency_resolution_error.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' class TestGemDependencyResolutionError < Gem::TestCase def setup diff --git a/test/rubygems/test_gem_doctor.rb b/test/rubygems/test_gem_doctor.rb index 4550f84644..583c735dd3 100644 --- a/test/rubygems/test_gem_doctor.rb +++ b/test/rubygems/test_gem_doctor.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/doctor' class TestGemDoctor < Gem::TestCase diff --git a/test/rubygems/test_gem_ext_builder.rb b/test/rubygems/test_gem_ext_builder.rb index 75988b089e..b765c17ed1 100644 --- a/test/rubygems/test_gem_ext_builder.rb +++ b/test/rubygems/test_gem_ext_builder.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/ext' require 'rubygems/installer' diff --git a/test/rubygems/test_gem_ext_cmake_builder.rb b/test/rubygems/test_gem_ext_cmake_builder.rb index c497088b64..5ab82c545f 100644 --- a/test/rubygems/test_gem_ext_cmake_builder.rb +++ b/test/rubygems/test_gem_ext_cmake_builder.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/ext' class TestGemExtCmakeBuilder < Gem::TestCase diff --git a/test/rubygems/test_gem_ext_configure_builder.rb b/test/rubygems/test_gem_ext_configure_builder.rb index 4bc483b158..76ccfe2dc4 100644 --- a/test/rubygems/test_gem_ext_configure_builder.rb +++ b/test/rubygems/test_gem_ext_configure_builder.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/ext' class TestGemExtConfigureBuilder < Gem::TestCase diff --git a/test/rubygems/test_gem_ext_ext_conf_builder.rb b/test/rubygems/test_gem_ext_ext_conf_builder.rb index b138507f79..9279756d63 100644 --- a/test/rubygems/test_gem_ext_ext_conf_builder.rb +++ b/test/rubygems/test_gem_ext_ext_conf_builder.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/ext' class TestGemExtExtConfBuilder < Gem::TestCase diff --git a/test/rubygems/test_gem_ext_rake_builder.rb b/test/rubygems/test_gem_ext_rake_builder.rb index 941292d494..5dff29ff6e 100644 --- a/test/rubygems/test_gem_ext_rake_builder.rb +++ b/test/rubygems/test_gem_ext_rake_builder.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/ext' class TestGemExtRakeBuilder < Gem::TestCase diff --git a/test/rubygems/test_gem_gem_runner.rb b/test/rubygems/test_gem_gem_runner.rb index 16b0fb9631..6f5361cf2f 100644 --- a/test/rubygems/test_gem_gem_runner.rb +++ b/test/rubygems/test_gem_gem_runner.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' class TestGemGemRunner < Gem::TestCase def setup diff --git a/test/rubygems/test_gem_gemcutter_utilities.rb b/test/rubygems/test_gem_gemcutter_utilities.rb index 63e74cf66e..bb76fd2154 100644 --- a/test/rubygems/test_gem_gemcutter_utilities.rb +++ b/test/rubygems/test_gem_gemcutter_utilities.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems' require 'rubygems/command' require 'rubygems/gemcutter_utilities' diff --git a/test/rubygems/test_gem_impossible_dependencies_error.rb b/test/rubygems/test_gem_impossible_dependencies_error.rb index 1d0570c1d2..971be151df 100644 --- a/test/rubygems/test_gem_impossible_dependencies_error.rb +++ b/test/rubygems/test_gem_impossible_dependencies_error.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' class TestGemImpossibleDependenciesError < Gem::TestCase def test_message_conflict diff --git a/test/rubygems/test_gem_indexer.rb b/test/rubygems/test_gem_indexer.rb index a7a0490b0c..6653f29adf 100644 --- a/test/rubygems/test_gem_indexer.rb +++ b/test/rubygems/test_gem_indexer.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/indexer' class TestGemIndexer < Gem::TestCase diff --git a/test/rubygems/test_gem_local_remote_options.rb b/test/rubygems/test_gem_local_remote_options.rb index 64bb2e28b2..948d1e3981 100644 --- a/test/rubygems/test_gem_local_remote_options.rb +++ b/test/rubygems/test_gem_local_remote_options.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' 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 f4e961e212..d87db9bc45 100644 --- a/test/rubygems/test_gem_name_tuple.rb +++ b/test/rubygems/test_gem_name_tuple.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/name_tuple' class TestGemNameTuple < Gem::TestCase diff --git a/test/rubygems/test_gem_package_old.rb b/test/rubygems/test_gem_package_old.rb index 23d7d46d3b..945340a96a 100644 --- a/test/rubygems/test_gem_package_old.rb +++ b/test/rubygems/test_gem_package_old.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' unless Gem.java_platform? # jruby can't require the simple_gem file require 'rubygems/simple_gem' diff --git a/test/rubygems/test_gem_package_task.rb b/test/rubygems/test_gem_package_task.rb index e6acc9d2f4..0cedfe56eb 100644 --- a/test/rubygems/test_gem_package_task.rb +++ b/test/rubygems/test_gem_package_task.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems' begin diff --git a/test/rubygems/test_gem_path_support.rb b/test/rubygems/test_gem_path_support.rb index b02863d87f..88a3cc29b9 100644 --- a/test/rubygems/test_gem_path_support.rb +++ b/test/rubygems/test_gem_path_support.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems' require 'fileutils' diff --git a/test/rubygems/test_gem_platform.rb b/test/rubygems/test_gem_platform.rb index b94c6fb9cd..aae0250801 100644 --- a/test/rubygems/test_gem_platform.rb +++ b/test/rubygems/test_gem_platform.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/platform' require 'rbconfig' diff --git a/test/rubygems/test_gem_rdoc.rb b/test/rubygems/test_gem_rdoc.rb index e9a7349010..7b8ad07b27 100644 --- a/test/rubygems/test_gem_rdoc.rb +++ b/test/rubygems/test_gem_rdoc.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true require 'rubygems' -require_relative 'test_case' +require_relative 'helper' require 'rubygems/rdoc' class TestGemRDoc < Gem::TestCase diff --git a/test/rubygems/test_gem_remote_fetcher.rb b/test/rubygems/test_gem_remote_fetcher.rb index 16ae5cf9eb..1bae9247fe 100644 --- a/test/rubygems/test_gem_remote_fetcher.rb +++ b/test/rubygems/test_gem_remote_fetcher.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'webrick' require 'webrick/https' if Gem::HAVE_OPENSSL diff --git a/test/rubygems/test_gem_request.rb b/test/rubygems/test_gem_request.rb index ae5c21a4b9..780150d639 100644 --- a/test/rubygems/test_gem_request.rb +++ b/test/rubygems/test_gem_request.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/request' require 'ostruct' require 'base64' diff --git a/test/rubygems/test_gem_request_connection_pools.rb b/test/rubygems/test_gem_request_connection_pools.rb index b2b4236aea..c5e7cf2ed4 100644 --- a/test/rubygems/test_gem_request_connection_pools.rb +++ b/test/rubygems/test_gem_request_connection_pools.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/request' require 'timeout' diff --git a/test/rubygems/test_gem_request_set.rb b/test/rubygems/test_gem_request_set.rb index c21c2ddf04..e2fe98b9bf 100644 --- a/test/rubygems/test_gem_request_set.rb +++ b/test/rubygems/test_gem_request_set.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/request_set' class TestGemRequestSet < Gem::TestCase 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 805760cde1..cc4f99df91 100644 --- a/test/rubygems/test_gem_request_set_gem_dependency_api.rb +++ b/test/rubygems/test_gem_request_set_gem_dependency_api.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/request_set' class TestGemRequestSetGemDependencyAPI < Gem::TestCase diff --git a/test/rubygems/test_gem_request_set_lockfile.rb b/test/rubygems/test_gem_request_set_lockfile.rb index 200a04dfc9..690b632d9b 100644 --- a/test/rubygems/test_gem_request_set_lockfile.rb +++ b/test/rubygems/test_gem_request_set_lockfile.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' 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 6d48d8c9af..4007c3a69c 100644 --- a/test/rubygems/test_gem_request_set_lockfile_parser.rb +++ b/test/rubygems/test_gem_request_set_lockfile_parser.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/request_set' require 'rubygems/request_set/lockfile' require 'rubygems/request_set/lockfile/tokenizer' diff --git a/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb b/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb index f146ec679e..f779c33012 100644 --- a/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +++ b/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/request_set' require 'rubygems/request_set/lockfile' require 'rubygems/request_set/lockfile/tokenizer' diff --git a/test/rubygems/test_gem_requirement.rb b/test/rubygems/test_gem_requirement.rb index 577bcef2cc..f32d13f3a9 100644 --- a/test/rubygems/test_gem_requirement.rb +++ b/test/rubygems/test_gem_requirement.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require "rubygems/requirement" class TestGemRequirement < Gem::TestCase diff --git a/test/rubygems/test_gem_resolver.rb b/test/rubygems/test_gem_resolver.rb index 86546fd3b9..eb798ad557 100644 --- a/test/rubygems/test_gem_resolver.rb +++ b/test/rubygems/test_gem_resolver.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' class TestGemResolver < Gem::TestCase def setup diff --git a/test/rubygems/test_gem_resolver_activation_request.rb b/test/rubygems/test_gem_resolver_activation_request.rb index 305ffa425a..c7b726a230 100644 --- a/test/rubygems/test_gem_resolver_activation_request.rb +++ b/test/rubygems/test_gem_resolver_activation_request.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' class TestGemResolverActivationRequest < Gem::TestCase def setup diff --git a/test/rubygems/test_gem_resolver_api_set.rb b/test/rubygems/test_gem_resolver_api_set.rb index 743604c23a..c3db25d7aa 100644 --- a/test/rubygems/test_gem_resolver_api_set.rb +++ b/test/rubygems/test_gem_resolver_api_set.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' class TestGemResolverAPISet < Gem::TestCase def setup diff --git a/test/rubygems/test_gem_resolver_api_specification.rb b/test/rubygems/test_gem_resolver_api_specification.rb index f847721cb9..3f9b81868f 100644 --- a/test/rubygems/test_gem_resolver_api_specification.rb +++ b/test/rubygems/test_gem_resolver_api_specification.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' class TestGemResolverAPISpecification < Gem::TestCase def test_initialize diff --git a/test/rubygems/test_gem_resolver_best_set.rb b/test/rubygems/test_gem_resolver_best_set.rb index e0d06ba9dd..0e279d16a8 100644 --- a/test/rubygems/test_gem_resolver_best_set.rb +++ b/test/rubygems/test_gem_resolver_best_set.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' class TestGemResolverBestSet < Gem::TestCase def setup diff --git a/test/rubygems/test_gem_resolver_composed_set.rb b/test/rubygems/test_gem_resolver_composed_set.rb index 62382af3fc..405753a373 100644 --- a/test/rubygems/test_gem_resolver_composed_set.rb +++ b/test/rubygems/test_gem_resolver_composed_set.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' class TestGemResolverComposedSet < Gem::TestCase def test_errors diff --git a/test/rubygems/test_gem_resolver_conflict.rb b/test/rubygems/test_gem_resolver_conflict.rb index bd5be6c74c..1d46e69c3f 100644 --- a/test/rubygems/test_gem_resolver_conflict.rb +++ b/test/rubygems/test_gem_resolver_conflict.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' class TestGemResolverConflict < Gem::TestCase def test_explanation diff --git a/test/rubygems/test_gem_resolver_dependency_request.rb b/test/rubygems/test_gem_resolver_dependency_request.rb index fbce059417..cea0a7952d 100644 --- a/test/rubygems/test_gem_resolver_dependency_request.rb +++ b/test/rubygems/test_gem_resolver_dependency_request.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' class TestGemResolverDependencyRequest < Gem::TestCase def setup diff --git a/test/rubygems/test_gem_resolver_git_set.rb b/test/rubygems/test_gem_resolver_git_set.rb index 6ed62f04d3..145cd6c7df 100644 --- a/test/rubygems/test_gem_resolver_git_set.rb +++ b/test/rubygems/test_gem_resolver_git_set.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' class TestGemResolverGitSet < Gem::TestCase def setup diff --git a/test/rubygems/test_gem_resolver_git_specification.rb b/test/rubygems/test_gem_resolver_git_specification.rb index e4944e9782..857452c159 100644 --- a/test/rubygems/test_gem_resolver_git_specification.rb +++ b/test/rubygems/test_gem_resolver_git_specification.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/installer' class TestGemResolverGitSpecification < Gem::TestCase diff --git a/test/rubygems/test_gem_resolver_index_set.rb b/test/rubygems/test_gem_resolver_index_set.rb index 150dcf9c93..ddae0c2b82 100644 --- a/test/rubygems/test_gem_resolver_index_set.rb +++ b/test/rubygems/test_gem_resolver_index_set.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' class TestGemResolverIndexSet < Gem::TestCase def setup diff --git a/test/rubygems/test_gem_resolver_index_specification.rb b/test/rubygems/test_gem_resolver_index_specification.rb index 0d47f9144f..ef9c17034e 100644 --- a/test/rubygems/test_gem_resolver_index_specification.rb +++ b/test/rubygems/test_gem_resolver_index_specification.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/available_set' class TestGemResolverIndexSpecification < Gem::TestCase diff --git a/test/rubygems/test_gem_resolver_installed_specification.rb b/test/rubygems/test_gem_resolver_installed_specification.rb index 14b43ebced..0e5ea02fb9 100644 --- a/test/rubygems/test_gem_resolver_installed_specification.rb +++ b/test/rubygems/test_gem_resolver_installed_specification.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' class TestGemResolverInstalledSpecification < Gem::TestCase def setup diff --git a/test/rubygems/test_gem_resolver_installer_set.rb b/test/rubygems/test_gem_resolver_installer_set.rb index dc4f33bb84..66857943c9 100644 --- a/test/rubygems/test_gem_resolver_installer_set.rb +++ b/test/rubygems/test_gem_resolver_installer_set.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' class TestGemResolverInstallerSet < Gem::TestCase def test_add_always_install diff --git a/test/rubygems/test_gem_resolver_local_specification.rb b/test/rubygems/test_gem_resolver_local_specification.rb index 9533721243..c11f736128 100644 --- a/test/rubygems/test_gem_resolver_local_specification.rb +++ b/test/rubygems/test_gem_resolver_local_specification.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/available_set' class TestGemResolverLocalSpecification < Gem::TestCase diff --git a/test/rubygems/test_gem_resolver_lock_set.rb b/test/rubygems/test_gem_resolver_lock_set.rb index 62abf00c49..dc7767a3f8 100644 --- a/test/rubygems/test_gem_resolver_lock_set.rb +++ b/test/rubygems/test_gem_resolver_lock_set.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' class TestGemResolverLockSet < Gem::TestCase def setup diff --git a/test/rubygems/test_gem_resolver_lock_specification.rb b/test/rubygems/test_gem_resolver_lock_specification.rb index 7c3d695e8f..46c8e5edd6 100644 --- a/test/rubygems/test_gem_resolver_lock_specification.rb +++ b/test/rubygems/test_gem_resolver_lock_specification.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/installer' require 'rubygems/resolver' diff --git a/test/rubygems/test_gem_resolver_requirement_list.rb b/test/rubygems/test_gem_resolver_requirement_list.rb index c6b8e24ca2..806c387669 100644 --- a/test/rubygems/test_gem_resolver_requirement_list.rb +++ b/test/rubygems/test_gem_resolver_requirement_list.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' class TestGemResolverRequirementList < Gem::TestCase def setup diff --git a/test/rubygems/test_gem_resolver_specification.rb b/test/rubygems/test_gem_resolver_specification.rb index a8dc4daf71..9f28c1c0cf 100644 --- a/test/rubygems/test_gem_resolver_specification.rb +++ b/test/rubygems/test_gem_resolver_specification.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' class TestGemResolverSpecification < Gem::TestCase class TestSpec < Gem::Resolver::Specification diff --git a/test/rubygems/test_gem_resolver_vendor_set.rb b/test/rubygems/test_gem_resolver_vendor_set.rb index 8bedc13cdd..e16d43ac1a 100644 --- a/test/rubygems/test_gem_resolver_vendor_set.rb +++ b/test/rubygems/test_gem_resolver_vendor_set.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' class TestGemResolverVendorSet < Gem::TestCase def setup diff --git a/test/rubygems/test_gem_resolver_vendor_specification.rb b/test/rubygems/test_gem_resolver_vendor_specification.rb index 067ca992f1..93382ccd81 100644 --- a/test/rubygems/test_gem_resolver_vendor_specification.rb +++ b/test/rubygems/test_gem_resolver_vendor_specification.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' class TestGemResolverVendorSpecification < Gem::TestCase def setup diff --git a/test/rubygems/test_gem_security.rb b/test/rubygems/test_gem_security.rb index d44b6d879c..2eabbea3bf 100644 --- a/test/rubygems/test_gem_security.rb +++ b/test/rubygems/test_gem_security.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/security' unless Gem::HAVE_OPENSSL diff --git a/test/rubygems/test_gem_security_policy.rb b/test/rubygems/test_gem_security_policy.rb index c5be4d9112..515b8ea00b 100644 --- a/test/rubygems/test_gem_security_policy.rb +++ b/test/rubygems/test_gem_security_policy.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' unless Gem::HAVE_OPENSSL warn 'Skipping Gem::Security::Policy tests. openssl not found.' diff --git a/test/rubygems/test_gem_security_signer.rb b/test/rubygems/test_gem_security_signer.rb index be909f6fb3..7bd6510b50 100644 --- a/test/rubygems/test_gem_security_signer.rb +++ b/test/rubygems/test_gem_security_signer.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' unless Gem::HAVE_OPENSSL warn 'Skipping Gem::Security::Signer tests. openssl not found.' diff --git a/test/rubygems/test_gem_security_trust_dir.rb b/test/rubygems/test_gem_security_trust_dir.rb index 89243f2944..fc88c84865 100644 --- a/test/rubygems/test_gem_security_trust_dir.rb +++ b/test/rubygems/test_gem_security_trust_dir.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' unless Gem::HAVE_OPENSSL warn 'Skipping Gem::Security::TrustDir tests. openssl not found.' diff --git a/test/rubygems/test_gem_server.rb b/test/rubygems/test_gem_server.rb index b6c678ea94..f6aa99fb02 100644 --- a/test/rubygems/test_gem_server.rb +++ b/test/rubygems/test_gem_server.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/server' require 'stringio' diff --git a/test/rubygems/test_gem_silent_ui.rb b/test/rubygems/test_gem_silent_ui.rb index 634426c5d7..355255fb48 100644 --- a/test/rubygems/test_gem_silent_ui.rb +++ b/test/rubygems/test_gem_silent_ui.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/user_interaction' require 'timeout' diff --git a/test/rubygems/test_gem_source.rb b/test/rubygems/test_gem_source.rb index 44f090a634..24312626f4 100644 --- a/test/rubygems/test_gem_source.rb +++ b/test/rubygems/test_gem_source.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' 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 814fc62684..0b1472c0c6 100644 --- a/test/rubygems/test_gem_source_fetch_problem.rb +++ b/test/rubygems/test_gem_source_fetch_problem.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' class TestGemSourceFetchProblem < Gem::TestCase def test_exception diff --git a/test/rubygems/test_gem_source_git.rb b/test/rubygems/test_gem_source_git.rb index 6609870491..73ed8dd2ef 100644 --- a/test/rubygems/test_gem_source_git.rb +++ b/test/rubygems/test_gem_source_git.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/source' class TestGemSourceGit < Gem::TestCase diff --git a/test/rubygems/test_gem_source_installed.rb b/test/rubygems/test_gem_source_installed.rb index dd0d756a9e..ef9b63e611 100644 --- a/test/rubygems/test_gem_source_installed.rb +++ b/test/rubygems/test_gem_source_installed.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/source' class TestGemSourceInstalled < Gem::TestCase diff --git a/test/rubygems/test_gem_source_list.rb b/test/rubygems/test_gem_source_list.rb index ce64c51433..6ac5dbb2a6 100644 --- a/test/rubygems/test_gem_source_list.rb +++ b/test/rubygems/test_gem_source_list.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'rubygems' require 'rubygems/source_list' -require_relative 'test_case' +require_relative 'helper' class TestGemSourceList < Gem::TestCase def setup diff --git a/test/rubygems/test_gem_source_local.rb b/test/rubygems/test_gem_source_local.rb index 3845c17f73..2d4ddbc3a4 100644 --- a/test/rubygems/test_gem_source_local.rb +++ b/test/rubygems/test_gem_source_local.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/source' require 'fileutils' diff --git a/test/rubygems/test_gem_source_lock.rb b/test/rubygems/test_gem_source_lock.rb index 7fec17c3ef..5f916cdf7f 100644 --- a/test/rubygems/test_gem_source_lock.rb +++ b/test/rubygems/test_gem_source_lock.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' class TestGemSourceLock < Gem::TestCase def test_fetch_spec diff --git a/test/rubygems/test_gem_source_specific_file.rb b/test/rubygems/test_gem_source_specific_file.rb index 2cda6c7a46..72ed993a88 100644 --- a/test/rubygems/test_gem_source_specific_file.rb +++ b/test/rubygems/test_gem_source_specific_file.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/source' class TestGemSourceSpecificFile < Gem::TestCase diff --git a/test/rubygems/test_gem_source_subpath_problem.rb b/test/rubygems/test_gem_source_subpath_problem.rb index b2289ea625..c37df39f0c 100644 --- a/test/rubygems/test_gem_source_subpath_problem.rb +++ b/test/rubygems/test_gem_source_subpath_problem.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require 'rubygems/test_case' +require_relative 'helper' require 'rubygems/source' class TestGemSourceSubpathProblem < Gem::TestCase diff --git a/test/rubygems/test_gem_source_vendor.rb b/test/rubygems/test_gem_source_vendor.rb index cf74581942..a5ffb0f223 100644 --- a/test/rubygems/test_gem_source_vendor.rb +++ b/test/rubygems/test_gem_source_vendor.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/source' class TestGemSourceVendor < Gem::TestCase diff --git a/test/rubygems/test_gem_spec_fetcher.rb b/test/rubygems/test_gem_spec_fetcher.rb index c5672231b5..afae46e120 100644 --- a/test/rubygems/test_gem_spec_fetcher.rb +++ b/test/rubygems/test_gem_spec_fetcher.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/spec_fetcher' class TestGemSpecFetcher < Gem::TestCase diff --git a/test/rubygems/test_gem_specification.rb b/test/rubygems/test_gem_specification.rb index 69c98e375c..e145310168 100644 --- a/test/rubygems/test_gem_specification.rb +++ b/test/rubygems/test_gem_specification.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true require 'benchmark' -require_relative 'test_case' +require_relative 'helper' require 'date' require 'pathname' require 'stringio' diff --git a/test/rubygems/test_gem_stream_ui.rb b/test/rubygems/test_gem_stream_ui.rb index a7a7e9fa9f..dc245c342a 100644 --- a/test/rubygems/test_gem_stream_ui.rb +++ b/test/rubygems/test_gem_stream_ui.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' 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 f953d020cd..e008391ef7 100644 --- a/test/rubygems/test_gem_stub_specification.rb +++ b/test/rubygems/test_gem_stub_specification.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative "test_case" +require_relative "helper" require "rubygems/stub_specification" class TestStubSpecification < Gem::TestCase diff --git a/test/rubygems/test_gem_text.rb b/test/rubygems/test_gem_text.rb index cf6b01756c..f170fbf399 100644 --- a/test/rubygems/test_gem_text.rb +++ b/test/rubygems/test_gem_text.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require "rubygems/text" class TestGemText < Gem::TestCase diff --git a/test/rubygems/test_gem_unsatisfiable_dependency_error.rb b/test/rubygems/test_gem_unsatisfiable_dependency_error.rb index 81f712348d..f9d30123f0 100644 --- a/test/rubygems/test_gem_unsatisfiable_dependency_error.rb +++ b/test/rubygems/test_gem_unsatisfiable_dependency_error.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' class TestGemUnsatisfiableDependencyError < Gem::TestCase def setup diff --git a/test/rubygems/test_gem_uri_formatter.rb b/test/rubygems/test_gem_uri_formatter.rb index 9f12d8b048..a41c9238ad 100644 --- a/test/rubygems/test_gem_uri_formatter.rb +++ b/test/rubygems/test_gem_uri_formatter.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/uri_formatter' class TestGemUriFormatter < Gem::TestCase diff --git a/test/rubygems/test_gem_util.rb b/test/rubygems/test_gem_util.rb index ce41146087..e0db5c283d 100644 --- a/test/rubygems/test_gem_util.rb +++ b/test/rubygems/test_gem_util.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/util' class TestGemUtil < Gem::TestCase diff --git a/test/rubygems/test_gem_validator.rb b/test/rubygems/test_gem_validator.rb index 5334a5ef77..8090776b4a 100644 --- a/test/rubygems/test_gem_validator.rb +++ b/test/rubygems/test_gem_validator.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_relative "test_case" +require_relative "helper" require "rubygems/validator" class TestGemValidator < Gem::TestCase diff --git a/test/rubygems/test_gem_version.rb b/test/rubygems/test_gem_version.rb index aa7c4c9283..422e1ee86c 100644 --- a/test/rubygems/test_gem_version.rb +++ b/test/rubygems/test_gem_version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require "rubygems/version" class TestGemVersion < Gem::TestCase diff --git a/test/rubygems/test_gem_version_option.rb b/test/rubygems/test_gem_version_option.rb index a0e066109b..74d7979e3a 100644 --- a/test/rubygems/test_gem_version_option.rb +++ b/test/rubygems/test_gem_version_option.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems/command' require 'rubygems/version_option' diff --git a/test/rubygems/test_kernel.rb b/test/rubygems/test_kernel.rb index f774ae2f71..28dbe15006 100644 --- a/test/rubygems/test_kernel.rb +++ b/test/rubygems/test_kernel.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' class TestKernel < Gem::TestCase def setup diff --git a/test/rubygems/test_project_sanity.rb b/test/rubygems/test_project_sanity.rb index f7c08e9619..e9e3bfd1ba 100644 --- a/test/rubygems/test_project_sanity.rb +++ b/test/rubygems/test_project_sanity.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_relative "test_case" +require_relative "helper" require "open3" class TestProjectSanity < Gem::TestCase diff --git a/test/rubygems/test_remote_fetch_error.rb b/test/rubygems/test_remote_fetch_error.rb index b4ece6044f..b9e58389d3 100644 --- a/test/rubygems/test_remote_fetch_error.rb +++ b/test/rubygems/test_remote_fetch_error.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' class TestRemoteFetchError < Gem::TestCase def test_password_redacted diff --git a/test/rubygems/test_require.rb b/test/rubygems/test_require.rb index 7039e27dda..1c33dafbe2 100644 --- a/test/rubygems/test_require.rb +++ b/test/rubygems/test_require.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative 'test_case' +require_relative 'helper' require 'rubygems' class TestGemRequire < Gem::TestCase diff --git a/test/rubygems/test_utilities.rb b/test/rubygems/utilities.rb similarity index 99% rename from test/rubygems/test_utilities.rb rename to test/rubygems/utilities.rb index 312a864b05..20416fe70b 100644 --- a/test/rubygems/test_utilities.rb +++ b/test/rubygems/utilities.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'tempfile' require 'rubygems' -require_relative 'test_case' require 'rubygems/remote_fetcher' ##