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

1 files changed, 4 insertions, 5 deletions

diff --git a/test/rubygems/test_gem_security_policy.rb b/test/rubygems/test_gem_security_policy.rb
index 6cd032baf5..0012d188cf 100644
--- a/test/rubygems/test_gem_security_policy.rb
+++ b/test/rubygems/test_gem_security_policy.rb
@@ -3,7 +3,7 @@
 
 require 'rubygems/test_case'
 
-unless defined?(OpenSSL::SSL) then
+unless defined?(OpenSSL::SSL)
   warn 'Skipping Gem::Security::Policy tests.  openssl not found.'
 end
 
@@ -518,17 +518,17 @@ class TestGemSecurityPolicy < Gem::TestCase
     end
   end
 
-  def digest data
+  def digest(data)
     digester = @digest.new
     digester << data
     digester
   end
 
-  def sign data, key = PRIVATE_KEY
+  def sign(data, key = PRIVATE_KEY)
     key.sign @digest.new, data.digest
   end
 
-  def dummy_signatures key = PRIVATE_KEY
+  def dummy_signatures(key = PRIVATE_KEY)
     data = digest 'hello'
 
     digests    = { Gem::Security::DIGEST_NAME => { 0 => data } }
@@ -538,4 +538,3 @@ class TestGemSecurityPolicy < Gem::TestCase
   end
 
 end if defined?(OpenSSL::SSL)
-