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_request.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'test/rubygems/test_gem_request.rb') diff --git a/test/rubygems/test_gem_request.rb b/test/rubygems/test_gem_request.rb index 1409acb23b..8b475fae42 100644 --- a/test/rubygems/test_gem_request.rb +++ b/test/rubygems/test_gem_request.rb @@ -4,7 +4,7 @@ require 'rubygems/request' require 'ostruct' require 'base64' -unless defined?(OpenSSL::SSL) then +unless defined?(OpenSSL::SSL) warn 'Skipping Gem::Request tests. openssl not found.' end @@ -17,7 +17,7 @@ class TestGemRequest < Gem::TestCase PUBLIC_CERT_FILE = cert_path 'public' SSL_CERT = load_cert 'ssl' - def make_request uri, request_class, last_modified, proxy + def make_request(uri, request_class, last_modified, proxy) Gem::Request.create_with_proxy uri, request_class, last_modified, proxy end @@ -465,7 +465,7 @@ ERROR: Certificate is an invalid CA certificate @orig_RUBY_REVISION = RUBY_REVISION if defined? RUBY_REVISION end - def util_stub_net_http hash + def util_stub_net_http(hash) old_client = Gem::Request::ConnectionPools.client conn = Conn.new OpenStruct.new(hash) Gem::Request::ConnectionPools.client = conn @@ -477,7 +477,7 @@ ERROR: Certificate is an invalid CA certificate class Conn attr_accessor :payload - def new *args; self; end + def new(*args); self; end def use_ssl=(bool); end def verify_callback=(setting); end def verify_mode=(setting); end -- cgit v1.2.3