diff options
Diffstat (limited to 'test/rubygems')
135 files changed, 0 insertions, 306 deletions
diff --git a/test/rubygems/plugin/load/rubygems_plugin.rb b/test/rubygems/plugin/load/rubygems_plugin.rb index 85a6851ace..7cc6bef90b 100644 --- a/test/rubygems/plugin/load/rubygems_plugin.rb +++ b/test/rubygems/plugin/load/rubygems_plugin.rb @@ -1,6 +1,4 @@ # frozen_string_literal: true class TestGem - TEST_PLUGIN_LOAD = :loaded - end diff --git a/test/rubygems/rubygems/commands/crash_command.rb b/test/rubygems/rubygems/commands/crash_command.rb index a27a79f8dc..9155360e76 100644 --- a/test/rubygems/rubygems/commands/crash_command.rb +++ b/test/rubygems/rubygems/commands/crash_command.rb @@ -1,6 +1,4 @@ # frozen_string_literal: true class Gem::Commands::CrashCommand < Gem::Command - raise "crash" - end diff --git a/test/rubygems/rubygems_plugin.rb b/test/rubygems/rubygems_plugin.rb index 7fac2ebec6..2dc7836904 100644 --- a/test/rubygems/rubygems_plugin.rb +++ b/test/rubygems/rubygems_plugin.rb @@ -11,7 +11,6 @@ module Gem::Commands end class Gem::Commands::InterruptCommand < Gem::Command - def initialize super('interrupt', 'Raises an Interrupt Exception', {}) end @@ -19,7 +18,6 @@ class Gem::Commands::InterruptCommand < Gem::Command def execute raise Interrupt, "Interrupt exception" end - end Gem::CommandManager.instance.register_command :interrupt diff --git a/test/rubygems/test_bundled_ca.rb b/test/rubygems/test_bundled_ca.rb index e6761dd197..31fa159e9d 100644 --- a/test/rubygems/test_bundled_ca.rb +++ b/test/rubygems/test_bundled_ca.rb @@ -10,7 +10,6 @@ require 'rubygems/request' if ENV["CI"] || ENV["TEST_SSL"] class TestBundledCA < Gem::TestCase - THIS_FILE = File.expand_path __FILE__ def bundled_certificate_store @@ -54,6 +53,5 @@ if ENV["CI"] || ENV["TEST_SSL"] def test_accessing_new_index assert_https('fastly.rubygems.org') end - end end diff --git a/test/rubygems/test_config.rb b/test/rubygems/test_config.rb index 70fc4e23f0..015e2b1d8a 100644 --- a/test/rubygems/test_config.rb +++ b/test/rubygems/test_config.rb @@ -4,7 +4,6 @@ require 'rubygems' require 'shellwords' class TestConfig < Gem::TestCase - def test_datadir util_make_gems spec = Gem::Specification.find_by_name("a") @@ -25,5 +24,4 @@ class TestConfig < Gem::TestCase assert_equal(Gem.ruby, ruby) assert_match(/\/bad_rake.rb\z/, rake) end - end diff --git a/test/rubygems/test_deprecate.rb b/test/rubygems/test_deprecate.rb index 84b1efbe41..5f8eef76cb 100644 --- a/test/rubygems/test_deprecate.rb +++ b/test/rubygems/test_deprecate.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/deprecate' class TestDeprecate < Gem::TestCase - def setup super @@ -41,7 +40,6 @@ class TestDeprecate < Gem::TestCase end class Thing - extend Gem::Deprecate attr_accessor :message def foo @@ -51,11 +49,9 @@ class TestDeprecate < Gem::TestCase @message = "bar" end rubygems_deprecate :foo, :bar - end class OtherThing - extend Gem::Deprecate attr_accessor :message def foo @@ -65,7 +61,6 @@ class TestDeprecate < Gem::TestCase @message = "bar" end deprecate :foo, :bar, 2099, 3 - end def test_deprecated_method_calls_the_old_method @@ -115,5 +110,4 @@ class TestDeprecate < Gem::TestCase assert_match(/Thing#foo is deprecated; use bar instead\./, err) assert_match(/on or after 2099-03-01/, err) end - end diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb index aef00cd761..cf5c9720b4 100644 --- a/test/rubygems/test_gem.rb +++ b/test/rubygems/test_gem.rb @@ -8,7 +8,6 @@ require 'tmpdir' require 'rbconfig' class TestGem < Gem::TestCase - PLUGINS_LOADED = [] # rubocop:disable Style/MutableConstant PROJECT_DIR = File.expand_path('../../..', __FILE__).tap(&Gem::UNTAINT) @@ -2033,5 +2032,4 @@ You may need to `gem install -g` to install missing gems def util_cache_dir File.join Gem.dir, "cache" end - end diff --git a/test/rubygems/test_gem_available_set.rb b/test/rubygems/test_gem_available_set.rb index e48b5bbde4..dd2816acc6 100644 --- a/test/rubygems/test_gem_available_set.rb +++ b/test/rubygems/test_gem_available_set.rb @@ -4,7 +4,6 @@ require 'rubygems/available_set' require 'rubygems/security' class TestGemAvailableSet < Gem::TestCase - def setup super @@ -127,5 +126,4 @@ class TestGemAvailableSet < Gem::TestCase assert_equal [a3a, a2, a2a, a1, a1a], g end - end diff --git a/test/rubygems/test_gem_bundler_version_finder.rb b/test/rubygems/test_gem_bundler_version_finder.rb index 7fbbcc4f8a..4372356db8 100644 --- a/test/rubygems/test_gem_bundler_version_finder.rb +++ b/test/rubygems/test_gem_bundler_version_finder.rb @@ -2,7 +2,6 @@ require 'rubygems/test_case' class TestGemBundlerVersionFinder < Gem::TestCase - def setup super @@ -146,5 +145,4 @@ class TestGemBundlerVersionFinder < Gem::TestCase bvf.filter!(specs) specs end - end diff --git a/test/rubygems/test_gem_command.rb b/test/rubygems/test_gem_command.rb index bb31d9c278..2f87d9cc8d 100644 --- a/test/rubygems/test_gem_command.rb +++ b/test/rubygems/test_gem_command.rb @@ -3,13 +3,10 @@ require 'rubygems/test_case' require 'rubygems/command' class Gem::Command - public :parser - end class TestGemCommand < Gem::TestCase - def setup super @@ -388,5 +385,4 @@ ERROR: Possible alternatives: non_existent_with_hint assert_equal expected, @ui.error end - end diff --git a/test/rubygems/test_gem_command_manager.rb b/test/rubygems/test_gem_command_manager.rb index 867592a7f4..d4471b0b63 100644 --- a/test/rubygems/test_gem_command_manager.rb +++ b/test/rubygems/test_gem_command_manager.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/command_manager' class TestGemCommandManager < Gem::TestCase - PROJECT_DIR = File.expand_path('../../..', __FILE__).tap(&Gem::UNTAINT) def setup @@ -300,5 +299,4 @@ class TestGemCommandManager < Gem::TestCase ensure Gem::Commands.send(:remove_const, :FooCommand) end - end diff --git a/test/rubygems/test_gem_commands_build_command.rb b/test/rubygems/test_gem_commands_build_command.rb index ac5d2ddd16..8fbaa9469a 100644 --- a/test/rubygems/test_gem_commands_build_command.rb +++ b/test/rubygems/test_gem_commands_build_command.rb @@ -5,7 +5,6 @@ require 'rubygems/commands/build_command' require 'rubygems/package' class TestGemCommandsBuildCommand < Gem::TestCase - CERT_FILE = cert_path 'public3072' SIGNING_KEY = key_path 'private3072' @@ -510,5 +509,4 @@ class TestGemCommandsBuildCommand < Gem::TestCase ensure ENV["SOURCE_DATE_EPOCH"] = epoch end - end diff --git a/test/rubygems/test_gem_commands_cert_command.rb b/test/rubygems/test_gem_commands_cert_command.rb index d149f768ef..c4693b07cf 100644 --- a/test/rubygems/test_gem_commands_cert_command.rb +++ b/test/rubygems/test_gem_commands_cert_command.rb @@ -11,7 +11,6 @@ if Gem.java_platform? end class TestGemCommandsCertCommand < Gem::TestCase - ALTERNATE_CERT = load_cert 'alternate' EXPIRED_PUBLIC_CERT = load_cert 'expired' @@ -806,5 +805,4 @@ ERROR: --private-key not specified and ~/.gem/gem-private_key.pem does not exis assert_equal "invalid argument: --sign #{nonexistent}: does not exist", e.message end - end if defined?(OpenSSL::SSL) && !Gem.java_platform? diff --git a/test/rubygems/test_gem_commands_check_command.rb b/test/rubygems/test_gem_commands_check_command.rb index 6a6033d35d..c922e40eab 100644 --- a/test/rubygems/test_gem_commands_check_command.rb +++ b/test/rubygems/test_gem_commands_check_command.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/commands/check_command' class TestGemCommandsCheckCommand < Gem::TestCase - def setup super @@ -65,5 +64,4 @@ class TestGemCommandsCheckCommand < Gem::TestCase refute_path_exists b.gem_dir refute_path_exists b.spec_file end - end diff --git a/test/rubygems/test_gem_commands_cleanup_command.rb b/test/rubygems/test_gem_commands_cleanup_command.rb index 2f1591674c..087d84710f 100644 --- a/test/rubygems/test_gem_commands_cleanup_command.rb +++ b/test/rubygems/test_gem_commands_cleanup_command.rb @@ -4,7 +4,6 @@ require 'rubygems/commands/cleanup_command' require 'rubygems/installer' class TestGemCommandsCleanupCommand < Gem::TestCase - def setup super @@ -278,5 +277,4 @@ class TestGemCommandsCleanupCommand < Gem::TestCase assert_path_exists d_1.gem_dir assert_path_exists d_2.gem_dir end - end diff --git a/test/rubygems/test_gem_commands_contents_command.rb b/test/rubygems/test_gem_commands_contents_command.rb index 00b49d04a7..07b0e0f340 100644 --- a/test/rubygems/test_gem_commands_contents_command.rb +++ b/test/rubygems/test_gem_commands_contents_command.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/commands/contents_command' class TestGemCommandsContentsCommand < Gem::TestCase - def setup super @@ -268,5 +267,4 @@ lib/foo.rb assert_equal Gem::Requirement.new('0.0.2'), @cmd.options[:version] assert @cmd.options[:show_install_dir] end - end diff --git a/test/rubygems/test_gem_commands_dependency_command.rb b/test/rubygems/test_gem_commands_dependency_command.rb index eaa9594163..11d7f8017a 100644 --- a/test/rubygems/test_gem_commands_dependency_command.rb +++ b/test/rubygems/test_gem_commands_dependency_command.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/commands/dependency_command' class TestGemCommandsDependencyCommand < Gem::TestCase - def setup super @stub_ui = Gem::MockGemUi.new @@ -225,5 +224,4 @@ ERROR: Only reverse dependencies for local gems are supported. assert_equal "Gem a-2.a\n\n", @stub_ui.output assert_equal '', @stub_ui.error end - end diff --git a/test/rubygems/test_gem_commands_environment_command.rb b/test/rubygems/test_gem_commands_environment_command.rb index 12ec8dd6b2..a3edeb69bd 100644 --- a/test/rubygems/test_gem_commands_environment_command.rb +++ b/test/rubygems/test_gem_commands_environment_command.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/commands/environment_command' class TestGemCommandsEnvironmentCommand < Gem::TestCase - def setup super @@ -141,5 +140,4 @@ class TestGemCommandsEnvironmentCommand < Gem::TestCase assert_equal "#{Gem.platforms.join File::PATH_SEPARATOR}\n", @ui.output assert_equal '', @ui.error end - end diff --git a/test/rubygems/test_gem_commands_fetch_command.rb b/test/rubygems/test_gem_commands_fetch_command.rb index 9989f57bd7..dfe0d91726 100644 --- a/test/rubygems/test_gem_commands_fetch_command.rb +++ b/test/rubygems/test_gem_commands_fetch_command.rb @@ -5,7 +5,6 @@ require 'rubygems/security' require 'rubygems/commands/fetch_command' class TestGemCommandsFetchCommand < Gem::TestCase - def setup super @@ -122,5 +121,4 @@ class TestGemCommandsFetchCommand < Gem::TestCase assert_path_exists(File.join(@tempdir, a1.file_name), "#{a1.full_name} not fetched") end - end diff --git a/test/rubygems/test_gem_commands_generate_index_command.rb b/test/rubygems/test_gem_commands_generate_index_command.rb index 6b69bcf353..fc1317a49d 100644 --- a/test/rubygems/test_gem_commands_generate_index_command.rb +++ b/test/rubygems/test_gem_commands_generate_index_command.rb @@ -4,7 +4,6 @@ require 'rubygems/indexer' require 'rubygems/commands/generate_index_command' class TestGemCommandsGenerateIndexCommand < Gem::TestCase - def setup super @@ -78,5 +77,4 @@ class TestGemCommandsGenerateIndexCommand < Gem::TestCase "WARNING: The \"--no-modern\" option has been deprecated and will be removed in Rubygems 4.0. The `--no-modern` option is currently ignored. Modern indexes (specs, latest_specs, and prerelease_specs) are always generated.\n", @ui.error end - end diff --git a/test/rubygems/test_gem_commands_help_command.rb b/test/rubygems/test_gem_commands_help_command.rb index f2a519775c..26e22d79be 100644 --- a/test/rubygems/test_gem_commands_help_command.rb +++ b/test/rubygems/test_gem_commands_help_command.rb @@ -6,7 +6,6 @@ require "rubygems/package" require "rubygems/command_manager" class TestGemCommandsHelpCommand < Gem::TestCase - def setup super @@ -71,5 +70,4 @@ class TestGemCommandsHelpCommand < Gem::TestCase yield @ui.output, @ui.error end - end diff --git a/test/rubygems/test_gem_commands_info_command.rb b/test/rubygems/test_gem_commands_info_command.rb index 0b7458f7c5..6d67b567c7 100644 --- a/test/rubygems/test_gem_commands_info_command.rb +++ b/test/rubygems/test_gem_commands_info_command.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/commands/info_command' class TestGemCommandsInfoCommand < Gem::TestCase - def setup super @@ -41,5 +40,4 @@ class TestGemCommandsInfoCommand < Gem::TestCase assert_match %r{#{@gem.summary}\n}, @ui.output assert_match "", @ui.error end - end diff --git a/test/rubygems/test_gem_commands_install_command.rb b/test/rubygems/test_gem_commands_install_command.rb index 7706eb41eb..ccaa4ec2dc 100644 --- a/test/rubygems/test_gem_commands_install_command.rb +++ b/test/rubygems/test_gem_commands_install_command.rb @@ -5,7 +5,6 @@ require 'rubygems/request_set' require 'rubygems/rdoc' class TestGemCommandsInstallCommand < Gem::TestCase - def setup super common_installer_setup @@ -1346,5 +1345,4 @@ ERROR: Possible alternatives: non_existent_with_hint assert_equal " a-3", out.shift assert_empty out end - end diff --git a/test/rubygems/test_gem_commands_list_command.rb b/test/rubygems/test_gem_commands_list_command.rb index a44ccb4175..87da8dbd48 100644 --- a/test/rubygems/test_gem_commands_list_command.rb +++ b/test/rubygems/test_gem_commands_list_command.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/commands/list_command' class TestGemCommandsListCommand < Gem::TestCase - def setup super @@ -30,5 +29,4 @@ class TestGemCommandsListCommand < Gem::TestCase assert_equal "true\n", @ui.output assert_equal '', @ui.error end - end diff --git a/test/rubygems/test_gem_commands_lock_command.rb b/test/rubygems/test_gem_commands_lock_command.rb index a35ed081cb..3612778293 100644 --- a/test/rubygems/test_gem_commands_lock_command.rb +++ b/test/rubygems/test_gem_commands_lock_command.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/commands/lock_command' class TestGemCommandsLockCommand < Gem::TestCase - def setup super @@ -64,5 +63,4 @@ gem 'd', '= 1' assert_equal 'Could not find gem c-1, try using the full name', e.message end - end diff --git a/test/rubygems/test_gem_commands_mirror.rb b/test/rubygems/test_gem_commands_mirror.rb index 9d3d7169f1..6b2b7d11bb 100644 --- a/test/rubygems/test_gem_commands_mirror.rb +++ b/test/rubygems/test_gem_commands_mirror.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/commands/mirror_command' class TestGemCommandsMirrorCommand < Gem::TestCase - def setup super @@ -17,5 +16,4 @@ class TestGemCommandsMirrorCommand < Gem::TestCase assert_match %r{Install the rubygems-mirror}i, @ui.error end - end diff --git a/test/rubygems/test_gem_commands_open_command.rb b/test/rubygems/test_gem_commands_open_command.rb index 3c9a26a549..d3c665217f 100644 --- a/test/rubygems/test_gem_commands_open_command.rb +++ b/test/rubygems/test_gem_commands_open_command.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/commands/open_command' class TestGemCommandsOpenCommand < Gem::TestCase - def setup super @@ -96,5 +95,4 @@ class TestGemCommandsOpenCommand < Gem::TestCase assert_match %r{'foo' is a default gem and can't be opened\.} , @ui.output assert_equal "", @ui.error end - end diff --git a/test/rubygems/test_gem_commands_outdated_command.rb b/test/rubygems/test_gem_commands_outdated_command.rb index 3c37e22a09..57939b8088 100644 --- a/test/rubygems/test_gem_commands_outdated_command.rb +++ b/test/rubygems/test_gem_commands_outdated_command.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/commands/outdated_command' class TestGemCommandsOutdatedCommand < Gem::TestCase - def setup super @@ -29,5 +28,4 @@ class TestGemCommandsOutdatedCommand < Gem::TestCase assert_equal "foo (0.2 < 2.0)\n", @ui.output assert_equal "", @ui.error end - end diff --git a/test/rubygems/test_gem_commands_owner_command.rb b/test/rubygems/test_gem_commands_owner_command.rb index b830916fbe..1602ae6839 100644 --- a/test/rubygems/test_gem_commands_owner_command.rb +++ b/test/rubygems/test_gem_commands_owner_command.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/commands/owner_command' class TestGemCommandsOwnerCommand < Gem::TestCase - def setup super @@ -276,5 +275,4 @@ EOF assert_match 'Code: ', @otp_ui.output assert_equal '111111', @stub_fetcher.last_request['OTP'] end - end diff --git a/test/rubygems/test_gem_commands_pristine_command.rb b/test/rubygems/test_gem_commands_pristine_command.rb index 11344bb6b6..75243e5fa2 100644 --- a/test/rubygems/test_gem_commands_pristine_command.rb +++ b/test/rubygems/test_gem_commands_pristine_command.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/commands/pristine_command' class TestGemCommandsPristineCommand < Gem::TestCase - def setup super common_installer_setup @@ -656,5 +655,4 @@ class TestGemCommandsPristineCommand < Gem::TestCase assert @cmd.options[:extensions] assert @cmd.options[:extensions_set] end - end diff --git a/test/rubygems/test_gem_commands_push_command.rb b/test/rubygems/test_gem_commands_push_command.rb index 30bc589f92..c23760a8ca 100644 --- a/test/rubygems/test_gem_commands_push_command.rb +++ b/test/rubygems/test_gem_commands_push_command.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/commands/push_command' class TestGemCommandsPushCommand < Gem::TestCase - def setup super @@ -410,5 +409,4 @@ class TestGemCommandsPushCommand < Gem::TestCase def singleton_gem_class class << Gem; self; end end - end diff --git a/test/rubygems/test_gem_commands_query_command.rb b/test/rubygems/test_gem_commands_query_command.rb index d306abe295..f2f70a10ff 100644 --- a/test/rubygems/test_gem_commands_query_command.rb +++ b/test/rubygems/test_gem_commands_query_command.rb @@ -19,7 +19,6 @@ module TestGemCommandsQueryCommandSetup end class TestGemCommandsQueryCommandWithInstalledGems < Gem::TestCase - include TestGemCommandsQueryCommandSetup def test_execute @@ -607,11 +606,9 @@ pl (1 i386-linux) fetcher.spec 'a', '3.a' end end - end class TestGemCommandsQueryCommandWithoutInstalledGems < Gem::TestCase - include TestGemCommandsQueryCommandSetup def test_execute_platform @@ -857,5 +854,4 @@ othergem (1.2.3) fetcher.download 'a', '3.a' end end - end diff --git a/test/rubygems/test_gem_commands_search_command.rb b/test/rubygems/test_gem_commands_search_command.rb index 9187050c30..17693e6837 100644 --- a/test/rubygems/test_gem_commands_search_command.rb +++ b/test/rubygems/test_gem_commands_search_command.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/commands/search_command' class TestGemCommandsSearchCommand < Gem::TestCase - def setup super @@ -13,5 +12,4 @@ class TestGemCommandsSearchCommand < Gem::TestCase def test_initialize assert_equal :remote, @cmd.defaults[:domain] end - end diff --git a/test/rubygems/test_gem_commands_server_command.rb b/test/rubygems/test_gem_commands_server_command.rb index af15aadfd1..89bdce05cd 100644 --- a/test/rubygems/test_gem_commands_server_command.rb +++ b/test/rubygems/test_gem_commands_server_command.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/commands/server_command' class TestGemCommandsServerCommand < Gem::TestCase - def setup super @@ -59,5 +58,4 @@ class TestGemCommandsServerCommand < Gem::TestCase assert_equal 'invalid argument: -p 65536: not a port number', e.message end - end diff --git a/test/rubygems/test_gem_commands_setup_command.rb b/test/rubygems/test_gem_commands_setup_command.rb index ba774ba813..c3c6644140 100644 --- a/test/rubygems/test_gem_commands_setup_command.rb +++ b/test/rubygems/test_gem_commands_setup_command.rb @@ -4,7 +4,6 @@ require 'rubygems/test_case' require 'rubygems/commands/setup_command' class TestGemCommandsSetupCommand < Gem::TestCase - bundler_gemspec = File.expand_path("../../../bundler/lib/bundler/version.rb", __FILE__) if File.exist?(bundler_gemspec) BUNDLER_VERS = File.read(bundler_gemspec).match(/VERSION = "(#{Gem::Version::VERSION_PATTERN})"/)[1] @@ -420,5 +419,4 @@ class TestGemCommandsSetupCommand < Gem::TestCase bundle_exec = sprintf Gem.default_exec_format, 'bundle' File.join @install_dir, 'bin', bundle_exec end - end unless Gem.java_platform? diff --git a/test/rubygems/test_gem_commands_signin_command.rb b/test/rubygems/test_gem_commands_signin_command.rb index 258dc494e4..21d19fffc9 100644 --- a/test/rubygems/test_gem_commands_signin_command.rb +++ b/test/rubygems/test_gem_commands_signin_command.rb @@ -4,7 +4,6 @@ require 'rubygems/commands/signin_command' require 'rubygems/installer' class TestGemCommandsSigninCommand < Gem::TestCase - def setup super @@ -97,5 +96,4 @@ class TestGemCommandsSigninCommand < Gem::TestCase sign_in_ui end - end diff --git a/test/rubygems/test_gem_commands_signout_command.rb b/test/rubygems/test_gem_commands_signout_command.rb index 2674351fd3..20389d0537 100644 --- a/test/rubygems/test_gem_commands_signout_command.rb +++ b/test/rubygems/test_gem_commands_signout_command.rb @@ -5,7 +5,6 @@ require 'rubygems/commands/signout_command' require 'rubygems/installer' class TestGemCommandsSignoutCommand < Gem::TestCase - def setup super @cmd = Gem::Commands::SignoutCommand.new @@ -28,5 +27,4 @@ class TestGemCommandsSignoutCommand < Gem::TestCase assert_match %r{You are not currently signed in}, @sign_out_ui.error end - end diff --git a/test/rubygems/test_gem_commands_sources_command.rb b/test/rubygems/test_gem_commands_sources_command.rb index 3a0899245b..ff00b9aa23 100644 --- a/test/rubygems/test_gem_commands_sources_command.rb +++ b/test/rubygems/test_gem_commands_sources_command.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/commands/sources_command' class TestGemCommandsSourcesCommand < Gem::TestCase - def setup super @@ -422,5 +421,4 @@ beta-gems.example.com is not a URI assert_equal "source cache successfully updated\n", @ui.output assert_equal '', @ui.error end - end diff --git a/test/rubygems/test_gem_commands_specification_command.rb b/test/rubygems/test_gem_commands_specification_command.rb index cb66868568..e055246cdc 100644 --- a/test/rubygems/test_gem_commands_specification_command.rb +++ b/test/rubygems/test_gem_commands_specification_command.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/commands/specification_command' class TestGemCommandsSpecificationCommand < Gem::TestCase - def setup super @@ -246,5 +245,4 @@ class TestGemCommandsSpecificationCommand < Gem::TestCase assert_match %r{s.name = "foo"}, @ui.output assert_equal '', @ui.error end - end diff --git a/test/rubygems/test_gem_commands_stale_command.rb b/test/rubygems/test_gem_commands_stale_command.rb index a8909c6d13..0aa7f243e2 100644 --- a/test/rubygems/test_gem_commands_stale_command.rb +++ b/test/rubygems/test_gem_commands_stale_command.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/commands/stale_command' class TestGemCommandsStaleCommand < Gem::TestCase - def setup super @stub_ui = Gem::MockGemUi.new @@ -40,5 +39,4 @@ class TestGemCommandsStaleCommand < Gem::TestCase assert_equal("#{foo_bar.name}-#{foo_bar.version}", lines[0].split.first) assert_equal("#{bar_baz.name}-#{bar_baz.version}", lines[1].split.first) end - end diff --git a/test/rubygems/test_gem_commands_uninstall_command.rb b/test/rubygems/test_gem_commands_uninstall_command.rb index ee63847c84..03ce600cc4 100644 --- a/test/rubygems/test_gem_commands_uninstall_command.rb +++ b/test/rubygems/test_gem_commands_uninstall_command.rb @@ -3,7 +3,6 @@ require 'rubygems/installer_test_case' require 'rubygems/commands/uninstall_command' class TestGemCommandsUninstallCommand < Gem::InstallerTestCase - def setup super @cmd = Gem::Commands::UninstallCommand.new @@ -502,5 +501,4 @@ WARNING: Use your OS package manager to uninstall vendor gems end end end - end diff --git a/test/rubygems/test_gem_commands_unpack_command.rb b/test/rubygems/test_gem_commands_unpack_command.rb index 7d96caaf57..e1fea0f0ff 100644 --- a/test/rubygems/test_gem_commands_unpack_command.rb +++ b/test/rubygems/test_gem_commands_unpack_command.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/commands/unpack_command' class TestGemCommandsUnpackCommand < Gem::TestCase - def setup super @@ -221,5 +220,4 @@ class TestGemCommandsUnpackCommand < Gem::TestCase assert @cmd.options[:spec] end - end diff --git a/test/rubygems/test_gem_commands_update_command.rb b/test/rubygems/test_gem_commands_update_command.rb index bd06c84107..65a70b2b74 100644 --- a/test/rubygems/test_gem_commands_update_command.rb +++ b/test/rubygems/test_gem_commands_update_command.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/commands/update_command' class TestGemCommandsUpdateCommand < Gem::TestCase - def setup super common_installer_setup @@ -647,5 +646,4 @@ class TestGemCommandsUpdateCommand < Gem::TestCase assert_equal " a-2", out.shift assert_empty out end - end diff --git a/test/rubygems/test_gem_commands_which_command.rb b/test/rubygems/test_gem_commands_which_command.rb index 3d66c0150c..b67bf040d4 100644 --- a/test/rubygems/test_gem_commands_which_command.rb +++ b/test/rubygems/test_gem_commands_which_command.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/commands/which_command' class TestGemCommandsWhichCommand < Gem::TestCase - def setup super Gem::Specification.reset @@ -82,5 +81,4 @@ class TestGemCommandsWhichCommand < Gem::TestCase FileUtils.touch filename end end - end diff --git a/test/rubygems/test_gem_commands_yank_command.rb b/test/rubygems/test_gem_commands_yank_command.rb index e84c7eaadd..8e453dfabf 100644 --- a/test/rubygems/test_gem_commands_yank_command.rb +++ b/test/rubygems/test_gem_commands_yank_command.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/commands/yank_command' class TestGemCommandsYankCommand < Gem::TestCase - def setup super @@ -148,5 +147,4 @@ class TestGemCommandsYankCommand < Gem::TestCase 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 c79563d650..ddc35a9594 100644 --- a/test/rubygems/test_gem_config_file.rb +++ b/test/rubygems/test_gem_config_file.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/config_file' class TestGemConfigFile < Gem::TestCase - def setup super @@ -492,5 +491,4 @@ if you believe they were disclosed to a third party. util_config_file assert_equal(true, @cfg.disable_default_gem_server) end - end diff --git a/test/rubygems/test_gem_dependency.rb b/test/rubygems/test_gem_dependency.rb index 0caab10d32..7ddeafedce 100644 --- a/test/rubygems/test_gem_dependency.rb +++ b/test/rubygems/test_gem_dependency.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/dependency' class TestGemDependency < Gem::TestCase - def test_initialize d = dep "pkg", "> 1.0" @@ -391,5 +390,4 @@ class TestGemDependency < Gem::TestCase assert_equal dep("a", " >= 1.a").identity, :abs_latest assert_equal dep("a").identity, :latest end - end diff --git a/test/rubygems/test_gem_dependency_installer.rb b/test/rubygems/test_gem_dependency_installer.rb index 91d7a47189..7912e00fa6 100644 --- a/test/rubygems/test_gem_dependency_installer.rb +++ b/test/rubygems/test_gem_dependency_installer.rb @@ -4,7 +4,6 @@ require 'rubygems/dependency_installer' require 'rubygems/security' class TestGemDependencyInstaller < Gem::TestCase - def setup super common_installer_setup @@ -1128,5 +1127,4 @@ class TestGemDependencyInstaller < Gem::TestCase @d1, @d2, @x1_m, @x1_o, @w1, @y1, @y1_1_p, @z1].compact) end - end diff --git a/test/rubygems/test_gem_dependency_list.rb b/test/rubygems/test_gem_dependency_list.rb index 1263f2f965..d8ef3d4f0e 100644 --- a/test/rubygems/test_gem_dependency_list.rb +++ b/test/rubygems/test_gem_dependency_list.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/dependency_list' class TestGemDependencyList < Gem::TestCase - def setup super @@ -262,5 +261,4 @@ class TestGemDependencyList < Gem::TestCase @deplist.add @a1, @a2, @b1, @c2, @d1 end - end diff --git a/test/rubygems/test_gem_dependency_resolution_error.rb b/test/rubygems/test_gem_dependency_resolution_error.rb index 57e6191d87..5321f7031c 100644 --- a/test/rubygems/test_gem_dependency_resolution_error.rb +++ b/test/rubygems/test_gem_dependency_resolution_error.rb @@ -2,7 +2,6 @@ require 'rubygems/test_case' class TestGemDependencyResolutionError < Gem::TestCase - def setup super @@ -24,5 +23,4 @@ class TestGemDependencyResolutionError < Gem::TestCase assert_match %r{^conflicting dependencies a \(= 1\) and a \(= 2\)$}, @error.message end - end diff --git a/test/rubygems/test_gem_doctor.rb b/test/rubygems/test_gem_doctor.rb index 8ca4798c93..1cef52234e 100644 --- a/test/rubygems/test_gem_doctor.rb +++ b/test/rubygems/test_gem_doctor.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/doctor' class TestGemDoctor < Gem::TestCase - def gem(name) spec = quick_gem name do |gem| gem.files = %W[lib/#{name}.rb Rakefile] @@ -192,5 +191,4 @@ Removed file plugins/a_badly_named_file.rb assert doctor.gem_repository?, 'gems installed' end - end diff --git a/test/rubygems/test_gem_ext_builder.rb b/test/rubygems/test_gem_ext_builder.rb index d690569040..f03b009c57 100644 --- a/test/rubygems/test_gem_ext_builder.rb +++ b/test/rubygems/test_gem_ext_builder.rb @@ -4,7 +4,6 @@ require 'rubygems/ext' require 'rubygems/installer' class TestGemExtBuilder < Gem::TestCase - def setup super @@ -134,7 +133,6 @@ install: def test_build_extensions_install_ext_only class << Gem - alias orig_install_extension_in_lib install_extension_in_lib remove_method :install_extension_in_lib @@ -142,7 +140,6 @@ install: def Gem.install_extension_in_lib false end - end @spec.extensions << 'ext/extconf.rb' @@ -179,11 +176,9 @@ install: refute_path_exists File.join @spec.gem_dir, 'lib', 'a', 'b.rb' ensure class << Gem - remove_method :install_extension_in_lib alias install_extension_in_lib orig_install_extension_in_lib - end end @@ -317,5 +312,4 @@ install: assert_equal %w[--with-foo-dir=/nonexistent], builder.build_args end - end unless Gem.java_platform? diff --git a/test/rubygems/test_gem_ext_cmake_builder.rb b/test/rubygems/test_gem_ext_cmake_builder.rb index b3f9241a96..60a1fa13f6 100644 --- a/test/rubygems/test_gem_ext_cmake_builder.rb +++ b/test/rubygems/test_gem_ext_cmake_builder.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/ext' class TestGemExtCmakeBuilder < Gem::TestCase - def setup super @@ -87,5 +86,4 @@ install (FILES test.txt DESTINATION bin) assert_contains_make_command '', output assert_contains_make_command 'install', output end - end diff --git a/test/rubygems/test_gem_ext_configure_builder.rb b/test/rubygems/test_gem_ext_configure_builder.rb index ac8a861e17..7d7f3759ea 100644 --- a/test/rubygems/test_gem_ext_configure_builder.rb +++ b/test/rubygems/test_gem_ext_configure_builder.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/ext' class TestGemExtConfigureBuilder < Gem::TestCase - def setup super @@ -83,5 +82,4 @@ class TestGemExtConfigureBuilder < Gem::TestCase assert_contains_make_command '', output[4] assert_contains_make_command 'install', output[7] end - end diff --git a/test/rubygems/test_gem_ext_ext_conf_builder.rb b/test/rubygems/test_gem_ext_ext_conf_builder.rb index 6eb7b67c2b..05ac538ec2 100644 --- a/test/rubygems/test_gem_ext_ext_conf_builder.rb +++ b/test/rubygems/test_gem_ext_ext_conf_builder.rb @@ -4,7 +4,6 @@ require 'rubygems/test_case' require 'rubygems/ext' class TestGemExtExtConfBuilder < Gem::TestCase - def setup super @@ -240,5 +239,4 @@ end RbConfig::CONFIG.delete 'configure_args' end end - end diff --git a/test/rubygems/test_gem_ext_rake_builder.rb b/test/rubygems/test_gem_ext_rake_builder.rb index 9d789174ce..a13b09c98b 100644 --- a/test/rubygems/test_gem_ext_rake_builder.rb +++ b/test/rubygems/test_gem_ext_rake_builder.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/ext' class TestGemExtRakeBuilder < Gem::TestCase - def setup super @@ -91,5 +90,4 @@ class TestGemExtRakeBuilder < Gem::TestCase EO_MKRF end end - end diff --git a/test/rubygems/test_gem_gem_runner.rb b/test/rubygems/test_gem_gem_runner.rb index 81e191edb0..a2b145e7df 100644 --- a/test/rubygems/test_gem_gem_runner.rb +++ b/test/rubygems/test_gem_gem_runner.rb @@ -2,7 +2,6 @@ require 'rubygems/test_case' class TestGemGemRunner < Gem::TestCase - def setup super @@ -108,5 +107,4 @@ class TestGemGemRunner < Gem::TestCase assert_empty @ui.error end - end diff --git a/test/rubygems/test_gem_gemcutter_utilities.rb b/test/rubygems/test_gem_gemcutter_utilities.rb index 1d7ecf14b1..48f6b09715 100644 --- a/test/rubygems/test_gem_gemcutter_utilities.rb +++ b/test/rubygems/test_gem_gemcutter_utilities.rb @@ -5,7 +5,6 @@ require 'rubygems/command' require 'rubygems/gemcutter_utilities' class TestGemGemcutterUtilities < Gem::TestCase - def setup super @@ -262,5 +261,4 @@ class TestGemGemcutterUtilities < Gem::TestCase @cmd.verify_api_key :missing end end - end diff --git a/test/rubygems/test_gem_impossible_dependencies_error.rb b/test/rubygems/test_gem_impossible_dependencies_error.rb index 8a0f8d6196..e4fe6ef77c 100644 --- a/test/rubygems/test_gem_impossible_dependencies_error.rb +++ b/test/rubygems/test_gem_impossible_dependencies_error.rb @@ -2,7 +2,6 @@ require 'rubygems/test_case' class TestGemImpossibleDependenciesError < Gem::TestCase - def test_message_conflict request = dependency_request dep('net-ssh', '>= 2.0.13'), 'rye', '0.9.8' @@ -57,5 +56,4 @@ rye-0.9.8 requires net-ssh (>= 2.0.13) but it conflicted: assert_equal expected, error.message end - end diff --git a/test/rubygems/test_gem_indexer.rb b/test/rubygems/test_gem_indexer.rb index f20e3c5112..adc83dd8fb 100644 --- a/test/rubygems/test_gem_indexer.rb +++ b/test/rubygems/test_gem_indexer.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/indexer' class TestGemIndexer < Gem::TestCase - def setup super @@ -355,5 +354,4 @@ class TestGemIndexer < Gem::TestCase file = File.join dir, name refute File.exist?(file), "#{file} exists" end - end diff --git a/test/rubygems/test_gem_install_update_options.rb b/test/rubygems/test_gem_install_update_options.rb index c6b4778336..d9da22b129 100644 --- a/test/rubygems/test_gem_install_update_options.rb +++ b/test/rubygems/test_gem_install_update_options.rb @@ -5,7 +5,6 @@ require 'rubygems/command' require 'rubygems/dependency_installer' class TestGemInstallUpdateOptions < Gem::InstallerTestCase - def setup super @@ -193,5 +192,4 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase 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 63e244bf28..3cf49a7f8d 100644 --- a/test/rubygems/test_gem_installer.rb +++ b/test/rubygems/test_gem_installer.rb @@ -2,7 +2,6 @@ require 'rubygems/installer_test_case' class TestGemInstaller < Gem::InstallerTestCase - def setup super common_installer_setup @@ -2190,5 +2189,4 @@ gem 'other', version def mask 0100755 end - end diff --git a/test/rubygems/test_gem_local_remote_options.rb b/test/rubygems/test_gem_local_remote_options.rb index 6c21300c2a..93059ae731 100644 --- a/test/rubygems/test_gem_local_remote_options.rb +++ b/test/rubygems/test_gem_local_remote_options.rb @@ -4,7 +4,6 @@ require 'rubygems/local_remote_options' require 'rubygems/command' class TestGemLocalRemoteOptions < Gem::TestCase - def setup super @@ -130,5 +129,4 @@ class TestGemLocalRemoteOptions < Gem::TestCase assert_equal [@gem_repo], Gem.sources end - end diff --git a/test/rubygems/test_gem_name_tuple.rb b/test/rubygems/test_gem_name_tuple.rb index 5331e1cdbb..92cfe6c1d2 100644 --- a/test/rubygems/test_gem_name_tuple.rb +++ b/test/rubygems/test_gem_name_tuple.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/name_tuple' class TestGemNameTuple < Gem::TestCase - def test_full_name n = Gem::NameTuple.new "a", Gem::Version.new(0), "ruby" assert_equal "a-0", n.full_name @@ -40,5 +39,4 @@ class TestGemNameTuple < Gem::TestCase assert_equal 1, a_p.<=>(a) end - end diff --git a/test/rubygems/test_gem_package.rb b/test/rubygems/test_gem_package.rb index 4b49042c0a..adf11a1941 100644 --- a/test/rubygems/test_gem_package.rb +++ b/test/rubygems/test_gem_package.rb @@ -4,7 +4,6 @@ require 'rubygems/package/tar_test_case' require 'digest' class TestGemPackage < Gem::Package::TarTestCase - def setup super @@ -1162,5 +1161,4 @@ class TestGemPackage < Gem::Package::TarTestCase StringIO.new tgz_io.string end - end diff --git a/test/rubygems/test_gem_package_old.rb b/test/rubygems/test_gem_package_old.rb index d2ce59cfdd..f2b1719dc3 100644 --- a/test/rubygems/test_gem_package_old.rb +++ b/test/rubygems/test_gem_package_old.rb @@ -5,7 +5,6 @@ unless Gem.java_platform? # jruby can't require the simple_gem file require 'rubygems/simple_gem' class TestGemPackageOld < Gem::TestCase - def setup super @@ -87,6 +86,5 @@ unless Gem.java_platform? # jruby can't require the simple_gem file 'and cannot be verified', e.message end - end end diff --git a/test/rubygems/test_gem_package_tar_header.rb b/test/rubygems/test_gem_package_tar_header.rb index 3629e6b685..da4f5506e9 100644 --- a/test/rubygems/test_gem_package_tar_header.rb +++ b/test/rubygems/test_gem_package_tar_header.rb @@ -3,7 +3,6 @@ require 'rubygems/package/tar_test_case' require 'rubygems/package' class TestGemPackageTarHeader < Gem::Package::TarTestCase - def setup super @@ -223,5 +222,4 @@ Access_Points_09202018.csv assert_equal 0, tar_header.uid assert_equal 0, tar_header.gid end - end diff --git a/test/rubygems/test_gem_package_tar_reader.rb b/test/rubygems/test_gem_package_tar_reader.rb index 489685d09d..05b3ac56a6 100644 --- a/test/rubygems/test_gem_package_tar_reader.rb +++ b/test/rubygems/test_gem_package_tar_reader.rb @@ -3,7 +3,6 @@ require 'rubygems/package/tar_test_case' require 'rubygems/package' class TestGemPackageTarReader < Gem::Package::TarTestCase - def test_each_entry tar = tar_dir_header "foo", "bar", 0, Time.now tar << tar_file_header("bar", "baz", 0, 0, Time.now) @@ -85,5 +84,4 @@ class TestGemPackageTarReader < Gem::Package::TarTestCase ensure io.close! end - end diff --git a/test/rubygems/test_gem_package_tar_reader_entry.rb b/test/rubygems/test_gem_package_tar_reader_entry.rb index 87f3471678..3003e51ac8 100644 --- a/test/rubygems/test_gem_package_tar_reader_entry.rb +++ b/test/rubygems/test_gem_package_tar_reader_entry.rb @@ -3,7 +3,6 @@ require 'rubygems/package/tar_test_case' require 'rubygems/package' class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase - def setup super @@ -150,5 +149,4 @@ class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase assert_equal char, @entry.getc end - end diff --git a/test/rubygems/test_gem_package_tar_writer.rb b/test/rubygems/test_gem_package_tar_writer.rb index 5f80d1a007..9a3feca269 100644 --- a/test/rubygems/test_gem_package_tar_writer.rb +++ b/test/rubygems/test_gem_package_tar_writer.rb @@ -4,7 +4,6 @@ require 'rubygems/package/tar_writer' require 'minitest/mock' class TestGemPackageTarWriter < Gem::Package::TarTestCase - def setup super @@ -330,5 +329,4 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase end assert_includes exception.message, name end - end diff --git a/test/rubygems/test_gem_package_task.rb b/test/rubygems/test_gem_package_task.rb index 24a105171a..ee9b8d44d4 100644 --- a/test/rubygems/test_gem_package_task.rb +++ b/test/rubygems/test_gem_package_task.rb @@ -13,7 +13,6 @@ unless defined?(Rake::PackageTask) end class TestGemPackageTask < Gem::TestCase - def test_gem_package original_rake_fileutils_verbosity = RakeFileUtils.verbose_flag RakeFileUtils.verbose_flag = false @@ -115,5 +114,4 @@ class TestGemPackageTask < Gem::TestCase assert_equal 'pkg/nokogiri-1.5.0-java', pkg.package_dir_path end - end if defined?(Rake::PackageTask) diff --git a/test/rubygems/test_gem_path_support.rb b/test/rubygems/test_gem_path_support.rb index 8715bb62dc..f24041a2d8 100644 --- a/test/rubygems/test_gem_path_support.rb +++ b/test/rubygems/test_gem_path_support.rb @@ -4,7 +4,6 @@ require 'rubygems' require 'fileutils' class TestGemPathSupport < Gem::TestCase - def setup super @@ -140,5 +139,4 @@ class TestGemPathSupport < Gem::TestCase assert_equal dir, ps.home assert_equal [dir, not_existing], ps.path end - end diff --git a/test/rubygems/test_gem_platform.rb b/test/rubygems/test_gem_platform.rb index 289f078867..030033d2af 100644 --- a/test/rubygems/test_gem_platform.rb +++ b/test/rubygems/test_gem_platform.rb @@ -4,7 +4,6 @@ require 'rubygems/platform' require 'rbconfig' class TestGemPlatform < Gem::TestCase - def test_self_local util_set_arch 'i686-darwin8.10.1' @@ -305,5 +304,4 @@ class TestGemPlatform < Gem::TestCase def refute_local_match(name) refute_match Gem::Platform.local, name end - end diff --git a/test/rubygems/test_gem_rdoc.rb b/test/rubygems/test_gem_rdoc.rb index 6184d4b457..13fd4ba40b 100644 --- a/test/rubygems/test_gem_rdoc.rb +++ b/test/rubygems/test_gem_rdoc.rb @@ -4,7 +4,6 @@ require 'rubygems/test_case' require 'rubygems/rdoc' class TestGemRDoc < Gem::TestCase - Gem::RDoc.load_rdoc def setup @@ -134,5 +133,4 @@ class TestGemRDoc < Gem::TestCase FileUtils.rm_r @a.doc_dir end end - end diff --git a/test/rubygems/test_gem_remote_fetcher.rb b/test/rubygems/test_gem_remote_fetcher.rb index f7542ff406..39ece4d7e0 100644 --- a/test/rubygems/test_gem_remote_fetcher.rb +++ b/test/rubygems/test_gem_remote_fetcher.rb @@ -31,7 +31,6 @@ require 'minitest/mock' # proxy is configured. class TestGemRemoteFetcher < Gem::TestCase - include Gem::DefaultUserInteraction SERVER_DATA = <<-EOY.freeze @@ -1000,10 +999,8 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg== end class NilLog < WEBrick::Log - def log(level, data) #Do nothing end - end private @@ -1145,5 +1142,4 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg== def key(filename) OpenSSL::PKey::RSA.new(File.read(File.join(__dir__, filename))) end - end if defined?(OpenSSL::SSL) diff --git a/test/rubygems/test_gem_request.rb b/test/rubygems/test_gem_request.rb index 126bb13643..82b95b47c3 100644 --- a/test/rubygems/test_gem_request.rb +++ b/test/rubygems/test_gem_request.rb @@ -9,7 +9,6 @@ unless defined?(OpenSSL::SSL) end class TestGemRequest < Gem::TestCase - CA_CERT_FILE = cert_path 'ca' CHILD_CERT = load_cert 'child' EXPIRED_CERT = load_cert 'expired' @@ -488,7 +487,6 @@ ERROR: Certificate is an invalid CA certificate end class Conn - attr_accessor :payload def new(*args); self; end @@ -507,7 +505,5 @@ ERROR: Certificate is an invalid CA certificate self.payload = req @response end - end - end if defined?(OpenSSL::SSL) diff --git a/test/rubygems/test_gem_request_connection_pools.rb b/test/rubygems/test_gem_request_connection_pools.rb index f8d2095167..2bd2d28469 100644 --- a/test/rubygems/test_gem_request_connection_pools.rb +++ b/test/rubygems/test_gem_request_connection_pools.rb @@ -4,15 +4,12 @@ require 'rubygems/request' require 'timeout' class TestGemRequestConnectionPool < Gem::TestCase - class FakeHttp - def initialize(*args) end def start end - end def setup @@ -150,5 +147,4 @@ class TestGemRequestConnectionPool < Gem::TestCase end end.join end - end diff --git a/test/rubygems/test_gem_request_set.rb b/test/rubygems/test_gem_request_set.rb index afe1732f5e..54ae7720c0 100644 --- a/test/rubygems/test_gem_request_set.rb +++ b/test/rubygems/test_gem_request_set.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/request_set' class TestGemRequestSet < Gem::TestCase - def setup super @@ -668,5 +667,4 @@ ruby "0" assert_empty deps end - 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 ca7e53d24c..2a9663959c 100644 --- a/test/rubygems/test_gem_request_set_gem_dependency_api.rb +++ b/test/rubygems/test_gem_request_set_gem_dependency_api.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/request_set' class TestGemRequestSetGemDependencyAPI < Gem::TestCase - def setup super @@ -845,5 +844,4 @@ end assert_equal engine_version, RUBY_ENGINE_VERSION if engine end - end unless Gem.java_platform? diff --git a/test/rubygems/test_gem_request_set_lockfile.rb b/test/rubygems/test_gem_request_set_lockfile.rb index 7c5e256a2d..e7921d6b26 100644 --- a/test/rubygems/test_gem_request_set_lockfile.rb +++ b/test/rubygems/test_gem_request_set_lockfile.rb @@ -4,7 +4,6 @@ require 'rubygems/request_set' require 'rubygems/request_set/lockfile' class TestGemRequestSetLockfile < Gem::TestCase - def setup super @@ -466,5 +465,4 @@ DEPENDENCIES assert_equal 'hello', File.read(gem_deps_lock_file) end - end diff --git a/test/rubygems/test_gem_request_set_lockfile_parser.rb b/test/rubygems/test_gem_request_set_lockfile_parser.rb index f75c9b9b3e..9a42d81d0e 100644 --- a/test/rubygems/test_gem_request_set_lockfile_parser.rb +++ b/test/rubygems/test_gem_request_set_lockfile_parser.rb @@ -6,7 +6,6 @@ require 'rubygems/request_set/lockfile/tokenizer' require 'rubygems/request_set/lockfile/parser' class TestGemRequestSetLockfileParser < Gem::TestCase - def setup super @gem_deps_file = 'gem.deps.rb' @@ -541,5 +540,4 @@ DEPENDENCIES parser = tokenizer.make_parser set, platforms parser.parse end - end diff --git a/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb b/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb index b5bafe3fa4..b485b2c0b7 100644 --- a/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +++ b/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb @@ -6,7 +6,6 @@ require 'rubygems/request_set/lockfile/tokenizer' require 'rubygems/request_set/lockfile/parser' class TestGemRequestSetLockfileTokenizer < Gem::TestCase - def setup super @@ -304,5 +303,4 @@ GEM def tokenize_lockfile Gem::RequestSet::Lockfile::Tokenizer.from_file(@lock_file).to_a end - end diff --git a/test/rubygems/test_gem_requirement.rb b/test/rubygems/test_gem_requirement.rb index 18ea2a872d..55a902dc83 100644 --- a/test/rubygems/test_gem_requirement.rb +++ b/test/rubygems/test_gem_requirement.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require "rubygems/requirement" class TestGemRequirement < Gem::TestCase - def test_concat r = req '>= 1' @@ -421,5 +420,4 @@ class TestGemRequirement < Gem::TestCase refute req(requirement).satisfied_by?(v(version)), "#{requirement} is not satisfied by #{version}" end - end diff --git a/test/rubygems/test_gem_resolver.rb b/test/rubygems/test_gem_resolver.rb index 83442adb32..09feeac55b 100644 --- a/test/rubygems/test_gem_resolver.rb +++ b/test/rubygems/test_gem_resolver.rb @@ -2,7 +2,6 @@ require 'rubygems/test_case' class TestGemResolver < Gem::TestCase - def setup super @@ -789,5 +788,4 @@ class TestGemResolver < Gem::TestCase assert_match "No match for 'a (= 1)' on this platform. Found: c-p-1", e.message end - end diff --git a/test/rubygems/test_gem_resolver_activation_request.rb b/test/rubygems/test_gem_resolver_activation_request.rb index dc11ad47c4..f973c5956d 100644 --- a/test/rubygems/test_gem_resolver_activation_request.rb +++ b/test/rubygems/test_gem_resolver_activation_request.rb @@ -2,7 +2,6 @@ require 'rubygems/test_case' class TestGemResolverActivationRequest < Gem::TestCase - def setup super @@ -40,5 +39,4 @@ class TestGemResolverActivationRequest < Gem::TestCase assert @req.installed? end - end diff --git a/test/rubygems/test_gem_resolver_api_set.rb b/test/rubygems/test_gem_resolver_api_set.rb index b79e01d074..6942b8587d 100644 --- a/test/rubygems/test_gem_resolver_api_set.rb +++ b/test/rubygems/test_gem_resolver_api_set.rb @@ -2,7 +2,6 @@ require 'rubygems/test_case' class TestGemResolverAPISet < Gem::TestCase - def setup super @@ -204,5 +203,4 @@ class TestGemResolverAPISet < Gem::TestCase assert_empty set.instance_variable_get :@data end - end diff --git a/test/rubygems/test_gem_resolver_api_specification.rb b/test/rubygems/test_gem_resolver_api_specification.rb index 87ff901320..3db57677f3 100644 --- a/test/rubygems/test_gem_resolver_api_specification.rb +++ b/test/rubygems/test_gem_resolver_api_specification.rb @@ -2,7 +2,6 @@ require 'rubygems/test_case' class TestGemResolverAPISpecification < Gem::TestCase - def test_initialize set = Gem::Resolver::APISet.new data = { @@ -164,5 +163,4 @@ class TestGemResolverAPISpecification < Gem::TestCase assert_kind_of Gem::Specification, spec assert_equal 'j-1-java', spec.full_name end - end diff --git a/test/rubygems/test_gem_resolver_best_set.rb b/test/rubygems/test_gem_resolver_best_set.rb index 34c2c76d64..8218bf5d70 100644 --- a/test/rubygems/test_gem_resolver_best_set.rb +++ b/test/rubygems/test_gem_resolver_best_set.rb @@ -2,7 +2,6 @@ require 'rubygems/test_case' class TestGemResolverBestSet < Gem::TestCase - def setup super @@ -133,5 +132,4 @@ class TestGemResolverBestSet < Gem::TestCase assert_equal error, e end - end diff --git a/test/rubygems/test_gem_resolver_composed_set.rb b/test/rubygems/test_gem_resolver_composed_set.rb index 0e745433a9..7c8ae004a3 100644 --- a/test/rubygems/test_gem_resolver_composed_set.rb +++ b/test/rubygems/test_gem_resolver_composed_set.rb @@ -2,7 +2,6 @@ require 'rubygems/test_case' class TestGemResolverComposedSet < Gem::TestCase - def test_errors index_set = Gem::Resolver::IndexSet.new current_set = Gem::Resolver::CurrentSet.new @@ -41,5 +40,4 @@ class TestGemResolverComposedSet < Gem::TestCase refute best_set.remote? refute current_set.remote? end - end diff --git a/test/rubygems/test_gem_resolver_conflict.rb b/test/rubygems/test_gem_resolver_conflict.rb index 2385c3eee9..5a3ed80670 100644 --- a/test/rubygems/test_gem_resolver_conflict.rb +++ b/test/rubygems/test_gem_resolver_conflict.rb @@ -2,7 +2,6 @@ require 'rubygems/test_case' class TestGemResolverConflict < Gem::TestCase - def test_explanation root = dependency_request dep('net-ssh', '>= 2.0.13'), 'rye', '0.9.8' @@ -79,5 +78,4 @@ class TestGemResolverConflict < Gem::TestCase assert_equal expected, conflict.request_path(child.requester) end - end diff --git a/test/rubygems/test_gem_resolver_dependency_request.rb b/test/rubygems/test_gem_resolver_dependency_request.rb index 51f0be9dcd..a8ddc8362b 100644 --- a/test/rubygems/test_gem_resolver_dependency_request.rb +++ b/test/rubygems/test_gem_resolver_dependency_request.rb @@ -2,7 +2,6 @@ require 'rubygems/test_case' class TestGemResolverDependencyRequest < Gem::TestCase - def setup super @@ -80,5 +79,4 @@ class TestGemResolverDependencyRequest < Gem::TestCase assert_equal dependency, dr.dependency end - end diff --git a/test/rubygems/test_gem_resolver_git_set.rb b/test/rubygems/test_gem_resolver_git_set.rb index f38859c8b4..6d048b3772 100644 --- a/test/rubygems/test_gem_resolver_git_set.rb +++ b/test/rubygems/test_gem_resolver_git_set.rb @@ -2,7 +2,6 @@ require 'rubygems/test_case' class TestGemResolverGitSet < Gem::TestCase - def setup super @@ -185,5 +184,4 @@ class TestGemResolverGitSet < Gem::TestCase assert_equal "#{@gemhome}2", spec.source.root_dir end - end diff --git a/test/rubygems/test_gem_resolver_git_specification.rb b/test/rubygems/test_gem_resolver_git_specification.rb index 3391505555..4283e02765 100644 --- a/test/rubygems/test_gem_resolver_git_specification.rb +++ b/test/rubygems/test_gem_resolver_git_specification.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/installer' class TestGemResolverGitSpecification < Gem::TestCase - def setup super @@ -110,5 +109,4 @@ class TestGemResolverGitSpecification < Gem::TestCase assert called end - end diff --git a/test/rubygems/test_gem_resolver_index_set.rb b/test/rubygems/test_gem_resolver_index_set.rb index 2195a7bb5d..2de766f60a 100644 --- a/test/rubygems/test_gem_resolver_index_set.rb +++ b/test/rubygems/test_gem_resolver_index_set.rb @@ -2,7 +2,6 @@ require 'rubygems/test_case' class TestGemResolverIndexSet < Gem::TestCase - def setup super @@ -85,5 +84,4 @@ class TestGemResolverIndexSet < Gem::TestCase assert_equal %w[a-1.a], found.map {|s| s.full_name } end - end diff --git a/test/rubygems/test_gem_resolver_index_specification.rb b/test/rubygems/test_gem_resolver_index_specification.rb index 43e8efd8b6..702d26777b 100644 --- a/test/rubygems/test_gem_resolver_index_specification.rb +++ b/test/rubygems/test_gem_resolver_index_specification.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/available_set' class TestGemResolverIndexSpecification < Gem::TestCase - def test_initialize set = Gem::Resolver::IndexSet.new source = Gem::Source.new @gem_repo @@ -90,5 +89,4 @@ class TestGemResolverIndexSpecification < Gem::TestCase assert_equal a_2_p.full_name, spec.full_name end - end diff --git a/test/rubygems/test_gem_resolver_installed_specification.rb b/test/rubygems/test_gem_resolver_installed_specification.rb index e9422b75f8..b102f98d00 100644 --- a/test/rubygems/test_gem_resolver_installed_specification.rb +++ b/test/rubygems/test_gem_resolver_installed_specification.rb @@ -2,7 +2,6 @@ require 'rubygems/test_case' class TestGemResolverInstalledSpecification < Gem::TestCase - def setup super @@ -44,5 +43,4 @@ class TestGemResolverInstalledSpecification < Gem::TestCase assert b_spec.installable_platform? end - end diff --git a/test/rubygems/test_gem_resolver_installer_set.rb b/test/rubygems/test_gem_resolver_installer_set.rb index 019ca4814f..76c9c04a3c 100644 --- a/test/rubygems/test_gem_resolver_installer_set.rb +++ b/test/rubygems/test_gem_resolver_installer_set.rb @@ -2,7 +2,6 @@ require 'rubygems/test_case' class TestGemResolverInstallerSet < Gem::TestCase - def test_add_always_install spec_fetcher do |fetcher| fetcher.download 'a', 1 @@ -255,5 +254,4 @@ class TestGemResolverInstallerSet < Gem::TestCase refute set.consider_local? refute set.consider_remote? end - end diff --git a/test/rubygems/test_gem_resolver_local_specification.rb b/test/rubygems/test_gem_resolver_local_specification.rb index 82598f5188..0dcc436b29 100644 --- a/test/rubygems/test_gem_resolver_local_specification.rb +++ b/test/rubygems/test_gem_resolver_local_specification.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/available_set' class TestGemResolverLocalSpecification < Gem::TestCase - def setup super @@ -41,5 +40,4 @@ class TestGemResolverLocalSpecification < Gem::TestCase assert b_spec.installable_platform? end - end diff --git a/test/rubygems/test_gem_resolver_lock_set.rb b/test/rubygems/test_gem_resolver_lock_set.rb index e1c8746b72..cb03e0b5f8 100644 --- a/test/rubygems/test_gem_resolver_lock_set.rb +++ b/test/rubygems/test_gem_resolver_lock_set.rb @@ -2,7 +2,6 @@ require 'rubygems/test_case' class TestGemResolverLockSet < Gem::TestCase - def setup super @@ -59,5 +58,4 @@ class TestGemResolverLockSet < Gem::TestCase def test_prefetch assert_respond_to @set, :prefetch end - end diff --git a/test/rubygems/test_gem_resolver_lock_specification.rb b/test/rubygems/test_gem_resolver_lock_specification.rb index 7b9b0ac8f7..07654a9164 100644 --- a/test/rubygems/test_gem_resolver_lock_specification.rb +++ b/test/rubygems/test_gem_resolver_lock_specification.rb @@ -4,7 +4,6 @@ require 'rubygems/installer' require 'rubygems/resolver' class TestGemResolverLockSpecification < Gem::TestCase - def setup super @@ -95,5 +94,4 @@ class TestGemResolverLockSpecification < Gem::TestCase assert_same real_spec, l_spec.spec end - end diff --git a/test/rubygems/test_gem_resolver_requirement_list.rb b/test/rubygems/test_gem_resolver_requirement_list.rb index 4cbb939199..af8a77ef4b 100644 --- a/test/rubygems/test_gem_resolver_requirement_list.rb +++ b/test/rubygems/test_gem_resolver_requirement_list.rb @@ -2,7 +2,6 @@ require 'rubygems/test_case' class TestGemResolverRequirementList < Gem::TestCase - def setup super @@ -16,5 +15,4 @@ class TestGemResolverRequirementList < Gem::TestCase assert_equal [req], @list.each.to_a end - end diff --git a/test/rubygems/test_gem_resolver_specification.rb b/test/rubygems/test_gem_resolver_specification.rb index e663ff1837..e395c473ab 100644 --- a/test/rubygems/test_gem_resolver_specification.rb +++ b/test/rubygems/test_gem_resolver_specification.rb @@ -2,9 +2,7 @@ require 'rubygems/test_case' class TestGemResolverSpecification < Gem::TestCase - class TestSpec < Gem::Resolver::Specification - attr_writer :source attr_reader :spec @@ -13,7 +11,6 @@ class TestGemResolverSpecification < Gem::TestCase @spec = spec end - end def test_install @@ -62,5 +59,4 @@ class TestGemResolverSpecification < Gem::TestCase assert_equal source, a_spec.source end - end diff --git a/test/rubygems/test_gem_resolver_vendor_set.rb b/test/rubygems/test_gem_resolver_vendor_set.rb index 3fc79fec16..99e2c5ae5f 100644 --- a/test/rubygems/test_gem_resolver_vendor_set.rb +++ b/test/rubygems/test_gem_resolver_vendor_set.rb @@ -2,7 +2,6 @@ require 'rubygems/test_case' class TestGemResolverVendorSet < Gem::TestCase - def setup super @@ -79,5 +78,4 @@ class TestGemResolverVendorSet < Gem::TestCase @set.load_spec 'b', v(1), Gem::Platform::RUBY, nil end end - end diff --git a/test/rubygems/test_gem_resolver_vendor_specification.rb b/test/rubygems/test_gem_resolver_vendor_specification.rb index 315ce05539..dbf0c58e0b 100644 --- a/test/rubygems/test_gem_resolver_vendor_specification.rb +++ b/test/rubygems/test_gem_resolver_vendor_specification.rb @@ -2,7 +2,6 @@ require 'rubygems/test_case' class TestGemResolverVendorSpecification < Gem::TestCase - def setup super @@ -79,5 +78,4 @@ class TestGemResolverVendorSpecification < Gem::TestCase assert_equal v(1), v_spec.version end - end diff --git a/test/rubygems/test_gem_security.rb b/test/rubygems/test_gem_security.rb index 172dd10316..4d07887d36 100644 --- a/test/rubygems/test_gem_security.rb +++ b/test/rubygems/test_gem_security.rb @@ -11,7 +11,6 @@ if Gem.java_platform? end class TestGemSecurity < Gem::TestCase - CHILD_KEY = load_key 'child' ALTERNATE_CERT = load_cert 'child' @@ -310,5 +309,4 @@ class TestGemSecurity < Gem::TestCase assert_equal key.to_pem, key_from_file.to_pem end - end if defined?(OpenSSL::SSL) && !Gem.java_platform? diff --git a/test/rubygems/test_gem_security_policy.rb b/test/rubygems/test_gem_security_policy.rb index e2dec7ce12..4d5d9bbe33 100644 --- a/test/rubygems/test_gem_security_policy.rb +++ b/test/rubygems/test_gem_security_policy.rb @@ -7,7 +7,6 @@ unless defined?(OpenSSL::SSL) end class TestGemSecurityPolicy < Gem::TestCase - ALTERNATE_KEY = load_key 'alternate' INVALID_KEY = load_key 'invalid' CHILD_KEY = load_key 'child' @@ -535,5 +534,4 @@ class TestGemSecurityPolicy < Gem::TestCase return digests, signatures end - end if defined?(OpenSSL::SSL) diff --git a/test/rubygems/test_gem_security_signer.rb b/test/rubygems/test_gem_security_signer.rb index df1ffbac8a..050748a8b5 100644 --- a/test/rubygems/test_gem_security_signer.rb +++ b/test/rubygems/test_gem_security_signer.rb @@ -6,7 +6,6 @@ unless defined?(OpenSSL::SSL) end class TestGemSecuritySigner < Gem::TestCase - ALTERNATE_KEY = load_key 'alternate' CHILD_KEY = load_key 'child' GRANDCHILD_KEY = load_key 'grandchild' @@ -215,5 +214,4 @@ toqvglr0kdbknSRRjBVLK6tsgr07aLT9gNP7mTW2PA== signer.sign 'hello' end end - end if defined?(OpenSSL::SSL) diff --git a/test/rubygems/test_gem_security_trust_dir.rb b/test/rubygems/test_gem_security_trust_dir.rb index f2b7b006dd..9a40f85eb6 100644 --- a/test/rubygems/test_gem_security_trust_dir.rb +++ b/test/rubygems/test_gem_security_trust_dir.rb @@ -6,7 +6,6 @@ unless defined?(OpenSSL::SSL) end class TestGemSecurityTrustDir < Gem::TestCase - CHILD_CERT = load_cert 'child' def setup @@ -96,5 +95,4 @@ class TestGemSecurityTrustDir < Gem::TestCase assert_equal mask, File.stat(@dest_dir).mode unless win_platform? end - end if defined?(OpenSSL::SSL) diff --git a/test/rubygems/test_gem_server.rb b/test/rubygems/test_gem_server.rb index 350a21d1d6..0e283da5a4 100644 --- a/test/rubygems/test_gem_server.rb +++ b/test/rubygems/test_gem_server.rb @@ -4,13 +4,10 @@ require 'rubygems/server' require 'stringio' class Gem::Server - attr_reader :server - end class TestGemServer < Gem::TestCase - def process_based_port 0 end @@ -608,5 +605,4 @@ class TestGemServer < Gem::TestCase @server.instance_variable_set :@server, webrick end - end diff --git a/test/rubygems/test_gem_silent_ui.rb b/test/rubygems/test_gem_silent_ui.rb index d49166ff6f..3c4811aad5 100644 --- a/test/rubygems/test_gem_silent_ui.rb +++ b/test/rubygems/test_gem_silent_ui.rb @@ -4,7 +4,6 @@ require 'rubygems/user_interaction' require 'timeout' class TestGemSilentUI < Gem::TestCase - def setup super @sui = Gem::SilentUI.new @@ -114,5 +113,4 @@ class TestGemSilentUI < Gem::TestCase assert_empty out, 'No output' assert_empty err, 'No output' end - end diff --git a/test/rubygems/test_gem_source.rb b/test/rubygems/test_gem_source.rb index 72f0878bcc..599d490d95 100644 --- a/test/rubygems/test_gem_source.rb +++ b/test/rubygems/test_gem_source.rb @@ -4,7 +4,6 @@ require 'rubygems/source' require 'rubygems/indexer' class TestGemSource < Gem::TestCase - def tuple(*args) Gem::NameTuple.new(*args) end @@ -246,5 +245,4 @@ class TestGemSource < Gem::TestCase distance_threshold = 5 assert rubygems_source.typo_squatting?("rubysertgems.org", distance_threshold) end - end diff --git a/test/rubygems/test_gem_source_fetch_problem.rb b/test/rubygems/test_gem_source_fetch_problem.rb index 65b182890a..1a0545a893 100644 --- a/test/rubygems/test_gem_source_fetch_problem.rb +++ b/test/rubygems/test_gem_source_fetch_problem.rb @@ -2,7 +2,6 @@ require 'rubygems/test_case' class TestGemSourceFetchProblem < Gem::TestCase - def test_exception source = Gem::Source.new @gem_repo error = RuntimeError.new 'test' @@ -24,5 +23,4 @@ class TestGemSourceFetchProblem < Gem::TestCase refute_match sf.wordy, 'secret' end - end diff --git a/test/rubygems/test_gem_source_git.rb b/test/rubygems/test_gem_source_git.rb index 393190c9f5..f5406d2215 100644 --- a/test/rubygems/test_gem_source_git.rb +++ b/test/rubygems/test_gem_source_git.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/source' class TestGemSourceGit < Gem::TestCase - def setup super @@ -300,5 +299,4 @@ class TestGemSourceGit < Gem::TestCase assert_equal '291c4caac7feba8bb64c297987028acb3dde6cfe', source.uri_hash end - end diff --git a/test/rubygems/test_gem_source_installed.rb b/test/rubygems/test_gem_source_installed.rb index 1d14b1ccd2..93aa4eb039 100644 --- a/test/rubygems/test_gem_source_installed.rb +++ b/test/rubygems/test_gem_source_installed.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/source' class TestGemSourceInstalled < Gem::TestCase - def test_spaceship a1 = quick_gem 'a', '1' util_build_gem a1 @@ -32,5 +31,4 @@ class TestGemSourceInstalled < Gem::TestCase assert_equal(1, vendor.<=>(installed), 'vendor <=> installed') assert_equal(-1, installed.<=>(vendor), 'installed <=> vendor') end - end diff --git a/test/rubygems/test_gem_source_list.rb b/test/rubygems/test_gem_source_list.rb index 0e3bcf9197..7c60af3ff8 100644 --- a/test/rubygems/test_gem_source_list.rb +++ b/test/rubygems/test_gem_source_list.rb @@ -4,7 +4,6 @@ require 'rubygems/source_list' require 'rubygems/test_case' class TestGemSourceList < Gem::TestCase - def setup super @@ -116,5 +115,4 @@ class TestGemSourceList < Gem::TestCase @sl.delete Gem::Source.new(@uri) assert_equal @sl.sources, [] end - end diff --git a/test/rubygems/test_gem_source_local.rb b/test/rubygems/test_gem_source_local.rb index c2d4d6cd10..7417f8d111 100644 --- a/test/rubygems/test_gem_source_local.rb +++ b/test/rubygems/test_gem_source_local.rb @@ -5,7 +5,6 @@ require 'rubygems/source' require 'fileutils' class TestGemSourceLocal < Gem::TestCase - def setup super @@ -104,5 +103,4 @@ class TestGemSourceLocal < Gem::TestCase assert_equal(-1, specific.<=>(local), 'specific <=> local') assert_equal(1, local.<=>(specific), 'local <=> specific') end - end diff --git a/test/rubygems/test_gem_source_lock.rb b/test/rubygems/test_gem_source_lock.rb index fcd290ef6c..8c55926d94 100644 --- a/test/rubygems/test_gem_source_lock.rb +++ b/test/rubygems/test_gem_source_lock.rb @@ -2,7 +2,6 @@ require 'rubygems/test_case' class TestGemSourceLock < Gem::TestCase - def test_fetch_spec spec_fetcher do |fetcher| fetcher.spec 'a', 1 @@ -110,5 +109,4 @@ class TestGemSourceLock < Gem::TestCase assert_equal URI(@gem_repo), lock.uri end - end diff --git a/test/rubygems/test_gem_source_specific_file.rb b/test/rubygems/test_gem_source_specific_file.rb index aaaa1602c7..003fbec81d 100644 --- a/test/rubygems/test_gem_source_specific_file.rb +++ b/test/rubygems/test_gem_source_specific_file.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/source' class TestGemSourceSpecificFile < Gem::TestCase - def setup super @@ -73,5 +72,4 @@ class TestGemSourceSpecificFile < Gem::TestCase assert_equal(0, a1_source.<=>(a1_source), 'a1_source <=> a1_source') assert_equal(1, a2_source.<=>(a1_source), 'a2_source <=> a1_source') end - end diff --git a/test/rubygems/test_gem_source_vendor.rb b/test/rubygems/test_gem_source_vendor.rb index b9b078ea33..18a3f47f45 100644 --- a/test/rubygems/test_gem_source_vendor.rb +++ b/test/rubygems/test_gem_source_vendor.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/source' class TestGemSourceVendor < Gem::TestCase - def test_initialize source = Gem::Source::Vendor.new 'vendor/foo' @@ -27,5 +26,4 @@ class TestGemSourceVendor < Gem::TestCase assert_equal(1, vendor.<=>(installed), 'vendor <=> installed') assert_equal(-1, installed.<=>(vendor), 'installed <=> vendor') end - end diff --git a/test/rubygems/test_gem_spec_fetcher.rb b/test/rubygems/test_gem_spec_fetcher.rb index b141a5b7b5..9c756aacf3 100644 --- a/test/rubygems/test_gem_spec_fetcher.rb +++ b/test/rubygems/test_gem_spec_fetcher.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/spec_fetcher' class TestGemSpecFetcher < Gem::TestCase - def tuple(*args) Gem::NameTuple.new(*args) end @@ -335,5 +334,4 @@ class TestGemSpecFetcher < Gem::TestCase assert_equal({}, specs) assert_kind_of Gem::SourceFetchProblem, errors.first end - end diff --git a/test/rubygems/test_gem_specification.rb b/test/rubygems/test_gem_specification.rb index 0733899be0..c4da82373a 100644 --- a/test/rubygems/test_gem_specification.rb +++ b/test/rubygems/test_gem_specification.rb @@ -9,7 +9,6 @@ require 'rubygems/installer' require 'rubygems/platform' class TestGemSpecification < Gem::TestCase - LEGACY_YAML_SPEC = <<-EOF.freeze --- !ruby/object:Gem::Specification rubygems_version: "1.0" @@ -1837,7 +1836,6 @@ dependencies: [] RbConfig::CONFIG['ENABLE_SHARED'], 'no' class << Gem - alias orig_default_ext_dir_for default_ext_dir_for remove_method :default_ext_dir_for @@ -1845,7 +1843,6 @@ dependencies: [] def Gem.default_ext_dir_for(base_dir) 'elsewhere' end - end ext_spec @@ -1859,11 +1856,9 @@ dependencies: [] RbConfig::CONFIG['ENABLE_SHARED'] = enable_shared class << Gem - remove_method :default_ext_dir_for alias default_ext_dir_for orig_default_ext_dir_for - end end @@ -2153,11 +2148,9 @@ dependencies: [] def test_require_paths_default_ext_dir_for class << Gem - send :alias_method, :orig_default_ext_dir_for, :default_ext_dir_for remove_method :default_ext_dir_for - end def Gem.default_ext_dir_for(base_dir) @@ -2173,11 +2166,9 @@ dependencies: [] end ensure class << Gem - send :remove_method, :default_ext_dir_for send :alias_method, :default_ext_dir_for, :orig_default_ext_dir_for send :remove_method, :orig_default_ext_dir_for - end end @@ -3926,5 +3917,4 @@ end ensure $VERBOSE = old_verbose end - end diff --git a/test/rubygems/test_gem_stream_ui.rb b/test/rubygems/test_gem_stream_ui.rb index 1326cd27ef..ca6dbc6a8b 100644 --- a/test/rubygems/test_gem_stream_ui.rb +++ b/test/rubygems/test_gem_stream_ui.rb @@ -4,7 +4,6 @@ require 'rubygems/user_interaction' require 'timeout' class TestGemStreamUI < Gem::TestCase - # increase timeout with MJIT for --jit-wait testing mjit_enabled = defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled? SHORT_TIMEOUT = (RUBY_ENGINE == "ruby" && !mjit_enabled) ? 0.1 : 1.0 @@ -222,5 +221,4 @@ class TestGemStreamUI < Gem::TestCase reporter.fetch 'a.gem', 1024 assert_equal "", @out.string end - end diff --git a/test/rubygems/test_gem_stub_specification.rb b/test/rubygems/test_gem_stub_specification.rb index 91a46d7842..5a47fa520a 100644 --- a/test/rubygems/test_gem_stub_specification.rb +++ b/test/rubygems/test_gem_stub_specification.rb @@ -3,7 +3,6 @@ require "rubygems/test_case" require "rubygems/stub_specification" class TestStubSpecification < Gem::TestCase - FOO = File.join SPECIFICATIONS, "foo-0.0.1-x86-mswin32.gemspec" BAR = File.join SPECIFICATIONS, "bar-0.0.2.gemspec" @@ -291,5 +290,4 @@ end return stub end end - end diff --git a/test/rubygems/test_gem_text.rb b/test/rubygems/test_gem_text.rb index 43e8496f0c..d8e4b75f3a 100644 --- a/test/rubygems/test_gem_text.rb +++ b/test/rubygems/test_gem_text.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require "rubygems/text" class TestGemText < Gem::TestCase - include Gem::Text def test_format_text @@ -94,5 +93,4 @@ Without the wrapping, the text might not look good in the RSS feed. def test_clean_text assert_equal ".]2;nyan.", clean_text("\e]2;nyan\a") end - end diff --git a/test/rubygems/test_gem_uninstaller.rb b/test/rubygems/test_gem_uninstaller.rb index 9229fee842..1c084c4c5d 100644 --- a/test/rubygems/test_gem_uninstaller.rb +++ b/test/rubygems/test_gem_uninstaller.rb @@ -3,7 +3,6 @@ require 'rubygems/installer_test_case' require 'rubygems/uninstaller' class TestGemUninstaller < Gem::InstallerTestCase - def setup super @installer = setup_base_installer @@ -665,5 +664,4 @@ create_makefile '#{@spec.name}' refute File.exist?(plugin_path), 'last version uninstalled, but plugin still present' end - end diff --git a/test/rubygems/test_gem_unsatisfiable_dependency_error.rb b/test/rubygems/test_gem_unsatisfiable_dependency_error.rb index e68185ce25..7950efb2a9 100644 --- a/test/rubygems/test_gem_unsatisfiable_dependency_error.rb +++ b/test/rubygems/test_gem_unsatisfiable_dependency_error.rb @@ -2,7 +2,6 @@ require 'rubygems/test_case' class TestGemUnsatisfiableDependencyError < Gem::TestCase - def setup super @@ -28,5 +27,4 @@ class TestGemUnsatisfiableDependencyError < Gem::TestCase def test_version assert_equal @a_dep.requirement, @e.version end - end diff --git a/test/rubygems/test_gem_uri_formatter.rb b/test/rubygems/test_gem_uri_formatter.rb index b19bae9939..debc7739cb 100644 --- a/test/rubygems/test_gem_uri_formatter.rb +++ b/test/rubygems/test_gem_uri_formatter.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/uri_formatter' class TestGemUriFormatter < Gem::TestCase - def test_normalize_uri assert_equal 'FILE://example/', Gem::UriFormatter.new('FILE://example/').normalize @@ -24,5 +23,4 @@ class TestGemUriFormatter < Gem::TestCase def test_unescape assert_equal 'a@b\c', Gem::UriFormatter.new('a%40b%5Cc').unescape end - end diff --git a/test/rubygems/test_gem_util.rb b/test/rubygems/test_gem_util.rb index 5866aa7b99..acf7ac8962 100644 --- a/test/rubygems/test_gem_util.rb +++ b/test/rubygems/test_gem_util.rb @@ -3,7 +3,6 @@ require 'rubygems/test_case' require 'rubygems/util' class TestGemUtil < Gem::TestCase - def test_class_popen skip "popen with a block does not behave well on jruby" if Gem.java_platform? assert_equal "0\n", Gem::Util.popen(*ruby_with_rubygems_in_load_path, '-e', 'p 0') @@ -86,5 +85,4 @@ class TestGemUtil < Gem::TestCase path = "/home/skillet" assert_equal "/home/skillet", Gem::Util.correct_for_windows_path(path) end - end diff --git a/test/rubygems/test_gem_validator.rb b/test/rubygems/test_gem_validator.rb index 34b7e5fb37..d4159d59e2 100644 --- a/test/rubygems/test_gem_validator.rb +++ b/test/rubygems/test_gem_validator.rb @@ -4,7 +4,6 @@ require "rubygems/test_case" require "rubygems/validator" class TestGemValidator < Gem::TestCase - def setup super @@ -40,5 +39,4 @@ class TestGemValidator < Gem::TestCase assert_empty alien end - end diff --git a/test/rubygems/test_gem_version.rb b/test/rubygems/test_gem_version.rb index 30b9376e30..7b382809c9 100644 --- a/test/rubygems/test_gem_version.rb +++ b/test/rubygems/test_gem_version.rb @@ -5,7 +5,6 @@ require "rubygems/version" require "minitest/benchmark" class TestGemVersion < Gem::TestCase - class V < ::Gem::Version end @@ -298,5 +297,4 @@ class TestGemVersion < Gem::TestCase def refute_version_equal(unexpected, actual) refute_equal v(unexpected), v(actual) end - end diff --git a/test/rubygems/test_gem_version_option.rb b/test/rubygems/test_gem_version_option.rb index a680c5154e..396fc6277c 100644 --- a/test/rubygems/test_gem_version_option.rb +++ b/test/rubygems/test_gem_version_option.rb @@ -4,7 +4,6 @@ require 'rubygems/command' require 'rubygems/version_option' class TestGemVersionOption < Gem::TestCase - def setup super @@ -162,5 +161,4 @@ class TestGemVersionOption < Gem::TestCase assert_equal expected, @cmd.options end - end diff --git a/test/rubygems/test_kernel.rb b/test/rubygems/test_kernel.rb index 6c07347a9f..0fa36a0dec 100644 --- a/test/rubygems/test_kernel.rb +++ b/test/rubygems/test_kernel.rb @@ -2,7 +2,6 @@ require 'rubygems/test_case' class TestKernel < Gem::TestCase - def setup super @@ -137,5 +136,4 @@ class TestKernel < Gem::TestCase assert $:.any? {|p| %r{bundler-1/lib} =~ p } end end - end diff --git a/test/rubygems/test_project_sanity.rb b/test/rubygems/test_project_sanity.rb index ca14e3fbb4..831a2c00aa 100644 --- a/test/rubygems/test_project_sanity.rb +++ b/test/rubygems/test_project_sanity.rb @@ -4,7 +4,6 @@ require "rubygems/test_case" require "open3" class TestProjectSanity < Gem::TestCase - def test_manifest_is_up_to_date skip unless File.exist?(File.expand_path("../../../Rakefile", __FILE__)) @@ -18,5 +17,4 @@ class TestProjectSanity < Gem::TestCase assert status.success?, err end - end diff --git a/test/rubygems/test_remote_fetch_error.rb b/test/rubygems/test_remote_fetch_error.rb index 766086756e..29aaaa8adb 100644 --- a/test/rubygems/test_remote_fetch_error.rb +++ b/test/rubygems/test_remote_fetch_error.rb @@ -2,7 +2,6 @@ require 'rubygems/test_case' class TestRemoteFetchError < Gem::TestCase - def test_password_redacted error = Gem::RemoteFetcher::FetchError.new('There was an error fetching', 'https://user:secret@gemsource.org') refute_match 'secret', error.to_s @@ -17,5 +16,4 @@ class TestRemoteFetchError < Gem::TestCase error = Gem::RemoteFetcher::FetchError.new('There was an error fetching', 'https://gemsource.org') assert_equal error.to_s, 'There was an error fetching (https://gemsource.org)' end - end diff --git a/test/rubygems/test_require.rb b/test/rubygems/test_require.rb index d90c3e2744..2b6620cc65 100644 --- a/test/rubygems/test_require.rb +++ b/test/rubygems/test_require.rb @@ -3,9 +3,7 @@ require 'rubygems/test_case' require 'rubygems' class TestGemRequire < Gem::TestCase - class Latch - def initialize(count = 1) @count = count @lock = Monitor.new @@ -24,7 +22,6 @@ class TestGemRequire < Gem::TestCase @cv.wait_while { @count > 0 } end end - end def setup @@ -568,10 +565,8 @@ class TestGemRequire < Gem::TestCase def test_try_activate_error_unlocks_require_monitor silence_warnings do class << ::Gem - alias old_try_activate try_activate def try_activate(*); raise 'raised from try_activate'; end - end end @@ -582,9 +577,7 @@ class TestGemRequire < Gem::TestCase ensure silence_warnings do class << ::Gem - alias try_activate old_try_activate - end end Kernel::RUBYGEMS_ACTIVATION_MONITOR.exit @@ -740,5 +733,4 @@ class TestGemRequire < Gem::TestCase dash_i_lib_arg end - end |