diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-09-23 21:02:56 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-09-23 21:02:56 +0900 |
| commit | 31a6eaabc165d8a222e176f2c809d90622d88ec2 (patch) | |
| tree | b5333db2c13888ede5062ccd8ecca649ea261b4c /test | |
| parent | f56fc720ee8cd4b79824a1c3843058b662a302bd (diff) | |
Manually merged from https://github.com/rubygems/rubygems/pull/2636
Enable Style/EmptyLinesAroundClassBody rubocop cop.
Diffstat (limited to 'test')
135 files changed, 306 insertions, 0 deletions
diff --git a/test/rubygems/plugin/load/rubygems_plugin.rb b/test/rubygems/plugin/load/rubygems_plugin.rb index 7cc6bef90b..85a6851ace 100644 --- a/test/rubygems/plugin/load/rubygems_plugin.rb +++ b/test/rubygems/plugin/load/rubygems_plugin.rb @@ -1,4 +1,6 @@ # 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 9155360e76..a27a79f8dc 100644 --- a/test/rubygems/rubygems/commands/crash_command.rb +++ b/test/rubygems/rubygems/commands/crash_command.rb @@ -1,4 +1,6 @@ # 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 2dc7836904..7fac2ebec6 100644 --- a/test/rubygems/rubygems_plugin.rb +++ b/test/rubygems/rubygems_plugin.rb @@ -11,6 +11,7 @@ module Gem::Commands end class Gem::Commands::InterruptCommand < Gem::Command + def initialize super('interrupt', 'Raises an Interrupt Exception', {}) end @@ -18,6 +19,7 @@ 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 b30264a8d4..c25f423cf4 100644 --- a/test/rubygems/test_bundled_ca.rb +++ b/test/rubygems/test_bundled_ca.rb @@ -15,6 +15,7 @@ require 'rubygems/request' # class TestBundledCA < Gem::TestCase + THIS_FILE = File.expand_path __FILE__ def bundled_certificate_store @@ -58,4 +59,5 @@ class TestBundledCA < Gem::TestCase def test_accessing_new_index assert_https('fastly.rubygems.org') end + end if defined?(OpenSSL::SSL) diff --git a/test/rubygems/test_config.rb b/test/rubygems/test_config.rb index 015e2b1d8a..70fc4e23f0 100644 --- a/test/rubygems/test_config.rb +++ b/test/rubygems/test_config.rb @@ -4,6 +4,7 @@ require 'rubygems' require 'shellwords' class TestConfig < Gem::TestCase + def test_datadir util_make_gems spec = Gem::Specification.find_by_name("a") @@ -24,4 +25,5 @@ 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 5f8eef76cb..84b1efbe41 100644 --- a/test/rubygems/test_deprecate.rb +++ b/test/rubygems/test_deprecate.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/deprecate' class TestDeprecate < Gem::TestCase + def setup super @@ -40,6 +41,7 @@ class TestDeprecate < Gem::TestCase end class Thing + extend Gem::Deprecate attr_accessor :message def foo @@ -49,9 +51,11 @@ class TestDeprecate < Gem::TestCase @message = "bar" end rubygems_deprecate :foo, :bar + end class OtherThing + extend Gem::Deprecate attr_accessor :message def foo @@ -61,6 +65,7 @@ class TestDeprecate < Gem::TestCase @message = "bar" end deprecate :foo, :bar, 2099, 3 + end def test_deprecated_method_calls_the_old_method @@ -110,4 +115,5 @@ 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 cf5c9720b4..aef00cd761 100644 --- a/test/rubygems/test_gem.rb +++ b/test/rubygems/test_gem.rb @@ -8,6 +8,7 @@ require 'tmpdir' require 'rbconfig' class TestGem < Gem::TestCase + PLUGINS_LOADED = [] # rubocop:disable Style/MutableConstant PROJECT_DIR = File.expand_path('../../..', __FILE__).tap(&Gem::UNTAINT) @@ -2032,4 +2033,5 @@ 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 dd2816acc6..e48b5bbde4 100644 --- a/test/rubygems/test_gem_available_set.rb +++ b/test/rubygems/test_gem_available_set.rb @@ -4,6 +4,7 @@ require 'rubygems/available_set' require 'rubygems/security' class TestGemAvailableSet < Gem::TestCase + def setup super @@ -126,4 +127,5 @@ 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 4372356db8..7fbbcc4f8a 100644 --- a/test/rubygems/test_gem_bundler_version_finder.rb +++ b/test/rubygems/test_gem_bundler_version_finder.rb @@ -2,6 +2,7 @@ require 'rubygems/test_case' class TestGemBundlerVersionFinder < Gem::TestCase + def setup super @@ -145,4 +146,5 @@ 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 2f87d9cc8d..bb31d9c278 100644 --- a/test/rubygems/test_gem_command.rb +++ b/test/rubygems/test_gem_command.rb @@ -3,10 +3,13 @@ require 'rubygems/test_case' require 'rubygems/command' class Gem::Command + public :parser + end class TestGemCommand < Gem::TestCase + def setup super @@ -385,4 +388,5 @@ 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 d4471b0b63..867592a7f4 100644 --- a/test/rubygems/test_gem_command_manager.rb +++ b/test/rubygems/test_gem_command_manager.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/command_manager' class TestGemCommandManager < Gem::TestCase + PROJECT_DIR = File.expand_path('../../..', __FILE__).tap(&Gem::UNTAINT) def setup @@ -299,4 +300,5 @@ 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 3d1f7596a4..afb9b14371 100644 --- a/test/rubygems/test_gem_commands_build_command.rb +++ b/test/rubygems/test_gem_commands_build_command.rb @@ -4,6 +4,7 @@ require 'rubygems/commands/build_command' require 'rubygems/package' class TestGemCommandsBuildCommand < Gem::TestCase + CERT_FILE = cert_path 'public3072' SIGNING_KEY = key_path 'private3072' @@ -508,4 +509,5 @@ 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 c4693b07cf..d149f768ef 100644 --- a/test/rubygems/test_gem_commands_cert_command.rb +++ b/test/rubygems/test_gem_commands_cert_command.rb @@ -11,6 +11,7 @@ if Gem.java_platform? end class TestGemCommandsCertCommand < Gem::TestCase + ALTERNATE_CERT = load_cert 'alternate' EXPIRED_PUBLIC_CERT = load_cert 'expired' @@ -805,4 +806,5 @@ 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 c922e40eab..6a6033d35d 100644 --- a/test/rubygems/test_gem_commands_check_command.rb +++ b/test/rubygems/test_gem_commands_check_command.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/commands/check_command' class TestGemCommandsCheckCommand < Gem::TestCase + def setup super @@ -64,4 +65,5 @@ 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 087d84710f..2f1591674c 100644 --- a/test/rubygems/test_gem_commands_cleanup_command.rb +++ b/test/rubygems/test_gem_commands_cleanup_command.rb @@ -4,6 +4,7 @@ require 'rubygems/commands/cleanup_command' require 'rubygems/installer' class TestGemCommandsCleanupCommand < Gem::TestCase + def setup super @@ -277,4 +278,5 @@ 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 07b0e0f340..00b49d04a7 100644 --- a/test/rubygems/test_gem_commands_contents_command.rb +++ b/test/rubygems/test_gem_commands_contents_command.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/commands/contents_command' class TestGemCommandsContentsCommand < Gem::TestCase + def setup super @@ -267,4 +268,5 @@ 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 11d7f8017a..eaa9594163 100644 --- a/test/rubygems/test_gem_commands_dependency_command.rb +++ b/test/rubygems/test_gem_commands_dependency_command.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/commands/dependency_command' class TestGemCommandsDependencyCommand < Gem::TestCase + def setup super @stub_ui = Gem::MockGemUi.new @@ -224,4 +225,5 @@ 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 a3edeb69bd..12ec8dd6b2 100644 --- a/test/rubygems/test_gem_commands_environment_command.rb +++ b/test/rubygems/test_gem_commands_environment_command.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/commands/environment_command' class TestGemCommandsEnvironmentCommand < Gem::TestCase + def setup super @@ -140,4 +141,5 @@ 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 dfe0d91726..9989f57bd7 100644 --- a/test/rubygems/test_gem_commands_fetch_command.rb +++ b/test/rubygems/test_gem_commands_fetch_command.rb @@ -5,6 +5,7 @@ require 'rubygems/security' require 'rubygems/commands/fetch_command' class TestGemCommandsFetchCommand < Gem::TestCase + def setup super @@ -121,4 +122,5 @@ 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 fc1317a49d..6b69bcf353 100644 --- a/test/rubygems/test_gem_commands_generate_index_command.rb +++ b/test/rubygems/test_gem_commands_generate_index_command.rb @@ -4,6 +4,7 @@ require 'rubygems/indexer' require 'rubygems/commands/generate_index_command' class TestGemCommandsGenerateIndexCommand < Gem::TestCase + def setup super @@ -77,4 +78,5 @@ 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 26e22d79be..f2a519775c 100644 --- a/test/rubygems/test_gem_commands_help_command.rb +++ b/test/rubygems/test_gem_commands_help_command.rb @@ -6,6 +6,7 @@ require "rubygems/package" require "rubygems/command_manager" class TestGemCommandsHelpCommand < Gem::TestCase + def setup super @@ -70,4 +71,5 @@ 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 6d67b567c7..0b7458f7c5 100644 --- a/test/rubygems/test_gem_commands_info_command.rb +++ b/test/rubygems/test_gem_commands_info_command.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/commands/info_command' class TestGemCommandsInfoCommand < Gem::TestCase + def setup super @@ -40,4 +41,5 @@ 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 ccaa4ec2dc..7706eb41eb 100644 --- a/test/rubygems/test_gem_commands_install_command.rb +++ b/test/rubygems/test_gem_commands_install_command.rb @@ -5,6 +5,7 @@ require 'rubygems/request_set' require 'rubygems/rdoc' class TestGemCommandsInstallCommand < Gem::TestCase + def setup super common_installer_setup @@ -1345,4 +1346,5 @@ 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 87da8dbd48..a44ccb4175 100644 --- a/test/rubygems/test_gem_commands_list_command.rb +++ b/test/rubygems/test_gem_commands_list_command.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/commands/list_command' class TestGemCommandsListCommand < Gem::TestCase + def setup super @@ -29,4 +30,5 @@ 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 3612778293..a35ed081cb 100644 --- a/test/rubygems/test_gem_commands_lock_command.rb +++ b/test/rubygems/test_gem_commands_lock_command.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/commands/lock_command' class TestGemCommandsLockCommand < Gem::TestCase + def setup super @@ -63,4 +64,5 @@ 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 6b2b7d11bb..9d3d7169f1 100644 --- a/test/rubygems/test_gem_commands_mirror.rb +++ b/test/rubygems/test_gem_commands_mirror.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/commands/mirror_command' class TestGemCommandsMirrorCommand < Gem::TestCase + def setup super @@ -16,4 +17,5 @@ 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 d3c665217f..3c9a26a549 100644 --- a/test/rubygems/test_gem_commands_open_command.rb +++ b/test/rubygems/test_gem_commands_open_command.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/commands/open_command' class TestGemCommandsOpenCommand < Gem::TestCase + def setup super @@ -95,4 +96,5 @@ 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 57939b8088..3c37e22a09 100644 --- a/test/rubygems/test_gem_commands_outdated_command.rb +++ b/test/rubygems/test_gem_commands_outdated_command.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/commands/outdated_command' class TestGemCommandsOutdatedCommand < Gem::TestCase + def setup super @@ -28,4 +29,5 @@ 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 1602ae6839..b830916fbe 100644 --- a/test/rubygems/test_gem_commands_owner_command.rb +++ b/test/rubygems/test_gem_commands_owner_command.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/commands/owner_command' class TestGemCommandsOwnerCommand < Gem::TestCase + def setup super @@ -275,4 +276,5 @@ 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 75243e5fa2..11344bb6b6 100644 --- a/test/rubygems/test_gem_commands_pristine_command.rb +++ b/test/rubygems/test_gem_commands_pristine_command.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/commands/pristine_command' class TestGemCommandsPristineCommand < Gem::TestCase + def setup super common_installer_setup @@ -655,4 +656,5 @@ 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 c23760a8ca..30bc589f92 100644 --- a/test/rubygems/test_gem_commands_push_command.rb +++ b/test/rubygems/test_gem_commands_push_command.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/commands/push_command' class TestGemCommandsPushCommand < Gem::TestCase + def setup super @@ -409,4 +410,5 @@ 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 f2f70a10ff..d306abe295 100644 --- a/test/rubygems/test_gem_commands_query_command.rb +++ b/test/rubygems/test_gem_commands_query_command.rb @@ -19,6 +19,7 @@ module TestGemCommandsQueryCommandSetup end class TestGemCommandsQueryCommandWithInstalledGems < Gem::TestCase + include TestGemCommandsQueryCommandSetup def test_execute @@ -606,9 +607,11 @@ pl (1 i386-linux) fetcher.spec 'a', '3.a' end end + end class TestGemCommandsQueryCommandWithoutInstalledGems < Gem::TestCase + include TestGemCommandsQueryCommandSetup def test_execute_platform @@ -854,4 +857,5 @@ 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 17693e6837..9187050c30 100644 --- a/test/rubygems/test_gem_commands_search_command.rb +++ b/test/rubygems/test_gem_commands_search_command.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/commands/search_command' class TestGemCommandsSearchCommand < Gem::TestCase + def setup super @@ -12,4 +13,5 @@ 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 89bdce05cd..af15aadfd1 100644 --- a/test/rubygems/test_gem_commands_server_command.rb +++ b/test/rubygems/test_gem_commands_server_command.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/commands/server_command' class TestGemCommandsServerCommand < Gem::TestCase + def setup super @@ -58,4 +59,5 @@ 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 050c1ce3a6..7805bed22a 100644 --- a/test/rubygems/test_gem_commands_setup_command.rb +++ b/test/rubygems/test_gem_commands_setup_command.rb @@ -4,6 +4,7 @@ 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] @@ -417,4 +418,5 @@ class TestGemCommandsSetupCommand < Gem::TestCase def default_bundle_bin_path File.join @install_dir, 'bin', 'bundle' 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 21d19fffc9..258dc494e4 100644 --- a/test/rubygems/test_gem_commands_signin_command.rb +++ b/test/rubygems/test_gem_commands_signin_command.rb @@ -4,6 +4,7 @@ require 'rubygems/commands/signin_command' require 'rubygems/installer' class TestGemCommandsSigninCommand < Gem::TestCase + def setup super @@ -96,4 +97,5 @@ 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 20389d0537..2674351fd3 100644 --- a/test/rubygems/test_gem_commands_signout_command.rb +++ b/test/rubygems/test_gem_commands_signout_command.rb @@ -5,6 +5,7 @@ require 'rubygems/commands/signout_command' require 'rubygems/installer' class TestGemCommandsSignoutCommand < Gem::TestCase + def setup super @cmd = Gem::Commands::SignoutCommand.new @@ -27,4 +28,5 @@ 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 ff00b9aa23..3a0899245b 100644 --- a/test/rubygems/test_gem_commands_sources_command.rb +++ b/test/rubygems/test_gem_commands_sources_command.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/commands/sources_command' class TestGemCommandsSourcesCommand < Gem::TestCase + def setup super @@ -421,4 +422,5 @@ 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 e055246cdc..cb66868568 100644 --- a/test/rubygems/test_gem_commands_specification_command.rb +++ b/test/rubygems/test_gem_commands_specification_command.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/commands/specification_command' class TestGemCommandsSpecificationCommand < Gem::TestCase + def setup super @@ -245,4 +246,5 @@ 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 0aa7f243e2..a8909c6d13 100644 --- a/test/rubygems/test_gem_commands_stale_command.rb +++ b/test/rubygems/test_gem_commands_stale_command.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/commands/stale_command' class TestGemCommandsStaleCommand < Gem::TestCase + def setup super @stub_ui = Gem::MockGemUi.new @@ -39,4 +40,5 @@ 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 03ce600cc4..ee63847c84 100644 --- a/test/rubygems/test_gem_commands_uninstall_command.rb +++ b/test/rubygems/test_gem_commands_uninstall_command.rb @@ -3,6 +3,7 @@ require 'rubygems/installer_test_case' require 'rubygems/commands/uninstall_command' class TestGemCommandsUninstallCommand < Gem::InstallerTestCase + def setup super @cmd = Gem::Commands::UninstallCommand.new @@ -501,4 +502,5 @@ 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 e1fea0f0ff..7d96caaf57 100644 --- a/test/rubygems/test_gem_commands_unpack_command.rb +++ b/test/rubygems/test_gem_commands_unpack_command.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/commands/unpack_command' class TestGemCommandsUnpackCommand < Gem::TestCase + def setup super @@ -220,4 +221,5 @@ 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 65a70b2b74..bd06c84107 100644 --- a/test/rubygems/test_gem_commands_update_command.rb +++ b/test/rubygems/test_gem_commands_update_command.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/commands/update_command' class TestGemCommandsUpdateCommand < Gem::TestCase + def setup super common_installer_setup @@ -646,4 +647,5 @@ 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 b67bf040d4..3d66c0150c 100644 --- a/test/rubygems/test_gem_commands_which_command.rb +++ b/test/rubygems/test_gem_commands_which_command.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/commands/which_command' class TestGemCommandsWhichCommand < Gem::TestCase + def setup super Gem::Specification.reset @@ -81,4 +82,5 @@ 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 8e453dfabf..e84c7eaadd 100644 --- a/test/rubygems/test_gem_commands_yank_command.rb +++ b/test/rubygems/test_gem_commands_yank_command.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/commands/yank_command' class TestGemCommandsYankCommand < Gem::TestCase + def setup super @@ -147,4 +148,5 @@ 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 ddc35a9594..c79563d650 100644 --- a/test/rubygems/test_gem_config_file.rb +++ b/test/rubygems/test_gem_config_file.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/config_file' class TestGemConfigFile < Gem::TestCase + def setup super @@ -491,4 +492,5 @@ 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 7ddeafedce..0caab10d32 100644 --- a/test/rubygems/test_gem_dependency.rb +++ b/test/rubygems/test_gem_dependency.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/dependency' class TestGemDependency < Gem::TestCase + def test_initialize d = dep "pkg", "> 1.0" @@ -390,4 +391,5 @@ 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 803b95e88c..fe68a207b8 100644 --- a/test/rubygems/test_gem_dependency_installer.rb +++ b/test/rubygems/test_gem_dependency_installer.rb @@ -4,6 +4,7 @@ require 'rubygems/dependency_installer' require 'rubygems/security' class TestGemDependencyInstaller < Gem::TestCase + def setup super common_installer_setup @@ -1129,4 +1130,5 @@ 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 d8ef3d4f0e..1263f2f965 100644 --- a/test/rubygems/test_gem_dependency_list.rb +++ b/test/rubygems/test_gem_dependency_list.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/dependency_list' class TestGemDependencyList < Gem::TestCase + def setup super @@ -261,4 +262,5 @@ 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 5321f7031c..57e6191d87 100644 --- a/test/rubygems/test_gem_dependency_resolution_error.rb +++ b/test/rubygems/test_gem_dependency_resolution_error.rb @@ -2,6 +2,7 @@ require 'rubygems/test_case' class TestGemDependencyResolutionError < Gem::TestCase + def setup super @@ -23,4 +24,5 @@ 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 1cef52234e..8ca4798c93 100644 --- a/test/rubygems/test_gem_doctor.rb +++ b/test/rubygems/test_gem_doctor.rb @@ -3,6 +3,7 @@ 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] @@ -191,4 +192,5 @@ 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 abd33d237a..168f9cc573 100644 --- a/test/rubygems/test_gem_ext_builder.rb +++ b/test/rubygems/test_gem_ext_builder.rb @@ -4,6 +4,7 @@ require 'rubygems/ext' require 'rubygems/installer' class TestGemExtBuilder < Gem::TestCase + def setup super @@ -133,6 +134,7 @@ 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 @@ -140,6 +142,7 @@ install: def Gem.install_extension_in_lib false end + end @spec.extensions << 'ext/extconf.rb' @@ -176,9 +179,11 @@ 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 @@ -312,4 +317,5 @@ 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 60a1fa13f6..b3f9241a96 100644 --- a/test/rubygems/test_gem_ext_cmake_builder.rb +++ b/test/rubygems/test_gem_ext_cmake_builder.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/ext' class TestGemExtCmakeBuilder < Gem::TestCase + def setup super @@ -86,4 +87,5 @@ 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 7d7f3759ea..ac8a861e17 100644 --- a/test/rubygems/test_gem_ext_configure_builder.rb +++ b/test/rubygems/test_gem_ext_configure_builder.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/ext' class TestGemExtConfigureBuilder < Gem::TestCase + def setup super @@ -82,4 +83,5 @@ 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 05ac538ec2..6eb7b67c2b 100644 --- a/test/rubygems/test_gem_ext_ext_conf_builder.rb +++ b/test/rubygems/test_gem_ext_ext_conf_builder.rb @@ -4,6 +4,7 @@ require 'rubygems/test_case' require 'rubygems/ext' class TestGemExtExtConfBuilder < Gem::TestCase + def setup super @@ -239,4 +240,5 @@ 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 a13b09c98b..9d789174ce 100644 --- a/test/rubygems/test_gem_ext_rake_builder.rb +++ b/test/rubygems/test_gem_ext_rake_builder.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/ext' class TestGemExtRakeBuilder < Gem::TestCase + def setup super @@ -90,4 +91,5 @@ 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 72a5c83431..86ab7d9edb 100644 --- a/test/rubygems/test_gem_gem_runner.rb +++ b/test/rubygems/test_gem_gem_runner.rb @@ -2,6 +2,7 @@ require 'rubygems/test_case' class TestGemGemRunner < Gem::TestCase + def setup super @@ -109,4 +110,5 @@ 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 48f6b09715..1d7ecf14b1 100644 --- a/test/rubygems/test_gem_gemcutter_utilities.rb +++ b/test/rubygems/test_gem_gemcutter_utilities.rb @@ -5,6 +5,7 @@ require 'rubygems/command' require 'rubygems/gemcutter_utilities' class TestGemGemcutterUtilities < Gem::TestCase + def setup super @@ -261,4 +262,5 @@ 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 e4fe6ef77c..8a0f8d6196 100644 --- a/test/rubygems/test_gem_impossible_dependencies_error.rb +++ b/test/rubygems/test_gem_impossible_dependencies_error.rb @@ -2,6 +2,7 @@ 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' @@ -56,4 +57,5 @@ 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 adc83dd8fb..f20e3c5112 100644 --- a/test/rubygems/test_gem_indexer.rb +++ b/test/rubygems/test_gem_indexer.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/indexer' class TestGemIndexer < Gem::TestCase + def setup super @@ -354,4 +355,5 @@ 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 d9da22b129..c6b4778336 100644 --- a/test/rubygems/test_gem_install_update_options.rb +++ b/test/rubygems/test_gem_install_update_options.rb @@ -5,6 +5,7 @@ require 'rubygems/command' require 'rubygems/dependency_installer' class TestGemInstallUpdateOptions < Gem::InstallerTestCase + def setup super @@ -192,4 +193,5 @@ 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 e984c7079c..e6a9aa0fcc 100644 --- a/test/rubygems/test_gem_installer.rb +++ b/test/rubygems/test_gem_installer.rb @@ -2,6 +2,7 @@ require 'rubygems/installer_test_case' class TestGemInstaller < Gem::InstallerTestCase + def setup super common_installer_setup @@ -2221,4 +2222,5 @@ 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 93059ae731..6c21300c2a 100644 --- a/test/rubygems/test_gem_local_remote_options.rb +++ b/test/rubygems/test_gem_local_remote_options.rb @@ -4,6 +4,7 @@ require 'rubygems/local_remote_options' require 'rubygems/command' class TestGemLocalRemoteOptions < Gem::TestCase + def setup super @@ -129,4 +130,5 @@ 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 92cfe6c1d2..5331e1cdbb 100644 --- a/test/rubygems/test_gem_name_tuple.rb +++ b/test/rubygems/test_gem_name_tuple.rb @@ -3,6 +3,7 @@ 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 @@ -39,4 +40,5 @@ 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 5e9c3b7b81..f9b21cb334 100644 --- a/test/rubygems/test_gem_package.rb +++ b/test/rubygems/test_gem_package.rb @@ -4,6 +4,7 @@ require 'rubygems/package/tar_test_case' require 'digest' class TestGemPackage < Gem::Package::TarTestCase + def setup super @@ -1169,4 +1170,5 @@ 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 f2b1719dc3..d2ce59cfdd 100644 --- a/test/rubygems/test_gem_package_old.rb +++ b/test/rubygems/test_gem_package_old.rb @@ -5,6 +5,7 @@ unless Gem.java_platform? # jruby can't require the simple_gem file require 'rubygems/simple_gem' class TestGemPackageOld < Gem::TestCase + def setup super @@ -86,5 +87,6 @@ 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 da4f5506e9..3629e6b685 100644 --- a/test/rubygems/test_gem_package_tar_header.rb +++ b/test/rubygems/test_gem_package_tar_header.rb @@ -3,6 +3,7 @@ require 'rubygems/package/tar_test_case' require 'rubygems/package' class TestGemPackageTarHeader < Gem::Package::TarTestCase + def setup super @@ -222,4 +223,5 @@ 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 05b3ac56a6..489685d09d 100644 --- a/test/rubygems/test_gem_package_tar_reader.rb +++ b/test/rubygems/test_gem_package_tar_reader.rb @@ -3,6 +3,7 @@ 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) @@ -84,4 +85,5 @@ 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 3003e51ac8..87f3471678 100644 --- a/test/rubygems/test_gem_package_tar_reader_entry.rb +++ b/test/rubygems/test_gem_package_tar_reader_entry.rb @@ -3,6 +3,7 @@ require 'rubygems/package/tar_test_case' require 'rubygems/package' class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase + def setup super @@ -149,4 +150,5 @@ 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 e31efdd55f..fb781779be 100644 --- a/test/rubygems/test_gem_package_tar_writer.rb +++ b/test/rubygems/test_gem_package_tar_writer.rb @@ -4,6 +4,7 @@ require 'rubygems/package/tar_writer' require 'minitest/mock' class TestGemPackageTarWriter < Gem::Package::TarTestCase + def setup super @@ -329,4 +330,5 @@ 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 ee9b8d44d4..24a105171a 100644 --- a/test/rubygems/test_gem_package_task.rb +++ b/test/rubygems/test_gem_package_task.rb @@ -13,6 +13,7 @@ unless defined?(Rake::PackageTask) end class TestGemPackageTask < Gem::TestCase + def test_gem_package original_rake_fileutils_verbosity = RakeFileUtils.verbose_flag RakeFileUtils.verbose_flag = false @@ -114,4 +115,5 @@ 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 f24041a2d8..8715bb62dc 100644 --- a/test/rubygems/test_gem_path_support.rb +++ b/test/rubygems/test_gem_path_support.rb @@ -4,6 +4,7 @@ require 'rubygems' require 'fileutils' class TestGemPathSupport < Gem::TestCase + def setup super @@ -139,4 +140,5 @@ 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 030033d2af..289f078867 100644 --- a/test/rubygems/test_gem_platform.rb +++ b/test/rubygems/test_gem_platform.rb @@ -4,6 +4,7 @@ require 'rubygems/platform' require 'rbconfig' class TestGemPlatform < Gem::TestCase + def test_self_local util_set_arch 'i686-darwin8.10.1' @@ -304,4 +305,5 @@ 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 13fd4ba40b..6184d4b457 100644 --- a/test/rubygems/test_gem_rdoc.rb +++ b/test/rubygems/test_gem_rdoc.rb @@ -4,6 +4,7 @@ require 'rubygems/test_case' require 'rubygems/rdoc' class TestGemRDoc < Gem::TestCase + Gem::RDoc.load_rdoc def setup @@ -133,4 +134,5 @@ 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 9f98f8042c..2aee9cc037 100644 --- a/test/rubygems/test_gem_remote_fetcher.rb +++ b/test/rubygems/test_gem_remote_fetcher.rb @@ -31,6 +31,7 @@ require 'minitest/mock' # proxy is configured. class TestGemRemoteFetcher < Gem::TestCase + include Gem::DefaultUserInteraction SERVER_DATA = <<-EOY.freeze @@ -999,8 +1000,10 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg== end class NilLog < WEBrick::Log + def log(level, data) #Do nothing end + end private @@ -1142,4 +1145,5 @@ 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 82b95b47c3..126bb13643 100644 --- a/test/rubygems/test_gem_request.rb +++ b/test/rubygems/test_gem_request.rb @@ -9,6 +9,7 @@ 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' @@ -487,6 +488,7 @@ ERROR: Certificate is an invalid CA certificate end class Conn + attr_accessor :payload def new(*args); self; end @@ -505,5 +507,7 @@ 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 2bd2d28469..f8d2095167 100644 --- a/test/rubygems/test_gem_request_connection_pools.rb +++ b/test/rubygems/test_gem_request_connection_pools.rb @@ -4,12 +4,15 @@ require 'rubygems/request' require 'timeout' class TestGemRequestConnectionPool < Gem::TestCase + class FakeHttp + def initialize(*args) end def start end + end def setup @@ -147,4 +150,5 @@ 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 54ae7720c0..afe1732f5e 100644 --- a/test/rubygems/test_gem_request_set.rb +++ b/test/rubygems/test_gem_request_set.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/request_set' class TestGemRequestSet < Gem::TestCase + def setup super @@ -667,4 +668,5 @@ 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 2a9663959c..ca7e53d24c 100644 --- a/test/rubygems/test_gem_request_set_gem_dependency_api.rb +++ b/test/rubygems/test_gem_request_set_gem_dependency_api.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/request_set' class TestGemRequestSetGemDependencyAPI < Gem::TestCase + def setup super @@ -844,4 +845,5 @@ 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 e7921d6b26..7c5e256a2d 100644 --- a/test/rubygems/test_gem_request_set_lockfile.rb +++ b/test/rubygems/test_gem_request_set_lockfile.rb @@ -4,6 +4,7 @@ require 'rubygems/request_set' require 'rubygems/request_set/lockfile' class TestGemRequestSetLockfile < Gem::TestCase + def setup super @@ -465,4 +466,5 @@ 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 9a42d81d0e..f75c9b9b3e 100644 --- a/test/rubygems/test_gem_request_set_lockfile_parser.rb +++ b/test/rubygems/test_gem_request_set_lockfile_parser.rb @@ -6,6 +6,7 @@ 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' @@ -540,4 +541,5 @@ 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 b485b2c0b7..b5bafe3fa4 100644 --- a/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +++ b/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb @@ -6,6 +6,7 @@ require 'rubygems/request_set/lockfile/tokenizer' require 'rubygems/request_set/lockfile/parser' class TestGemRequestSetLockfileTokenizer < Gem::TestCase + def setup super @@ -303,4 +304,5 @@ 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 af9d807701..6458d5f766 100644 --- a/test/rubygems/test_gem_requirement.rb +++ b/test/rubygems/test_gem_requirement.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require "rubygems/requirement" class TestGemRequirement < Gem::TestCase + def test_concat r = req '>= 1' @@ -426,4 +427,5 @@ 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 09feeac55b..83442adb32 100644 --- a/test/rubygems/test_gem_resolver.rb +++ b/test/rubygems/test_gem_resolver.rb @@ -2,6 +2,7 @@ require 'rubygems/test_case' class TestGemResolver < Gem::TestCase + def setup super @@ -788,4 +789,5 @@ 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 f973c5956d..dc11ad47c4 100644 --- a/test/rubygems/test_gem_resolver_activation_request.rb +++ b/test/rubygems/test_gem_resolver_activation_request.rb @@ -2,6 +2,7 @@ require 'rubygems/test_case' class TestGemResolverActivationRequest < Gem::TestCase + def setup super @@ -39,4 +40,5 @@ 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 6942b8587d..b79e01d074 100644 --- a/test/rubygems/test_gem_resolver_api_set.rb +++ b/test/rubygems/test_gem_resolver_api_set.rb @@ -2,6 +2,7 @@ require 'rubygems/test_case' class TestGemResolverAPISet < Gem::TestCase + def setup super @@ -203,4 +204,5 @@ 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 3db57677f3..87ff901320 100644 --- a/test/rubygems/test_gem_resolver_api_specification.rb +++ b/test/rubygems/test_gem_resolver_api_specification.rb @@ -2,6 +2,7 @@ require 'rubygems/test_case' class TestGemResolverAPISpecification < Gem::TestCase + def test_initialize set = Gem::Resolver::APISet.new data = { @@ -163,4 +164,5 @@ 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 8218bf5d70..34c2c76d64 100644 --- a/test/rubygems/test_gem_resolver_best_set.rb +++ b/test/rubygems/test_gem_resolver_best_set.rb @@ -2,6 +2,7 @@ require 'rubygems/test_case' class TestGemResolverBestSet < Gem::TestCase + def setup super @@ -132,4 +133,5 @@ 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 7c8ae004a3..0e745433a9 100644 --- a/test/rubygems/test_gem_resolver_composed_set.rb +++ b/test/rubygems/test_gem_resolver_composed_set.rb @@ -2,6 +2,7 @@ require 'rubygems/test_case' class TestGemResolverComposedSet < Gem::TestCase + def test_errors index_set = Gem::Resolver::IndexSet.new current_set = Gem::Resolver::CurrentSet.new @@ -40,4 +41,5 @@ 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 5a3ed80670..2385c3eee9 100644 --- a/test/rubygems/test_gem_resolver_conflict.rb +++ b/test/rubygems/test_gem_resolver_conflict.rb @@ -2,6 +2,7 @@ require 'rubygems/test_case' class TestGemResolverConflict < Gem::TestCase + def test_explanation root = dependency_request dep('net-ssh', '>= 2.0.13'), 'rye', '0.9.8' @@ -78,4 +79,5 @@ 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 a8ddc8362b..51f0be9dcd 100644 --- a/test/rubygems/test_gem_resolver_dependency_request.rb +++ b/test/rubygems/test_gem_resolver_dependency_request.rb @@ -2,6 +2,7 @@ require 'rubygems/test_case' class TestGemResolverDependencyRequest < Gem::TestCase + def setup super @@ -79,4 +80,5 @@ 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 6d048b3772..f38859c8b4 100644 --- a/test/rubygems/test_gem_resolver_git_set.rb +++ b/test/rubygems/test_gem_resolver_git_set.rb @@ -2,6 +2,7 @@ require 'rubygems/test_case' class TestGemResolverGitSet < Gem::TestCase + def setup super @@ -184,4 +185,5 @@ 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 4283e02765..3391505555 100644 --- a/test/rubygems/test_gem_resolver_git_specification.rb +++ b/test/rubygems/test_gem_resolver_git_specification.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/installer' class TestGemResolverGitSpecification < Gem::TestCase + def setup super @@ -109,4 +110,5 @@ 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 2de766f60a..2195a7bb5d 100644 --- a/test/rubygems/test_gem_resolver_index_set.rb +++ b/test/rubygems/test_gem_resolver_index_set.rb @@ -2,6 +2,7 @@ require 'rubygems/test_case' class TestGemResolverIndexSet < Gem::TestCase + def setup super @@ -84,4 +85,5 @@ 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 702d26777b..43e8efd8b6 100644 --- a/test/rubygems/test_gem_resolver_index_specification.rb +++ b/test/rubygems/test_gem_resolver_index_specification.rb @@ -3,6 +3,7 @@ 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 @@ -89,4 +90,5 @@ 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 b102f98d00..e9422b75f8 100644 --- a/test/rubygems/test_gem_resolver_installed_specification.rb +++ b/test/rubygems/test_gem_resolver_installed_specification.rb @@ -2,6 +2,7 @@ require 'rubygems/test_case' class TestGemResolverInstalledSpecification < Gem::TestCase + def setup super @@ -43,4 +44,5 @@ 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 76c9c04a3c..019ca4814f 100644 --- a/test/rubygems/test_gem_resolver_installer_set.rb +++ b/test/rubygems/test_gem_resolver_installer_set.rb @@ -2,6 +2,7 @@ require 'rubygems/test_case' class TestGemResolverInstallerSet < Gem::TestCase + def test_add_always_install spec_fetcher do |fetcher| fetcher.download 'a', 1 @@ -254,4 +255,5 @@ 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 0dcc436b29..82598f5188 100644 --- a/test/rubygems/test_gem_resolver_local_specification.rb +++ b/test/rubygems/test_gem_resolver_local_specification.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/available_set' class TestGemResolverLocalSpecification < Gem::TestCase + def setup super @@ -40,4 +41,5 @@ 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 cb03e0b5f8..e1c8746b72 100644 --- a/test/rubygems/test_gem_resolver_lock_set.rb +++ b/test/rubygems/test_gem_resolver_lock_set.rb @@ -2,6 +2,7 @@ require 'rubygems/test_case' class TestGemResolverLockSet < Gem::TestCase + def setup super @@ -58,4 +59,5 @@ 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 07654a9164..7b9b0ac8f7 100644 --- a/test/rubygems/test_gem_resolver_lock_specification.rb +++ b/test/rubygems/test_gem_resolver_lock_specification.rb @@ -4,6 +4,7 @@ require 'rubygems/installer' require 'rubygems/resolver' class TestGemResolverLockSpecification < Gem::TestCase + def setup super @@ -94,4 +95,5 @@ 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 af8a77ef4b..4cbb939199 100644 --- a/test/rubygems/test_gem_resolver_requirement_list.rb +++ b/test/rubygems/test_gem_resolver_requirement_list.rb @@ -2,6 +2,7 @@ require 'rubygems/test_case' class TestGemResolverRequirementList < Gem::TestCase + def setup super @@ -15,4 +16,5 @@ 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 e395c473ab..e663ff1837 100644 --- a/test/rubygems/test_gem_resolver_specification.rb +++ b/test/rubygems/test_gem_resolver_specification.rb @@ -2,7 +2,9 @@ require 'rubygems/test_case' class TestGemResolverSpecification < Gem::TestCase + class TestSpec < Gem::Resolver::Specification + attr_writer :source attr_reader :spec @@ -11,6 +13,7 @@ class TestGemResolverSpecification < Gem::TestCase @spec = spec end + end def test_install @@ -59,4 +62,5 @@ 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 99e2c5ae5f..3fc79fec16 100644 --- a/test/rubygems/test_gem_resolver_vendor_set.rb +++ b/test/rubygems/test_gem_resolver_vendor_set.rb @@ -2,6 +2,7 @@ require 'rubygems/test_case' class TestGemResolverVendorSet < Gem::TestCase + def setup super @@ -78,4 +79,5 @@ 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 dbf0c58e0b..315ce05539 100644 --- a/test/rubygems/test_gem_resolver_vendor_specification.rb +++ b/test/rubygems/test_gem_resolver_vendor_specification.rb @@ -2,6 +2,7 @@ require 'rubygems/test_case' class TestGemResolverVendorSpecification < Gem::TestCase + def setup super @@ -78,4 +79,5 @@ 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 4d07887d36..172dd10316 100644 --- a/test/rubygems/test_gem_security.rb +++ b/test/rubygems/test_gem_security.rb @@ -11,6 +11,7 @@ if Gem.java_platform? end class TestGemSecurity < Gem::TestCase + CHILD_KEY = load_key 'child' ALTERNATE_CERT = load_cert 'child' @@ -309,4 +310,5 @@ 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 86100d7c74..d42724fe02 100644 --- a/test/rubygems/test_gem_security_policy.rb +++ b/test/rubygems/test_gem_security_policy.rb @@ -7,6 +7,7 @@ unless defined?(OpenSSL::SSL) end class TestGemSecurityPolicy < Gem::TestCase + ALTERNATE_KEY = load_key 'alternate' INVALID_KEY = load_key 'invalid' CHILD_KEY = load_key 'child' @@ -532,4 +533,5 @@ 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 050748a8b5..df1ffbac8a 100644 --- a/test/rubygems/test_gem_security_signer.rb +++ b/test/rubygems/test_gem_security_signer.rb @@ -6,6 +6,7 @@ unless defined?(OpenSSL::SSL) end class TestGemSecuritySigner < Gem::TestCase + ALTERNATE_KEY = load_key 'alternate' CHILD_KEY = load_key 'child' GRANDCHILD_KEY = load_key 'grandchild' @@ -214,4 +215,5 @@ 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 64871f7bd3..35c2d64362 100644 --- a/test/rubygems/test_gem_security_trust_dir.rb +++ b/test/rubygems/test_gem_security_trust_dir.rb @@ -6,6 +6,7 @@ unless defined?(OpenSSL::SSL) end class TestGemSecurityTrustDir < Gem::TestCase + CHILD_CERT = load_cert 'child' def setup @@ -95,4 +96,5 @@ 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 0e283da5a4..350a21d1d6 100644 --- a/test/rubygems/test_gem_server.rb +++ b/test/rubygems/test_gem_server.rb @@ -4,10 +4,13 @@ require 'rubygems/server' require 'stringio' class Gem::Server + attr_reader :server + end class TestGemServer < Gem::TestCase + def process_based_port 0 end @@ -605,4 +608,5 @@ 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 3c4811aad5..d49166ff6f 100644 --- a/test/rubygems/test_gem_silent_ui.rb +++ b/test/rubygems/test_gem_silent_ui.rb @@ -4,6 +4,7 @@ require 'rubygems/user_interaction' require 'timeout' class TestGemSilentUI < Gem::TestCase + def setup super @sui = Gem::SilentUI.new @@ -113,4 +114,5 @@ 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 599d490d95..72f0878bcc 100644 --- a/test/rubygems/test_gem_source.rb +++ b/test/rubygems/test_gem_source.rb @@ -4,6 +4,7 @@ require 'rubygems/source' require 'rubygems/indexer' class TestGemSource < Gem::TestCase + def tuple(*args) Gem::NameTuple.new(*args) end @@ -245,4 +246,5 @@ 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 1a0545a893..65b182890a 100644 --- a/test/rubygems/test_gem_source_fetch_problem.rb +++ b/test/rubygems/test_gem_source_fetch_problem.rb @@ -2,6 +2,7 @@ require 'rubygems/test_case' class TestGemSourceFetchProblem < Gem::TestCase + def test_exception source = Gem::Source.new @gem_repo error = RuntimeError.new 'test' @@ -23,4 +24,5 @@ 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 f5406d2215..393190c9f5 100644 --- a/test/rubygems/test_gem_source_git.rb +++ b/test/rubygems/test_gem_source_git.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/source' class TestGemSourceGit < Gem::TestCase + def setup super @@ -299,4 +300,5 @@ 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 93aa4eb039..1d14b1ccd2 100644 --- a/test/rubygems/test_gem_source_installed.rb +++ b/test/rubygems/test_gem_source_installed.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/source' class TestGemSourceInstalled < Gem::TestCase + def test_spaceship a1 = quick_gem 'a', '1' util_build_gem a1 @@ -31,4 +32,5 @@ 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 7c60af3ff8..0e3bcf9197 100644 --- a/test/rubygems/test_gem_source_list.rb +++ b/test/rubygems/test_gem_source_list.rb @@ -4,6 +4,7 @@ require 'rubygems/source_list' require 'rubygems/test_case' class TestGemSourceList < Gem::TestCase + def setup super @@ -115,4 +116,5 @@ 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 7417f8d111..c2d4d6cd10 100644 --- a/test/rubygems/test_gem_source_local.rb +++ b/test/rubygems/test_gem_source_local.rb @@ -5,6 +5,7 @@ require 'rubygems/source' require 'fileutils' class TestGemSourceLocal < Gem::TestCase + def setup super @@ -103,4 +104,5 @@ 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 8c55926d94..fcd290ef6c 100644 --- a/test/rubygems/test_gem_source_lock.rb +++ b/test/rubygems/test_gem_source_lock.rb @@ -2,6 +2,7 @@ require 'rubygems/test_case' class TestGemSourceLock < Gem::TestCase + def test_fetch_spec spec_fetcher do |fetcher| fetcher.spec 'a', 1 @@ -109,4 +110,5 @@ 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 003fbec81d..aaaa1602c7 100644 --- a/test/rubygems/test_gem_source_specific_file.rb +++ b/test/rubygems/test_gem_source_specific_file.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/source' class TestGemSourceSpecificFile < Gem::TestCase + def setup super @@ -72,4 +73,5 @@ 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 18a3f47f45..b9b078ea33 100644 --- a/test/rubygems/test_gem_source_vendor.rb +++ b/test/rubygems/test_gem_source_vendor.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/source' class TestGemSourceVendor < Gem::TestCase + def test_initialize source = Gem::Source::Vendor.new 'vendor/foo' @@ -26,4 +27,5 @@ 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 9c756aacf3..b141a5b7b5 100644 --- a/test/rubygems/test_gem_spec_fetcher.rb +++ b/test/rubygems/test_gem_spec_fetcher.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require 'rubygems/spec_fetcher' class TestGemSpecFetcher < Gem::TestCase + def tuple(*args) Gem::NameTuple.new(*args) end @@ -334,4 +335,5 @@ 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 f635be859b..9ea6990717 100644 --- a/test/rubygems/test_gem_specification.rb +++ b/test/rubygems/test_gem_specification.rb @@ -9,6 +9,7 @@ require 'rubygems/installer' require 'rubygems/platform' class TestGemSpecification < Gem::TestCase + LEGACY_YAML_SPEC = <<-EOF.freeze --- !ruby/object:Gem::Specification rubygems_version: "1.0" @@ -1836,6 +1837,7 @@ dependencies: [] RbConfig::CONFIG['ENABLE_SHARED'], 'no' class << Gem + alias orig_default_ext_dir_for default_ext_dir_for remove_method :default_ext_dir_for @@ -1843,6 +1845,7 @@ dependencies: [] def Gem.default_ext_dir_for(base_dir) 'elsewhere' end + end ext_spec @@ -1856,9 +1859,11 @@ 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 @@ -2148,9 +2153,11 @@ 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) @@ -2166,9 +2173,11 @@ 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 @@ -3927,4 +3936,5 @@ 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 ca6dbc6a8b..1326cd27ef 100644 --- a/test/rubygems/test_gem_stream_ui.rb +++ b/test/rubygems/test_gem_stream_ui.rb @@ -4,6 +4,7 @@ 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 @@ -221,4 +222,5 @@ 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 5a47fa520a..91a46d7842 100644 --- a/test/rubygems/test_gem_stub_specification.rb +++ b/test/rubygems/test_gem_stub_specification.rb @@ -3,6 +3,7 @@ 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" @@ -290,4 +291,5 @@ end return stub end end + end diff --git a/test/rubygems/test_gem_text.rb b/test/rubygems/test_gem_text.rb index d8e4b75f3a..43e8496f0c 100644 --- a/test/rubygems/test_gem_text.rb +++ b/test/rubygems/test_gem_text.rb @@ -3,6 +3,7 @@ require 'rubygems/test_case' require "rubygems/text" class TestGemText < Gem::TestCase + include Gem::Text def test_format_text @@ -93,4 +94,5 @@ 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 1c084c4c5d..9229fee842 100644 --- a/test/rubygems/test_gem_uninstaller.rb +++ b/test/rubygems/test_gem_uninstaller.rb @@ -3,6 +3,7 @@ require 'rubygems/installer_test_case' require 'rubygems/uninstaller' class TestGemUninstaller < Gem::InstallerTestCase + def setup super @installer = setup_base_installer @@ -664,4 +665,5 @@ 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 7950efb2a9..e68185ce25 100644 --- a/test/rubygems/test_gem_unsatisfiable_dependency_error.rb +++ b/test/rubygems/test_gem_unsatisfiable_dependency_error.rb @@ -2,6 +2,7 @@ require 'rubygems/test_case' class TestGemUnsatisfiableDependencyError < Gem::TestCase + def setup super @@ -27,4 +28,5 @@ 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 debc7739cb..b19bae9939 100644 --- a/test/rubygems/test_gem_uri_formatter.rb +++ b/test/rubygems/test_gem_uri_formatter.rb @@ -3,6 +3,7 @@ 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 @@ -23,4 +24,5 @@ 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 acf7ac8962..5866aa7b99 100644 --- a/test/rubygems/test_gem_util.rb +++ b/test/rubygems/test_gem_util.rb @@ -3,6 +3,7 @@ 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') @@ -85,4 +86,5 @@ 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 d4159d59e2..34b7e5fb37 100644 --- a/test/rubygems/test_gem_validator.rb +++ b/test/rubygems/test_gem_validator.rb @@ -4,6 +4,7 @@ require "rubygems/test_case" require "rubygems/validator" class TestGemValidator < Gem::TestCase + def setup super @@ -39,4 +40,5 @@ 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 7b382809c9..30b9376e30 100644 --- a/test/rubygems/test_gem_version.rb +++ b/test/rubygems/test_gem_version.rb @@ -5,6 +5,7 @@ require "rubygems/version" require "minitest/benchmark" class TestGemVersion < Gem::TestCase + class V < ::Gem::Version end @@ -297,4 +298,5 @@ 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 396fc6277c..a680c5154e 100644 --- a/test/rubygems/test_gem_version_option.rb +++ b/test/rubygems/test_gem_version_option.rb @@ -4,6 +4,7 @@ require 'rubygems/command' require 'rubygems/version_option' class TestGemVersionOption < Gem::TestCase + def setup super @@ -161,4 +162,5 @@ 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 0fa36a0dec..6c07347a9f 100644 --- a/test/rubygems/test_kernel.rb +++ b/test/rubygems/test_kernel.rb @@ -2,6 +2,7 @@ require 'rubygems/test_case' class TestKernel < Gem::TestCase + def setup super @@ -136,4 +137,5 @@ 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 831a2c00aa..ca14e3fbb4 100644 --- a/test/rubygems/test_project_sanity.rb +++ b/test/rubygems/test_project_sanity.rb @@ -4,6 +4,7 @@ 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__)) @@ -17,4 +18,5 @@ 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 29aaaa8adb..766086756e 100644 --- a/test/rubygems/test_remote_fetch_error.rb +++ b/test/rubygems/test_remote_fetch_error.rb @@ -2,6 +2,7 @@ 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 @@ -16,4 +17,5 @@ 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 2b6620cc65..d90c3e2744 100644 --- a/test/rubygems/test_require.rb +++ b/test/rubygems/test_require.rb @@ -3,7 +3,9 @@ require 'rubygems/test_case' require 'rubygems' class TestGemRequire < Gem::TestCase + class Latch + def initialize(count = 1) @count = count @lock = Monitor.new @@ -22,6 +24,7 @@ class TestGemRequire < Gem::TestCase @cv.wait_while { @count > 0 } end end + end def setup @@ -565,8 +568,10 @@ 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 @@ -577,7 +582,9 @@ class TestGemRequire < Gem::TestCase ensure silence_warnings do class << ::Gem + alias try_activate old_try_activate + end end Kernel::RUBYGEMS_ACTIVATION_MONITOR.exit @@ -733,4 +740,5 @@ class TestGemRequire < Gem::TestCase dash_i_lib_arg end + end |