ruby-changes:66413
From: Yusuke <ko1@a...>
Date: Thu, 3 Jun 2021 13:50:33 +0900 (JST)
Subject: [ruby-changes:66413] b957c3dbcb (master): [rubygems/rubygems] Rename test/rubygems/test_{case, utilities}.rb to avoid "test_" prefix
https://git.ruby-lang.org/ruby.git/commit/?id=b957c3dbcb From b957c3dbcb3cfee6908f4217cfb9ab0e78b4c618 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh <mame@r...> Date: Wed, 2 Jun 2021 12:32:47 +0900 Subject: [rubygems/rubygems] Rename test/rubygems/test_{case,utilities}.rb to avoid "test_" prefix This changes "test/rubygems/test_case.rb" to "test/rubygems/helper.rb", and "test/rubygems/test_utilities.rb" to "test/rubygems/utilities.rb". The two files are a helper for tests, not test files. However, a file starting with "test_" prefix is handled as a test file directly loaded by test-unit because Rakefile specifies: ``` t.test_files = FileList['test/**/test_*.rb'] ``` Directly loading test/rubygems/test_utilities.rb caused "uninitialized constant Gem::TestCase". This issue was fixed by 59c682097197fee4052b47e4b4ab86562f3eaa9b, but the fix caused a "circular require" warning because test_utilities.rb and test_case.rb are now requiring each other. Anyway, adding "test_" prefix to a test helper file is confusing, so this changeset reverts the fix and solve the issue by renaming them. https://github.com/rubygems/rubygems/commit/6460e018df --- test/rubygems/helper.rb | 1599 ++++++++++++++++++++ test/rubygems/installer_test_case.rb | 2 +- test/rubygems/package/tar_test_case.rb | 2 +- test/rubygems/test_bundled_ca.rb | 2 +- test/rubygems/test_case.rb | 1599 -------------------- test/rubygems/test_config.rb | 2 +- test/rubygems/test_deprecate.rb | 2 +- test/rubygems/test_gem.rb | 2 +- test/rubygems/test_gem_available_set.rb | 2 +- test/rubygems/test_gem_bundler_version_finder.rb | 2 +- test/rubygems/test_gem_command.rb | 2 +- test/rubygems/test_gem_command_manager.rb | 2 +- test/rubygems/test_gem_commands_build_command.rb | 2 +- test/rubygems/test_gem_commands_cert_command.rb | 2 +- test/rubygems/test_gem_commands_check_command.rb | 2 +- test/rubygems/test_gem_commands_cleanup_command.rb | 2 +- .../rubygems/test_gem_commands_contents_command.rb | 2 +- .../test_gem_commands_dependency_command.rb | 2 +- .../test_gem_commands_environment_command.rb | 2 +- test/rubygems/test_gem_commands_fetch_command.rb | 2 +- .../test_gem_commands_generate_index_command.rb | 2 +- test/rubygems/test_gem_commands_help_command.rb | 2 +- test/rubygems/test_gem_commands_info_command.rb | 2 +- test/rubygems/test_gem_commands_install_command.rb | 2 +- test/rubygems/test_gem_commands_list_command.rb | 2 +- test/rubygems/test_gem_commands_lock_command.rb | 2 +- test/rubygems/test_gem_commands_mirror.rb | 2 +- test/rubygems/test_gem_commands_open_command.rb | 2 +- .../rubygems/test_gem_commands_outdated_command.rb | 2 +- test/rubygems/test_gem_commands_owner_command.rb | 2 +- .../rubygems/test_gem_commands_pristine_command.rb | 2 +- test/rubygems/test_gem_commands_push_command.rb | 2 +- test/rubygems/test_gem_commands_query_command.rb | 2 +- test/rubygems/test_gem_commands_search_command.rb | 2 +- test/rubygems/test_gem_commands_server_command.rb | 2 +- test/rubygems/test_gem_commands_setup_command.rb | 2 +- test/rubygems/test_gem_commands_signin_command.rb | 2 +- test/rubygems/test_gem_commands_signout_command.rb | 2 +- test/rubygems/test_gem_commands_sources_command.rb | 2 +- .../test_gem_commands_specification_command.rb | 2 +- test/rubygems/test_gem_commands_stale_command.rb | 2 +- test/rubygems/test_gem_commands_unpack_command.rb | 2 +- test/rubygems/test_gem_commands_update_command.rb | 2 +- test/rubygems/test_gem_commands_which_command.rb | 2 +- test/rubygems/test_gem_commands_yank_command.rb | 2 +- test/rubygems/test_gem_config_file.rb | 2 +- test/rubygems/test_gem_dependency.rb | 2 +- test/rubygems/test_gem_dependency_installer.rb | 2 +- test/rubygems/test_gem_dependency_list.rb | 2 +- .../test_gem_dependency_resolution_error.rb | 2 +- test/rubygems/test_gem_doctor.rb | 2 +- test/rubygems/test_gem_ext_builder.rb | 2 +- test/rubygems/test_gem_ext_cmake_builder.rb | 2 +- test/rubygems/test_gem_ext_configure_builder.rb | 2 +- test/rubygems/test_gem_ext_ext_conf_builder.rb | 2 +- test/rubygems/test_gem_ext_rake_builder.rb | 2 +- test/rubygems/test_gem_gem_runner.rb | 2 +- test/rubygems/test_gem_gemcutter_utilities.rb | 2 +- .../test_gem_impossible_dependencies_error.rb | 2 +- test/rubygems/test_gem_indexer.rb | 2 +- test/rubygems/test_gem_local_remote_options.rb | 2 +- test/rubygems/test_gem_name_tuple.rb | 2 +- test/rubygems/test_gem_package_old.rb | 2 +- test/rubygems/test_gem_package_task.rb | 2 +- test/rubygems/test_gem_path_support.rb | 2 +- test/rubygems/test_gem_platform.rb | 2 +- test/rubygems/test_gem_rdoc.rb | 2 +- test/rubygems/test_gem_remote_fetcher.rb | 2 +- test/rubygems/test_gem_request.rb | 2 +- test/rubygems/test_gem_request_connection_pools.rb | 2 +- test/rubygems/test_gem_request_set.rb | 2 +- .../test_gem_request_set_gem_dependency_api.rb | 2 +- test/rubygems/test_gem_request_set_lockfile.rb | 2 +- .../test_gem_request_set_lockfile_parser.rb | 2 +- .../test_gem_request_set_lockfile_tokenizer.rb | 2 +- test/rubygems/test_gem_requirement.rb | 2 +- test/rubygems/test_gem_resolver.rb | 2 +- .../test_gem_resolver_activation_request.rb | 2 +- test/rubygems/test_gem_resolver_api_set.rb | 2 +- .../test_gem_resolver_api_specification.rb | 2 +- test/rubygems/test_gem_resolver_best_set.rb | 2 +- test/rubygems/test_gem_resolver_composed_set.rb | 2 +- test/rubygems/test_gem_resolver_conflict.rb | 2 +- .../test_gem_resolver_dependency_request.rb | 2 +- test/rubygems/test_gem_resolver_git_set.rb | 2 +- .../test_gem_resolver_git_specification.rb | 2 +- test/rubygems/test_gem_resolver_index_set.rb | 2 +- .../test_gem_resolver_index_specification.rb | 2 +- .../test_gem_resolver_installed_specification.rb | 2 +- test/rubygems/test_gem_resolver_installer_set.rb | 2 +- .../test_gem_resolver_local_specification.rb | 2 +- test/rubygems/test_gem_resolver_lock_set.rb | 2 +- .../test_gem_resolver_lock_specification.rb | 2 +- .../rubygems/test_gem_resolver_requirement_list.rb | 2 +- test/rubygems/test_gem_resolver_specification.rb | 2 +- test/rubygems/test_gem_resolver_vendor_set.rb | 2 +- .../test_gem_resolver_vendor_specification.rb | 2 +- test/rubygems/test_gem_security.rb | 2 +- test/rubygems/test_gem_security_policy.rb | 2 +- test/rubygems/test_gem_security_signer.rb | 2 +- test/rubygems/test_gem_security_trust_dir.rb | 2 +- test/rubygems/test_gem_server.rb | 2 +- test/rubygems/test_gem_silent_ui.rb | 2 +- test/rubygems/test_gem_source.rb | 2 +- test/rubygems/test_gem_source_fetch_problem.rb | 2 +- test/rubygems/test_gem_source_git.rb | 2 +- test/rubygems/test_gem_source_installed.rb | 2 +- test/rubygems/test_gem_source_list.rb | 2 +- test/rubygems/test_gem_source_local.rb | 2 +- test/rubygems/test_gem_source_lock.rb | 2 +- test/rubygems/test_gem_source_specific_file.rb | 2 +- test/rubygems/test_gem_source_subpath_problem.rb | 2 +- test/rubygems/test_gem_source_vendor.rb | 2 +- test/rubygems/test_gem_spec_fetcher.rb | 2 +- test/rubygems/test_gem_specification.rb | 2 +- test/rubygems/test_gem_stream_ui.rb | 2 +- test/rubygems/test_gem_stub_specification.rb | 2 +- test/rubygems/test_gem_text.rb | 2 +- .../test_gem_unsatisfiable_dependency_error.rb | 2 +- test/rubygems/test_gem_uri_formatter.rb | 2 +- test/rubygems/test_gem_util.rb | 2 +- test/rubygems/test_gem_validator.rb | 2 +- test/rubygems/test_gem_version.rb | 2 +- test/rubygems/test_gem_version_option.rb | 2 +- test/rubygems/test_kernel.rb | 2 +- test/rubygems/test_project_sanity.rb | 2 +- test/rubygems/test_remote_fetch_error.rb | 2 +- test/rubygems/test_require.rb | 2 +- test/rubygems/test_utilities.rb | 372 ----- test/rubygems/utilities.rb | 371 +++++ 130 files changed, 2096 insertions(+), 2097 deletions(-) create mode 100644 test/rubygems/helper.rb delete mode 100644 test/rubygems/test_case.rb delete mode 100644 test/rubygems/test_utilities.rb create mode 100644 test/rubygems/utilities.rb diff --git a/test/rubygems/helper.rb b/test/rubygems/helper.rb new file mode 100644 index 0000000..2a37e38 --- /dev/null +++ b/test/rubygems/helper.rb @@ -0,0 +1,1599 @@ https://github.com/ruby/ruby/blob/trunk/test/rubygems/helper.rb#L1 +# frozen_string_literal: true + +require 'rubygems' + +# If bundler gemspec exists, add to stubs +bundler_gemspec = File.expand_path("../../../bundler/bundler.gemspec", __FILE__) +if File.exist?(bundler_gemspec) + Gem::Specification.dirs.unshift File.dirname(bundler_gemspec) + Gem::Specification. (... truncated) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/