From 5335ce0e060c7a2a0b01c57f8f8a64254f2658e1 Mon Sep 17 00:00:00 2001 From: hsbt Date: Wed, 21 Nov 2018 10:20:47 +0000 Subject: Merge master branch from rubygems/rubygems upstream. * Enable Style/MethodDefParentheses in Rubocop https://github.com/rubygems/rubygems/pull/2478 * Enable Style/MultilineIfThen in Rubocop https://github.com/rubygems/rubygems/pull/2479 * Fix required_ruby_version with prereleases and improve error message https://github.com/rubygems/rubygems/pull/2344 * Fix bundler rubygems binstub not properly looking for bundler https://github.com/rubygems/rubygems/pull/2426 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65904 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/rubygems/test_gem_platform.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'test/rubygems/test_gem_platform.rb') diff --git a/test/rubygems/test_gem_platform.rb b/test/rubygems/test_gem_platform.rb index c9abd08868..fc8b7030fb 100644 --- a/test/rubygems/test_gem_platform.rb +++ b/test/rubygems/test_gem_platform.rb @@ -117,7 +117,7 @@ class TestGemPlatform < Gem::TestCase assert_equal expected, platform.to_a, 'i386-mswin32 VC6' ensure - if orig_RUBY_SO_NAME then + if orig_RUBY_SO_NAME RbConfig::CONFIG['RUBY_SO_NAME'] = orig_RUBY_SO_NAME else RbConfig::CONFIG.delete 'RUBY_SO_NAME' @@ -145,7 +145,7 @@ class TestGemPlatform < Gem::TestCase end def test_to_s - if win_platform? then + if win_platform? assert_equal 'x86-mswin32-60', Gem::Platform.local.to_s else assert_equal 'x86-darwin-8', Gem::Platform.local.to_s @@ -297,12 +297,11 @@ class TestGemPlatform < Gem::TestCase assert_local_match 'sparc-solaris2.8-mq5.3' end - def assert_local_match name + def assert_local_match(name) assert_match Gem::Platform.local, name end - def refute_local_match name + def refute_local_match(name) refute_match Gem::Platform.local, name end end - -- cgit v1.2.3