From 8b043038b81c55427d4de8595efe57624f9deffa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mislav=20Marohni=C4=87?= <mislav.marohnic@gmail.com>
Date: Thu, 20 Jun 2013 20:38:07 +0200
Subject: [PATCH] ensure cleaner PATH in test environment

---
 test/test_helper.bash | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/test/test_helper.bash b/test/test_helper.bash
index 75912f14..01d9fb99 100644
--- a/test/test_helper.bash
+++ b/test/test_helper.bash
@@ -1,14 +1,20 @@
-RBENV_TEST_DIR="${BATS_TMPDIR}/rbenv"
-export RBENV_ROOT="${RBENV_TEST_DIR}/root"
-export HOME="${RBENV_TEST_DIR}/home"
-
 unset RBENV_VERSION
 unset RBENV_DIR
 
-export PATH="${RBENV_TEST_DIR}/bin:$PATH"
-export PATH="${BATS_TEST_DIRNAME}/../libexec:$PATH"
-export PATH="${BATS_TEST_DIRNAME}/libexec:$PATH"
-export PATH="${RBENV_ROOT}/shims:$PATH"
+RBENV_TEST_DIR="${BATS_TMPDIR}/rbenv"
+
+# guard against executing this block twice due to bats internals
+if [ "$RBENV_ROOT" != "${RBENV_TEST_DIR}/root" ]; then
+  export RBENV_ROOT="${RBENV_TEST_DIR}/root"
+  export HOME="${RBENV_TEST_DIR}/home"
+
+  PATH=/usr/bin:/bin:/usr/sbin:/sbin
+  PATH="${RBENV_TEST_DIR}/bin:$PATH"
+  PATH="${BATS_TEST_DIRNAME}/../libexec:$PATH"
+  PATH="${BATS_TEST_DIRNAME}/libexec:$PATH"
+  PATH="${RBENV_ROOT}/shims:$PATH"
+  export PATH
+fi
 
 teardown() {
   rm -rf "$RBENV_TEST_DIR"
@@ -18,7 +24,7 @@ flunk() {
   { if [ "$#" -eq 0 ]; then cat -
     else echo "$@"
     fi
-  } | sed "s:${RBENV_TEST_DIR}:TEST_DIR:" >&2
+  } | sed "s:${RBENV_TEST_DIR}:TEST_DIR:g" >&2
   return 1
 }