diff options
| -rw-r--r-- | spec/bundler/spec_helper.rb | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/spec/bundler/spec_helper.rb b/spec/bundler/spec_helper.rb index cd87a65d54..37061ffb87 100644 --- a/spec/bundler/spec_helper.rb +++ b/spec/bundler/spec_helper.rb @@ -20,22 +20,13 @@ rescue LoadError abort "Run rake spec:deps to install development dependencies" end -if File.expand_path(__FILE__) =~ %r{([^\w/\.])} +if File.expand_path(__FILE__) =~ %r{([^\w/\.:\-])} abort "The bundler specs cannot be run from a path that contains special characters (particularly #{$1.inspect})" 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 +require "open3" Dir["#{File.expand_path("../support", __FILE__)}/*.rb"].each do |file| file = file.gsub(%r{\A#{Regexp.escape File.expand_path("..", __FILE__)}/}, "") |