test: Fix getting root bpm directory for test

Author: hyperupcall

tests/do-upgrade.bats

@@ -126,7 +126,7 @@ load 'util/init.sh'
 	run do-upgrade 'bpm'
 
 	assert_success
-	assert_line -e 'git -C /(.*)/tests/../pkg/lib/../.. pull'
+	assert_line -e 'git -C /(.*)/bpm/source/pkg/lib/../.. pull'
 }
 
 @test "upgrade bpm fails when mixing package names" {

tests/util/init.sh

@@ -7,26 +7,29 @@ load 'vendor/bats-core/load'
 load 'vendor/bats-assert/load'
 load 'util/test_util.sh'
 
-export BPM_TEST_DIR="$BATS_TMPDIR/bpm"
-export BPM_CWD="$BPM_TEST_DIR/cwd"
-export BPM_ORIGIN_DIR="$BPM_TEST_DIR/origin"
-export BPM_MODE_TEST=
-
 export LANG="C"
 export LANGUAGE="C"
 export LC_ALL="C"
 export XDG_DATA_HOME=
-export PATH="$BPM_ROOT/pkg/bin:$PATH" # TODO
 
-export PROGRAM_LIB_DIR="$BATS_TEST_DIRNAME/../pkg/lib"
-export BPM_ROOT="$BATS_TEST_DIRNAME/.."
+# Test-specific
+export BPM_TEST_DIR="$BATS_TMPDIR/bpm"
+export BPM_CWD="$BPM_TEST_DIR/cwd"
+export BPM_ORIGIN_DIR="$BPM_TEST_DIR/origin"
+export BPM_MODE_TEST=
+
+# Stub common variables
+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 PROGRAM_LIB_DIR="$BPM_ROOT/source/pkg/lib"
 
-for f in "$BPM_ROOT"/pkg/lib/{commands,util}/?*.sh; do
+export PATH="$BPM_ROOT/source/pkg/bin:$PATH"
+for f in "$BPM_ROOT"/source/pkg/lib/{commands,util}/?*.sh; do
 	source "$f"
 done
 

tests/util/test_util.sh

@@ -1,6 +1,33 @@
 # shellcheck shell=bash
 # shellcheck disable=SC2164
 
+test_util.get_bpm_root() {
+	REPLY=
+	if ! REPLY="$(
+		while [[ ! -d ".git" && "$PWD" != / ]]; do
+			if ! cd ..; then
+				printf "%s\n" "Error: Could not cd to BPM directory"
+				exit 1
+			fi
+		done
+
+		if [[ $PWD == / ]]; then
+			printf "%s\n" "Error: Could not find root BPM directory"
+			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"
+			exit 1
+		fi
+		printf "%s" "$PWD"
+	)"; then
+		exit 1
+	fi
+}
+
 # @description This stubs a command by creating a function for it, which
 # prints the command name and its arguments
 test_util.stub_command() {
@@ -16,7 +43,7 @@ test_util.mock_clone() {
 	ensure.non_zero 'destDir' "$destDir"
 
 	# Be explicit with the 'file' protocol. The upstream "repository"
-	# is just another (non-bare) Git repository. By default, packages are usually
+	# is just another (non-bare) Git repository
 	git clone "file://$BPM_ORIGIN_DIR/$srcDir" "$BPM_PACKAGES_PATH/$destDir"
 }