Merge pull request #5180 from sjackman/needs-svn

test/spec_helper: Fix :needs_svn
2018-10-25 14:15:42 -07:00 · 2018-10-25 14:15:42 -07:00 · b1a4ed04c4
commit b1a4ed04c4
parent c573408a65 a7ad7eee78
1 changed files with 4 additions and 1 deletions
--- a/Library/Homebrew/test/spec_helper.rb
+++ b/Library/Homebrew/test/spec_helper.rb
@ -98,7 +98,10 @@ RSpec.configure do |config|
  end

  config.before(:each, :needs_svn) do
-    skip "subversion not installed." unless which "svn"
+    homebrew_bin = File.dirname HOMEBREW_BREW_FILE
+    unless %W[/usr/bin/svn #{homebrew_bin}/svn].map { |x| File.executable?(x) }.any?
+      skip "subversion not installed."
+    end
  end

  config.before(:each, :needs_unzip) do