From e5ffdc6f161fc9616efc760a144c017bfc4bdc78 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Sat, 24 May 2014 11:46:48 +0100
Subject: [PATCH] A few further tweaks to how path handling in tests

---
 test/lib/env-test.sh     | 13 ++++++++++---
 test/lib/runtime-test.sh |  2 +-
 test/test-helper.sh      |  5 ++++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/test/lib/env-test.sh b/test/lib/env-test.sh
index a1766ad..0caf1c0 100755
--- a/test/lib/env-test.sh
+++ b/test/lib/env-test.sh
@@ -5,22 +5,29 @@ source "../test-helper.sh"
 # env.sh tests.
 #
 
+# Setup.
+realTMUXIFIER="$TMUXIFIER"
+TMUXIFER="/path/to/tmuxifier"
+
 # When TMUXIFIER_LAYOUT_PATH is not set.
-source "../../lib/env.sh"
+source "${root}/lib/env.sh"
 assert 'echo $TMUXIFIER_LAYOUT_PATH' "${TMUXIFIER}/layouts"
 
 # When TMUXIFIER_LAYOUT_PATH is set and has a trailing slash.
 TMUXIFIER_LAYOUT_PATH="/path/to/layouts/"
-source "../../lib/env.sh"
+source "${root}/lib/env.sh"
 assert 'echo $TMUXIFIER_LAYOUT_PATH' "/path/to/layouts"
 unset TMUXIFIER_LAYOUT_PATH
 
 # When TMUXIFIER_LAYOUT_PATH is set and does not have a trailing slash.
 TMUXIFIER_LAYOUT_PATH="/path/to/layouts"
-source "../../lib/env.sh"
+source "${root}/lib/env.sh"
 assert 'echo $TMUXIFIER_LAYOUT_PATH' "/path/to/layouts"
 unset TMUXIFIER_LAYOUT_PATH
 
+# Tear down.
+TMUXIFER="$realTMUXIFIER"
+unset realTMUXIFIER
 
 # End of tests.
 assert_end "env.sh"
diff --git a/test/lib/runtime-test.sh b/test/lib/runtime-test.sh
index a32ac7b..06d5a68 100755
--- a/test/lib/runtime-test.sh
+++ b/test/lib/runtime-test.sh
@@ -5,7 +5,7 @@ source "../test-helper.sh"
 # runtime.sh tests.
 #
 
-source "../../lib/runtime.sh"
+source "${root}/lib/runtime.sh"
 
 # We assume env.sh has been sourced if $TMUXIFIER_LAYOUT_PATH has been set.
 assert 'echo $TMUXIFIER_LAYOUT_PATH' "${TMUXIFIER}/layouts"
diff --git a/test/test-helper.sh b/test/test-helper.sh
index 4f12dfd..39d09e6 100644
--- a/test/test-helper.sh
+++ b/test/test-helper.sh
@@ -21,8 +21,11 @@ abs_dirname() {
 # Set testroot variable.
 testroot="$(abs_dirname "$BASH_SOURCE")"
 
+# Set root variable.
+root="$(abs_dirname "$testroot/../..")"
+
 # Set TMUXIFIER environment variable
-TMUXIFIER="$(abs_dirname "$testroot/../..")"
+TMUXIFIER="$root"
 
 # Unset various Tmuxifier environment variables to prevent a local install of
 # Tmuxifier interfering with tests.