test: Naming and variable improvements

Author: hyperupcall

tests/util/init.sh

@@ -18,15 +18,15 @@ export BPM_ORIGIN_DIR="$BPM_TEST_DIR/origin"
 export BPM_IS_TEST=
 
 # Stub common variables
+test_util.get_repo_root
+export BPM_ROOT="${REPLY%/*}"
 export PROGRAM_LIB_DIR="$BPM_ROOT/source/pkg/lib"
-test_util.get_bpm_root
-export BPM_ROOT="$REPLY"
 export BPM_PREFIX="$BPM_TEST_DIR/cellar"
 export BPM_PACKAGES_PATH="$BPM_PREFIX/packages"
 export BPM_INSTALL_BIN="$BPM_PREFIX/bin"
 export BPM_INSTALL_MAN="$BPM_PREFIX/man"
 export BPM_INSTALL_COMPLETIONS="$BPM_PREFIX/completions"
-export BPM_MODE='global' # normal default is 'local'
+export BPM_MODE='global' # for non-tests, the default is 'local'
 
 export PATH="$BPM_ROOT/source/pkg/bin:$PATH"
 for f in "$BPM_ROOT"/source/pkg/lib/{commands,util}/?*.sh; do

tests/util/test_util.sh

@@ -1,7 +1,7 @@
 # shellcheck shell=bash
 # shellcheck disable=SC2164
 
-test_util.get_bpm_root() {
+test_util.get_repo_root() {
 	REPLY=
 	if ! REPLY="$(
 		while [[ ! -d ".git" && "$PWD" != / ]]; do
@@ -16,12 +16,6 @@ test_util.get_bpm_root() {
 			exit 1
 		fi
 
-		# BPM root is the parent directory of 'source', which holds
-		# the Git repository
-		if ! cd ..; then
-			printf "%s\n" "Error: Could not cd to BPM directory" >&2
-			exit 1
-		fi
 		printf "%s" "$PWD"
 	)"; then
 		exit 1