From b8885e4fe2550f8fb71c0ecaf6c755f454ec0d93 Mon Sep 17 00:00:00 2001
From: "Yamashita, Yuu" <peek824545201@gmail.com>
Date: Tue, 2 Aug 2016 00:23:47 +0000
Subject: [PATCH] Keep using original PATH ordering in `test_helper`

---
 test/prefix.bats      | 9 +++++----
 test/test_helper.bash | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/test/prefix.bats b/test/prefix.bats
index 1bad28dd..c0f73627 100644
--- a/test/prefix.bats
+++ b/test/prefix.bats
@@ -25,12 +25,13 @@ load test_helper
 }
 
 @test "prefix for system in /" {
-  mkdir -p "${PYENV_TEST_DIR}/bin"
-  touch "${PYENV_TEST_DIR}/bin/pyenv-which"
-  echo "echo /bin/python" >"${PYENV_TEST_DIR}/bin/pyenv-which"
-  chmod +x "${PYENV_TEST_DIR}/bin/pyenv-which"
+  mkdir -p "${BATS_TEST_DIRNAME}/libexec"
+  touch "${BATS_TEST_DIRNAME}/libexec/pyenv-which"
+  echo "echo /bin/python" >"${BATS_TEST_DIRNAME}/libexec/pyenv-which"
+  chmod +x "${BATS_TEST_DIRNAME}/libexec/pyenv-which"
   PYENV_VERSION="system" run pyenv-prefix
   assert_success "/"
+  rm -f "${BATS_TEST_DIRNAME}/libexec/pyenv-which"
 }
 
 @test "prefix for invalid system" {
diff --git a/test/test_helper.bash b/test/test_helper.bash
index 94e36168..e11cd8f1 100644
--- a/test/test_helper.bash
+++ b/test/test_helper.bash
@@ -20,10 +20,10 @@ if [ -z "$PYENV_TEST_DIR" ]; then
   export PYENV_HOOK_PATH="${PYENV_ROOT}/pyenv.d"
 
   PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
+  PATH="${PYENV_TEST_DIR}/bin:$PATH"
   PATH="${BATS_TEST_DIRNAME}/../libexec:$PATH"
   PATH="${BATS_TEST_DIRNAME}/libexec:$PATH"
   PATH="${PYENV_ROOT}/shims:$PATH"
-  PATH="${PYENV_TEST_DIR}/bin:$PATH"
   export PATH
 
   for xdg_var in `env 2>/dev/null | grep ^XDG_ | cut -d= -f1`; do unset "$xdg_var"; done