diff options
| author | Bundlerbot <bot@bundler.io> | 2018-10-16 03:08:58 +0000 |
|---|---|---|
| committer | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2018-11-10 18:12:01 +0000 |
| commit | ca4837445a672ae002c4bc0f5dceed31750423f9 (patch) | |
| tree | dbc5cf3fd8163de8a2d6c8f882604515ced5accd | |
| parent | 1ed33414488f358c946bcca44234641f8a4847d1 (diff) | |
| download | bundler-ca4837445a672ae002c4bc0f5dceed31750423f9.tar.gz | |
Merge #6740
6740: Removed win32-open3 workaround. r=colby-swandale a=hsbt
### What was the end-user problem that led to this PR?
`win32-open3` gem was required Ruby 1.8 with Windows environment. Because RubyInstaller2 only provides the version of Ruby 2.1+.
### What is your fix for the problem, implemented in this PR?
Removed needless workaround.
Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org>
(cherry picked from commit 6063718bc6c77b6a16621741f94866d6555f4cee)
| -rw-r--r-- | spec/spec_helper.rb | 11 | ||||
| -rw-r--r-- | spec/support/helpers.rb | 2 |
2 files changed, 2 insertions, 11 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 90a88fac5b..21a9a5a050 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -46,17 +46,6 @@ end require "bundler" -# Require the correct version of popen for the current platform -if RbConfig::CONFIG["host_os"] =~ /mingw|mswin/ - begin - require "win32/open3" - rescue LoadError - abort "Run `gem install win32-open3` to be able to run specs" - end -else - require "open3" -end - Dir["#{File.expand_path("../support", __FILE__)}/*.rb"].each do |file| file = file.gsub(%r{\A#{Regexp.escape File.expand_path("..", __FILE__)}/}, "") require file unless file.end_with?("hax.rb") diff --git a/spec/support/helpers.rb b/spec/support/helpers.rb index 4bc3cef0cf..d523234f70 100644 --- a/spec/support/helpers.rb +++ b/spec/support/helpers.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +require "open3" + module Spec module Helpers def reset! |