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, 5 insertions, 5 deletions

diff --git a/test/rubygems/test_gem_ext_rake_builder.rb b/test/rubygems/test_gem_ext_rake_builder.rb
index b2dd7392c8..6b647293a8 100644
--- a/test/rubygems/test_gem_ext_rake_builder.rb
+++ b/test/rubygems/test_gem_ext_rake_builder.rb
@@ -25,8 +25,8 @@ class TestGemExtRakeBuilder < Gem::TestCase
       output = output.join "\n"
 
       refute_match %r%^rake failed:%, output
-      assert_match %r%^#{Regexp.escape @@ruby.shellescape} mkrf_conf\.rb%, output
-      assert_match %r%^#{Regexp.escape rake.shellsplit.shelljoin} RUBYARCHDIR\\=#{Regexp.escape @dest_path.shellescape} RUBYLIBDIR\\=#{Regexp.escape @dest_path.shellescape}%, output
+      assert_match %r%^#{Regexp.escape @@ruby} mkrf_conf\.rb%, output
+      assert_match %r%^#{Regexp.escape rake} RUBYARCHDIR\\=#{Regexp.escape @dest_path} RUBYLIBDIR\\=#{Regexp.escape @dest_path}%, output
     end
   end
 
@@ -46,8 +46,8 @@ class TestGemExtRakeBuilder < Gem::TestCase
       output = output.join "\n"
 
       refute_match %r%^rake failed:%, output
-      assert_match %r%^#{Regexp.escape @@ruby.shellescape} mkrf_conf\.rb%, output
-      assert_match %r%^#{Regexp.escape rake.shellsplit.shelljoin} RUBYARCHDIR\\=#{Regexp.escape @dest_path.shellescape} RUBYLIBDIR\\=#{Regexp.escape @dest_path.shellescape}%, output
+      assert_match %r%^#{Regexp.escape @@ruby} mkrf_conf\.rb%, output
+      assert_match %r%^#{Regexp.escape rake} RUBYARCHDIR\\=#{Regexp.escape @dest_path} RUBYLIBDIR\\=#{Regexp.escape @dest_path}%, output
     end
   end
 
@@ -62,7 +62,7 @@ class TestGemExtRakeBuilder < Gem::TestCase
       output = output.join "\n"
 
       refute_match %r%^rake failed:%, output
-      assert_match %r%^#{Regexp.escape rake.shellsplit.shelljoin} RUBYARCHDIR\\=#{Regexp.escape @dest_path.shellescape} RUBYLIBDIR\\=#{Regexp.escape @dest_path.shellescape} test1 test2%, output
+      assert_match %r%^#{Regexp.escape rake} RUBYARCHDIR\\=#{Regexp.escape @dest_path} RUBYLIBDIR\\=#{Regexp.escape @dest_path} test1 test2%, output
     end
   end