mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
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
This commit is contained in:
parent
2f023c5dba
commit
5335ce0e06
247 changed files with 1290 additions and 1363 deletions
|
@ -48,7 +48,7 @@ class TestGemCommandsHelpCommand < Gem::TestCase
|
|||
assert_match(/\s+#{cmd}\s+\S+/, out)
|
||||
end
|
||||
|
||||
if defined?(OpenSSL::SSL) then
|
||||
if defined?(OpenSSL::SSL)
|
||||
assert_empty err
|
||||
|
||||
refute_match 'No command found for ', out
|
||||
|
@ -64,7 +64,7 @@ class TestGemCommandsHelpCommand < Gem::TestCase
|
|||
end
|
||||
end
|
||||
|
||||
def util_gem *args
|
||||
def util_gem(*args)
|
||||
@cmd.options[:args] = args
|
||||
|
||||
use_ui @ui do
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue