diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2019-06-01 12:49:40 +0300 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2019-06-09 12:44:10 +0900 |
| commit | 8f37629519ad330032a38ac0e871b2912ed38a1b (patch) | |
| tree | bb0529b77583d47993d8b0d608d68896aa3a5298 /spec/bundler/support/helpers.rb | |
| parent | 66508992483ae5d77b56a98427c50c772341c0ac (diff) | |
| download | ruby-8f37629519ad330032a38ac0e871b2912ed38a1b.tar.gz | |
Merge bundler master from upstream.
Pick from 8dd59e3ba97eb80a599f8149f31bf40773b69dc0
Diffstat (limited to 'spec/bundler/support/helpers.rb')
| -rw-r--r-- | spec/bundler/support/helpers.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/bundler/support/helpers.rb b/spec/bundler/support/helpers.rb index 09e7419a98..478fe60822 100644 --- a/spec/bundler/support/helpers.rb +++ b/spec/bundler/support/helpers.rb @@ -45,13 +45,13 @@ module Spec end def err - Bundler.feature_flag.error_on_stderr? ? last_command.stderr : last_command.stdout + last_command.stderr end MAJOR_DEPRECATION = /^\[DEPRECATED\]\s*/.freeze def err_without_deprecations - last_command.stderr.gsub(/#{MAJOR_DEPRECATION}.+[\n]?/, "") + err.gsub(/#{MAJOR_DEPRECATION}.+[\n]?/, "") end def deprecations |