diff options
| author | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2018-10-16 10:37:53 +0900 |
|---|---|---|
| committer | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2018-10-16 10:39:54 +0900 |
| commit | 0bc55baf1f0dea6dfb549cf158ab9b4a47945bc1 (patch) | |
| tree | 8bf9f60dfaabf8cb74c2e356891f4c1336834ddb | |
| parent | 27e88538960817a64a510f840c810654f1a7fa3e (diff) | |
| download | bundler-0bc55baf1f0dea6dfb549cf158ab9b4a47945bc1.tar.gz | |
Removed win32-open3 workaround.
win32-open3 gem was required Ruby 1.8 with Windows environment.
Because RubyInstaller2 only provides the version of Ruby 2.1+.
| -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 228b9e5aa3..b5fb79ec5d 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -34,17 +34,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 d64b3923d5..d14ac20cae 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! |