From ccb613df69980c31bdae9acc5a3cd64a644f1fa2 Mon Sep 17 00:00:00 2001
From: Baptiste Fontaine <batifon@yahoo.fr>
Date: Fri, 14 Aug 2015 23:23:52 +0200
Subject: [PATCH] which: tests added

Closes Homebrew/homebrew#42954.

Signed-off-by: Baptiste Fontaine <batifon@yahoo.fr>
---
 Library/Homebrew/test/test_utils.rb | 37 +++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/Library/Homebrew/test/test_utils.rb b/Library/Homebrew/test/test_utils.rb
index 07bb65c901..9dc2830845 100644
--- a/Library/Homebrew/test/test_utils.rb
+++ b/Library/Homebrew/test/test_utils.rb
@@ -1,11 +1,48 @@
 require "testing_env"
+require "tempfile"
 
 class UtilTests < Homebrew::TestCase
+
+  def setup
+    @dir = Pathname.new(mktmpdir)
+  end
+
+  def teardown
+    @dir.rmtree
+  end
+
   def test_put_columns_empty
     # Issue #217 put columns with new results fails.
     assert_silent { puts_columns [] }
   end
 
+  def test_which
+    cmd = @dir/"foo"
+    FileUtils.touch cmd
+    cmd.chmod 0744
+    assert_equal Pathname.new(cmd),
+      which(File.basename(cmd), File.dirname(cmd))
+  end
+
+  def test_which_skip_non_executables
+    cmd = @dir/"foo"
+    FileUtils.touch cmd
+    assert_nil which(File.basename(cmd), File.dirname(cmd))
+  end
+
+  def test_which_skip_malformed_path
+    # 'which' should not fail if a path is malformed
+    # see https://github.com/Homebrew/homebrew/issues/32789 for an example
+    cmd = @dir/"foo"
+    FileUtils.touch cmd
+    cmd.chmod 0744
+
+    # ~~ will fail because ~foo resolves to foo's home and there is no '~' user
+    # here
+    assert_equal Pathname.new(cmd),
+      which(File.basename(cmd), "~~#{File::PATH_SEPARATOR}#{File.dirname(cmd)}")
+  end
+
   def test_popen_read
     out = Utils.popen_read("/bin/sh", "-c", "echo success").chomp
     assert_equal "success", out