From 014c102b71e026b2c67dd2686583c3aba99ef9a6 Mon Sep 17 00:00:00 2001
From: John D Pell <John+Git@gaelicWizard.net>
Date: Sun, 30 Jan 2022 16:31:01 -0800
Subject: [PATCH 01/23] BATS: revamp test `setup()` and `setup_test_fixture()`

---
 clean_files.txt            |   1 -
 test/run                   |  18 ++--
 test/test_helper.bash      | 182 ++++++++++++++++++++-----------------
 test/test_helper_libs.bash |   8 --
 4 files changed, 109 insertions(+), 100 deletions(-)
 mode change 100755 => 100644 test/test_helper.bash
 delete mode 100644 test/test_helper_libs.bash

diff --git a/clean_files.txt b/clean_files.txt
index 54180c19..07417266 100644
--- a/clean_files.txt
+++ b/clean_files.txt
@@ -137,7 +137,6 @@ plugins/available/zoxide.plugin.bash
 test/plugins/alias-completion.plugin.bats
 test/run
 test/test_helper.bash
-test/test_helper_libs.bash
 
 # themes
 #
diff --git a/test/run b/test/run
index 14d83950..91732a3b 100755
--- a/test/run
+++ b/test/run
@@ -2,17 +2,23 @@
 test_directory="$(cd "$(dirname "$0")" && pwd)"
 bats_executable="${test_directory}/../test_lib/bats-core/bin/bats"
 
+# Locate ourselves for easy reference.
+export MAIN_BASH_IT_DIR="${test_directory%/*}"
+export MAIN_BASH_IT_GITDIR="${MAIN_BASH_IT_DIR}/.git"
+
+# Make sure BATS is available:
 git submodule init && git submodule update
 
-if [[ -z "${BASH_IT}" ]]; then
-	BASH_IT="$(cd "${test_directory}" && dirname "${PWD}")"
-	export BASH_IT
+# Warn user that tests run from the current git HEAD
+if ! git diff --quiet; then
+	echo "${BASH_SOURCE##*/}: your worktree is dirty; uncommitted changes will *not* be tested!"
 fi
 
-if [[ -z "$1" ]]; then
+# Which tests do we run?
+if [[ $# -eq '0' ]]; then
 	test_dirs=("${test_directory}"/{bash_it,completion,install,lib,plugins,themes})
 else
-	test_dirs=("$1")
+	test_dirs=("$@")
 fi
 
 # Make sure that the `parallel` command is installed,
@@ -41,5 +47,5 @@ if command -v parallel &> /dev/null \
 		"${test_dirs[@]}"
 else
 	# Run `bats` in single-threaded mode.
-	exec "$bats_executable" ${CI:+--tap} "${test_dirs[@]}"
+	exec "$bats_executable" "${CI:+--tap}" "${test_dirs[@]}"
 fi
diff --git a/test/test_helper.bash b/test/test_helper.bash
old mode 100755
new mode 100644
index 06660979..919e7559
--- a/test/test_helper.bash
+++ b/test/test_helper.bash
@@ -1,105 +1,117 @@
-#!/usr/bin/env bats
-load "${BASH_IT}/vendor/github.com/erichs/composure/composure.sh"
+# shellcheck shell=bash
 
-unset BASH_IT_THEME
-unset GIT_HOSTING
-unset NGINX_PATH
-unset IRC_CLIENT
-unset TODO
-unset SCM_CHECK
-unset BASH_IT_AUTOMATIC_RELOAD_AFTER_CONFIG_CHANGE
-
-export TEST_MAIN_DIR="${BATS_TEST_DIRNAME}/.."
-export TEST_DEPS_DIR="${TEST_DEPS_DIR-${TEST_MAIN_DIR}/../test_lib}"
-
-# be independent of git's system configuration
-export GIT_CONFIG_NOSYSTEM
-
-load "${TEST_DEPS_DIR}/bats-support/load.bash"
-load "${TEST_DEPS_DIR}/bats-assert/load.bash"
-load "${TEST_DEPS_DIR}/bats-file/load.bash"
-
-# support 'plumbing' metadata
-cite _about _param _example _group _author _version
-cite about-alias about-plugin about-completion
-
-local_setup() {
-	true
+function setup_file() {
+	common_setup_file
 }
 
-local_teardown() {
-	true
-}
+function common_setup_file() {
+	# export *everything* to subshells, needed to support tests
+	set -a
 
-# This function sets up a local test fixture, i.e. a completely
-# fresh and isolated Bash-it directory. This is done to avoid
-# messing with your own Bash-it source directory.
-# If you need this, call it in your .bats file's `local_setup` function.
-setup_test_fixture() {
-	mkdir -p "$BASH_IT"
-	lib_directory="$(cd "$(dirname "$0")" && pwd)"
-	local src_topdir="$lib_directory/../../../.."
+	# Locate ourselves for easy reference.
+	TEST_MAIN_DIR="${MAIN_BASH_IT_DIR:-${BATS_TEST_DIRNAME?}/../..}/test"
+	TEST_DEPS_DIR="${MAIN_BASH_IT_DIR:-${TEST_MAIN_DIR}/..}/test_lib"
 
-	if command -v rsync &> /dev/null; then
-		# Use rsync to copy Bash-it to the temp folder
-		rsync -qavrKL -d --delete-excluded --exclude=.git --exclude=helper.bash --exclude=enabled "$src_topdir" "$BASH_IT"
-	else
-		rm -rf "$BASH_IT"
-		mkdir -p "$BASH_IT"
+	# Load the BATS modules we use:
+	load "${TEST_DEPS_DIR}/bats-support/load.bash"
+	load "${TEST_DEPS_DIR}/bats-assert/load.bash"
+	load "${TEST_DEPS_DIR}/bats-file/load.bash"
 
-		find "$src_topdir" \
-			-mindepth 1 -maxdepth 1 \
-			-not -name .git \
-			-exec cp -r {} "$BASH_IT" \;
-	fi
-
-	rm -rf "$BASH_IT"/enabled
-	rm -rf "$BASH_IT"/aliases/enabled
-	rm -rf "$BASH_IT"/completion/enabled
-	rm -rf "$BASH_IT"/plugins/enabled
-
-	mkdir -p "$BASH_IT"/enabled
-	mkdir -p "$BASH_IT"/aliases/enabled
-	mkdir -p "$BASH_IT"/completion/enabled
-	mkdir -p "$BASH_IT"/plugins/enabled
-
-	# Some tests use the BASH_IT_TEST_HOME variable, e.g. install/uninstall
-	export BASH_IT_TEST_HOME="$TEST_TEMP_DIR"
-}
-
-setup() {
-	# The `temp_make` function from "bats-file" requires the tralston/bats-file fork,
-	# since the original ztombol/bats-file's `temp_make` does not work on macOS.
-	TEST_TEMP_DIR="$(temp_make --prefix 'bash-it-test-')"
-	export TEST_TEMP_DIR
-
-	export BASH_IT_TEST_DIR="${TEST_TEMP_DIR}/.bash_it"
-
-	export BASH_IT_ROOT="${BASH_IT_TEST_DIR}/root"
-	export BASH_IT=$BASH_IT_TEST_DIR
-
-	mkdir -p -- "${BASH_IT_ROOT}"
+	# shellcheck disable=SC2034 # Clear any inherited environment:
+	XDG_DUMMY="" BASH_IT_DUMMY=""    # avoid possible invalid reference:
+	unset "${!XDG_@}" "${!BASH_IT@}" # unset all BASH_IT* and XDG_* variables
+	unset GIT_HOSTING NGINX_PATH IRC_CLIENT TODO SCM_CHECK
 
 	# Some tools, e.g. `git` use configuration files from the $HOME directory,
-	# which interferes with our tests. The only way to keep `git` from doing this
-	# seems to set HOME explicitly to a separate location.
+	# which interferes with our tests. The only way to keep `git` from doing
+	# this seems to set HOME explicitly to a separate location.
 	# Refer to https://git-scm.com/docs/git-config#FILES.
-	unset XDG_CONFIG_HOME
-	export HOME="${TEST_TEMP_DIR}"
+	readonly HOME="${BATS_SUITE_TMPDIR?}"
 	mkdir -p "${HOME}"
 
 	# For `git` tests to run well, user name and email need to be set.
 	# Refer to https://git-scm.com/docs/git-commit#_commit_information.
 	# This goes to the test-specific config, due to the $HOME overridden above.
-	git config --global user.name "John Doe"
-	git config --global user.email "johndoe@example.com"
+	git config --global user.name "Bash It BATS Runner"
+	git config --global user.email "bats@bash.it"
+	git config --global advice.detachedHead false
+	git config --global init.defaultBranch "master"
 
+	# Locate the temporary folder, avoid double-slash.
+	BASH_IT="${BATS_FILE_TMPDIR//\/\///}/.bash_it"
+
+	# This sets up a local test fixture, i.e. a completely fresh and isolated Bash-it directory. This is done to avoid messing with your own Bash-it source directory.
+	git --git-dir="${MAIN_BASH_IT_GITDIR?}" worktree add -d "${BASH_IT}"
+
+	load "${BASH_IT?}/vendor/github.com/erichs/composure/composure.sh"
+	# support 'plumbing' metadata
+	cite _about _param _example _group _author _version
+	cite about-alias about-plugin about-completion
+
+	# Run any local test setup
+	local_setup_file
+	set +a # not needed, but symetiric!
+}
+
+# Load standard _Bash It_ libraries
+function setup_libs() {
+	local lib
+	# Use a loop to allow convenient short-circuiting for some test files
+	for lib in "log" "utilities" "helpers" "search" "preexec" "colors"; do
+		load "${BASH_IT?}/lib/${lib}.bash" || return
+		# shellcheck disable=SC2015 # short-circuit if we've reached the requested library
+		[[ "${lib}" == "${1:-}" ]] && return 0 || true
+	done
+	return 0
+}
+
+function local_setup_file() {
+	true
+}
+
+function local_setup() {
+	true
+}
+
+function local_teardown() {
+	true
+}
+
+function clean_test_fixture() {
+	rm -rf "${BASH_IT_CONFIG?}/enabled"
+	rm -rf "${BASH_IT_CONFIG?}/aliases/enabled"
+	rm -rf "${BASH_IT_CONFIG?}/completion/enabled"
+	rm -rf "${BASH_IT_CONFIG?}/plugins/enabled"
+
+	rm -rf "${BASH_IT_CONFIG?}/tmp/cache"
+	rm -rf "${BASH_IT_CONFIG?}/profiles"/test*.bash_it
+}
+
+function setup_test_fixture() {
+	mkdir -p "${BASH_IT_CONFIG?}/enabled"
+	mkdir -p "${BASH_IT_CONFIG?}/aliases/enabled"
+	mkdir -p "${BASH_IT_CONFIG?}/completion/enabled"
+	mkdir -p "${BASH_IT_CONFIG?}/plugins/enabled"
+}
+
+function setup() {
+	# be independent of git's system configuration
+	export GIT_CONFIG_NOSYSTEM
+	# Locate the temporary folder:
+	BASH_IT_CONFIG="${BASH_IT?}" #"${BATS_TEST_TMPDIR//\/\///}"
+	export XDG_CACHE_HOME="${BATS_TEST_TMPDIR?}"
+
+	setup_test_fixture
 	local_setup
 }
 
-teardown() {
+function teardown() {
+	unset GIT_CONFIG_NOSYSTEM
 	local_teardown
-
-	rm -rf "${BASH_IT_TEST_DIR}"
-	temp_del "${TEST_TEMP_DIR}"
+	clean_test_fixture
+}
+
+function teardown_file() {
+	# This only serves to clean metadata from the real git repo.
+	git --git-dir="${MAIN_BASH_IT_GITDIR?}" worktree remove -f "${BASH_IT?}"
 }
diff --git a/test/test_helper_libs.bash b/test/test_helper_libs.bash
deleted file mode 100644
index fac2a9eb..00000000
--- a/test/test_helper_libs.bash
+++ /dev/null
@@ -1,8 +0,0 @@
-# shellcheck shell=bash
-
-load "${BASH_IT}/lib/log.bash"
-load "${BASH_IT}/lib/utilities.bash"
-load "${BASH_IT}/lib/helpers.bash"
-load "${BASH_IT}/lib/search.bash"
-load "${BASH_IT}/lib/preexec.bash"
-load "${BASH_IT}/lib/colors.bash"

From cb9b999f06fe4e6d14caddaa8315d6e19ddc907d Mon Sep 17 00:00:00 2001
From: John D Pell <John+Git@gaelicWizard.net>
Date: Wed, 12 Jan 2022 00:02:24 -0800
Subject: [PATCH 02/23] BATS: de-parallelize

Run the test *files* in parallel, but not the tests *within* the files. This can be reverted after configuration (i.e., `$BASH_IT/enabled` et al) lives *outside* the repo.
---
 test/run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/run b/test/run
index 91732a3b..78467366 100755
--- a/test/run
+++ b/test/run
@@ -44,7 +44,7 @@ if command -v parallel &> /dev/null \
 		fi
 	)"
 	exec "$bats_executable" "${CI:+--tap}" --jobs "${test_jobs_effective}" \
-		"${test_dirs[@]}"
+		--no-parallelize-within-files "${test_dirs[@]}"
 else
 	# Run `bats` in single-threaded mode.
 	exec "$bats_executable" "${CI:+--tap}" "${test_dirs[@]}"

From fd1771d45c28322c18d6eda1818bf2f5c0f4f414 Mon Sep 17 00:00:00 2001
From: John D Pell <John+Git@gaelicWizard.net>
Date: Thu, 3 Feb 2022 21:36:09 -0800
Subject: [PATCH 03/23] test/base: adopt newly revamped `setup()`

---
 test/plugins/base.plugin.bats | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)
 mode change 100755 => 100644 test/plugins/base.plugin.bats

diff --git a/test/plugins/base.plugin.bats b/test/plugins/base.plugin.bats
old mode 100755
new mode 100644
index 3d60986b..bb8c3c89
--- a/test/plugins/base.plugin.bats
+++ b/test/plugins/base.plugin.bats
@@ -1,11 +1,14 @@
 #!/usr/bin/env bats
 
-load ../test_helper
-load ../test_helper_libs
-load ../../plugins/available/base.plugin
+load "${MAIN_BASH_IT_DIR?}/test/test_helper.bash"
+
+function local_setup() {
+  setup_libs
+  load "${BASH_IT?}/plugins/available/base.plugin.bash"
+}
 
 @test 'plugins base: ips()' {
-  if [[ $CI ]]; then
+  if [[ -n "${CI:-}" ]]; then
     skip 'ifconfig probably requires sudo on TravisCI'
   fi
 
@@ -23,7 +26,7 @@ load ../../plugins/available/base.plugin
 }
 
 @test 'plugins base: pickfrom()' {
-  stub_file="${BASH_IT_ROOT}/stub_file"
+  stub_file="${BATS_TEST_TMPDIR}/stub_file"
   printf "l1\nl2\nl3" > $stub_file
   run pickfrom $stub_file
   assert_success
@@ -31,28 +34,30 @@ load ../../plugins/available/base.plugin
 }
 
 @test 'plugins base: mkcd()' {
-  cd "${BASH_IT_ROOT}"
+  cd "${BATS_TEST_TMPDIR}"
   declare -r dir_name="-dir_with_dash"
 
   # Make sure that the directory does not exist prior to the test
-  rm -rf "${BASH_IT_ROOT}/${dir_name}"
+  rm -rf "${BATS_TEST_TMPDIR}/${dir_name}"
+
+  run mkcd "${dir_name}"
+  assert_success
+  assert_dir_exist "${BATS_TEST_TMPDIR}/${dir_name}"
 
   mkcd "${dir_name}"
-  assert_success
-  assert_dir_exist "${BASH_IT_ROOT}/${dir_name}"
-  assert_equal "${PWD}" "${BASH_IT_ROOT//\/\///}/${dir_name}"
+  assert_equal "${PWD}" "${BATS_TEST_TMPDIR//\/\///}/${dir_name}"
 }
 
 @test 'plugins base: lsgrep()' {
-  for i in 1 2 3; do mkdir -p "${BASH_IT_TEST_DIR}/${i}"; done
-  cd $BASH_IT_TEST_DIR
+  for i in 1 2 3; do mkdir -p "${BASH_IT}/${i}"; done
+  cd $BASH_IT
   run lsgrep 2
   assert_success
   assert_equal $output 2
 }
 
 @test 'plugins base: buf()' {
-  declare -r file="${BASH_IT_ROOT}/file"
+  declare -r file="${BATS_TEST_TMPDIR}/file"
   touch $file
 
   # Take one timestamp before running the `buf` function

From de31a308f9b7ccaad9321296d8bb91f0e67e108e Mon Sep 17 00:00:00 2001
From: John D Pell <John+Git@gaelicWizard.net>
Date: Thu, 3 Feb 2022 21:37:20 -0800
Subject: [PATCH 04/23] test/bash_it: adopt newly revamped `setup()`

---
 test/bash_it/bash_it.bats | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/test/bash_it/bash_it.bats b/test/bash_it/bash_it.bats
index 13c84238..ef3cdbab 100644
--- a/test/bash_it/bash_it.bats
+++ b/test/bash_it/bash_it.bats
@@ -1,19 +1,11 @@
-#!/usr/bin/env bats
+# shellcheck shell=bats
 
-load ../test_helper
-
-function local_setup {
-  setup_test_fixture
+load "${MAIN_BASH_IT_DIR?}/test/test_helper.bash"
 
+function local_setup_file() {
   # Copy the test fixture to the Bash-it folder
-  if command -v rsync &> /dev/null
-  then
-    rsync -a "$BASH_IT/test/fixtures/bash_it/" "$BASH_IT/"
-  else
-    find "$BASH_IT/test/fixtures/bash_it" \
-      -mindepth 1 -maxdepth 1 \
-      -exec cp -r {} "$BASH_IT/" \;
-  fi
+  cp -fRP "${BASH_IT?}/test/fixtures/bash_it"/* "${BASH_IT?}/" || true
+  # don't load any libraries as the tests here test the *whole* kit
 }
 
 @test "bash-it: verify that the test fixture is available" {

From c837232643270661d6176a80bdd8cd5a449f5f5b Mon Sep 17 00:00:00 2001
From: John D Pell <John+Git@gaelicWizard.net>
Date: Thu, 3 Feb 2022 21:38:32 -0800
Subject: [PATCH 05/23] test/bash-it: adopt newly revamped `setup()`

---
 test/completion/bash-it.completion.bats | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/test/completion/bash-it.completion.bats b/test/completion/bash-it.completion.bats
index 087a926d..29d1dc94 100755
--- a/test/completion/bash-it.completion.bats
+++ b/test/completion/bash-it.completion.bats
@@ -1,17 +1,16 @@
-#!/usr/bin/env bats
+# shellcheck shell=bats
 
-load ../test_helper
-load ../../lib/utilities
-load ../../lib/helpers
-load ../../completion/available/bash-it.completion
+load "${MAIN_BASH_IT_DIR?}/test/test_helper.bash"
 
-function local_setup {
-  setup_test_fixture
+function local_setup_file() {
+  setup_libs "helpers"
+  load "${BASH_IT?}/completion/available/bash-it.completion.bash"
 }
 
 @test "completion bash-it: ensure that the _bash-it function is available" {
-  type -a _bash-it &> /dev/null
+  run type -t _bash-it
   assert_success
+  assert_output "function"
 }
 
 function __check_completion () {

From 2a95e983d0874feec84f8a8f87e0c852c51ec411 Mon Sep 17 00:00:00 2001
From: John D Pell <John+Git@gaelicWizard.net>
Date: Mon, 31 Jan 2022 11:08:06 -0800
Subject: [PATCH 06/23] test/install: adopt newly revamped `setup()`

test/uninstall: adopt newly revamped `setup()`

test/install: `local_setup_file()`
---
 test/install/install.bats   | 53 +++++++++++++++++---------------
 test/install/uninstall.bats | 61 +++++++++++++++++++------------------
 2 files changed, 59 insertions(+), 55 deletions(-)

diff --git a/test/install/install.bats b/test/install/install.bats
index b3aee5a7..c9e1794c 100644
--- a/test/install/install.bats
+++ b/test/install/install.bats
@@ -1,19 +1,22 @@
-#!/usr/bin/env bats
+# shellcheck shell=bats
 
-load ../test_helper
+load "${MAIN_BASH_IT_DIR?}/test/test_helper.bash"
 
-# Determine which config file to use based on OS.
-case $OSTYPE in
-  darwin*)
-    export BASH_IT_CONFIG_FILE=.bash_profile
-    ;;
-  *)
-    export BASH_IT_CONFIG_FILE=.bashrc
-    ;;
-esac
+function local_setup() {
+  export HOME="$BATS_TEST_TMPDIR"
+}
 
-function local_setup {
-  setup_test_fixture
+function local_setup_file() {
+  # Determine which config file to use based on OS.
+  case $OSTYPE in
+    darwin*)
+      export BASH_IT_CONFIG_FILE=.bash_profile
+      ;;
+    *)
+      export BASH_IT_CONFIG_FILE=.bashrc
+      ;;
+  esac
+  # don't load any libraries as the tests here test the *whole* kit
 }
 
 @test "install: verify that the install script exists" {
@@ -25,7 +28,7 @@ function local_setup {
 
   ./install.sh --silent
 
-  assert_file_exist "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE"
+  assert_file_exist "$HOME/$BASH_IT_CONFIG_FILE"
 
   assert_link_exist "$BASH_IT/enabled/150---general.aliases.bash"
   assert_link_exist "$BASH_IT/enabled/250---base.plugin.bash"
@@ -37,16 +40,16 @@ function local_setup {
 @test "install: verify that a backup file is created" {
   cd "$BASH_IT"
 
-  touch "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE"
-  echo "test file content" > "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE"
-  local md5_orig=$(md5sum "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE" | awk '{print $1}')
+  touch "$HOME/$BASH_IT_CONFIG_FILE"
+  echo "test file content" > "$HOME/$BASH_IT_CONFIG_FILE"
+  local md5_orig=$(md5sum "$HOME/$BASH_IT_CONFIG_FILE" | awk '{print $1}')
 
   ./install.sh --silent
 
-  assert_file_exist "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE"
-  assert_file_exist "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE.bak"
+  assert_file_exist "$HOME/$BASH_IT_CONFIG_FILE"
+  assert_file_exist "$HOME/$BASH_IT_CONFIG_FILE.bak"
 
-  local md5_bak=$(md5sum "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE.bak" | awk '{print $1}')
+  local md5_bak=$(md5sum "$HOME/$BASH_IT_CONFIG_FILE.bak" | awk '{print $1}')
 
   assert_equal "$md5_orig" "$md5_bak"
 }
@@ -70,15 +73,15 @@ function local_setup {
 @test "install: verify that the template is appended" {
   cd "$BASH_IT"
 
-  touch "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE"
-  echo "test file content" > "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE"
+  touch "$HOME/$BASH_IT_CONFIG_FILE"
+  echo "test file content" > "$HOME/$BASH_IT_CONFIG_FILE"
 
   ./install.sh --silent --append-to-config
 
-  assert_file_exist "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE"
-  assert_file_exist "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE.bak"
+  assert_file_exist "$HOME/$BASH_IT_CONFIG_FILE"
+  assert_file_exist "$HOME/$BASH_IT_CONFIG_FILE.bak"
 
-  run cat $BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE
+  run cat "$HOME/$BASH_IT_CONFIG_FILE"
 
   assert_line "test file content"
   assert_line "source \"\$BASH_IT\"/bash_it.sh"
diff --git a/test/install/uninstall.bats b/test/install/uninstall.bats
index 16bb7f7b..ab71a775 100644
--- a/test/install/uninstall.bats
+++ b/test/install/uninstall.bats
@@ -1,19 +1,22 @@
-#!/usr/bin/env bats
+# shellcheck shell=bats
 
-load ../test_helper
+load "${MAIN_BASH_IT_DIR?}/test/test_helper.bash"
 
-# Determine which config file to use based on OS.
-case $OSTYPE in
-  darwin*)
-    export BASH_IT_CONFIG_FILE=.bash_profile
-    ;;
-  *)
-    export BASH_IT_CONFIG_FILE=.bashrc
-    ;;
-esac
+function local_setup() {
+  export HOME="$BATS_TEST_TMPDIR"
+}
 
-function local_setup {
-  setup_test_fixture
+function local_setup_file() {
+  # Determine which config file to use based on OS.
+  case $OSTYPE in
+    darwin*)
+      export BASH_IT_CONFIG_FILE=.bash_profile
+      ;;
+    *)
+      export BASH_IT_CONFIG_FILE=.bashrc
+      ;;
+  esac
+  # don't load any libraries as the tests here test the *whole* kit
 }
 
 @test "uninstall: verify that the uninstall script exists" {
@@ -23,19 +26,18 @@ function local_setup {
 @test "uninstall: run the uninstall script with an existing backup file" {
   cd "$BASH_IT"
 
-  echo "test file content for backup" > "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE.bak"
-  echo "test file content for original file" > "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE"
-  local md5_bak=$(md5sum "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE.bak" | awk '{print $1}')
-
-  ./uninstall.sh
+  echo "test file content for backup" > "$HOME/$BASH_IT_CONFIG_FILE.bak"
+  echo "test file content for original file" > "$HOME/$BASH_IT_CONFIG_FILE"
+  local md5_bak=$(md5sum "$HOME/$BASH_IT_CONFIG_FILE.bak" | awk '{print $1}')
 
+  run ./uninstall.sh
   assert_success
 
-  assert_file_not_exist "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE.uninstall"
-  assert_file_not_exist "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE.bak"
-  assert_file_exist "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE"
+  assert_file_not_exist "$HOME/$BASH_IT_CONFIG_FILE.uninstall"
+  assert_file_not_exist "$HOME/$BASH_IT_CONFIG_FILE.bak"
+  assert_file_exist "$HOME/$BASH_IT_CONFIG_FILE"
 
-  local md5_conf=$(md5sum "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE" | awk '{print $1}')
+  local md5_conf=$(md5sum "$HOME/$BASH_IT_CONFIG_FILE" | awk '{print $1}')
 
   assert_equal "$md5_bak" "$md5_conf"
 }
@@ -43,18 +45,17 @@ function local_setup {
 @test "uninstall: run the uninstall script without an existing backup file" {
   cd "$BASH_IT"
 
-  echo "test file content for original file" > "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE"
-  local md5_orig=$(md5sum "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE" | awk '{print $1}')
-
-  ./uninstall.sh
+  echo "test file content for original file" > "$HOME/$BASH_IT_CONFIG_FILE"
+  local md5_orig=$(md5sum "$HOME/$BASH_IT_CONFIG_FILE" | awk '{print $1}')
 
+  run ./uninstall.sh
   assert_success
 
-  assert_file_exist "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE.uninstall"
-  assert_file_not_exist "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE.bak"
-  assert_file_not_exist "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE"
+  assert_file_exist "$HOME/$BASH_IT_CONFIG_FILE.uninstall"
+  assert_file_not_exist "$HOME/$BASH_IT_CONFIG_FILE.bak"
+  assert_file_not_exist "$HOME/$BASH_IT_CONFIG_FILE"
 
-  local md5_uninstall=$(md5sum "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE.uninstall" | awk '{print $1}')
+  local md5_uninstall=$(md5sum "$HOME/$BASH_IT_CONFIG_FILE.uninstall" | awk '{print $1}')
 
   assert_equal "$md5_orig" "$md5_uninstall"
 }

From 425ef3e10afa360d2a5d8366e579bd15b7ced548 Mon Sep 17 00:00:00 2001
From: John D Pell <John+Git@gaelicWizard.net>
Date: Thu, 3 Feb 2022 21:39:38 -0800
Subject: [PATCH 07/23] test/composure: adopt newly revamped `setup()`

---
 test/lib/composure.bats | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/test/lib/composure.bats b/test/lib/composure.bats
index 8198936c..01bfd967 100644
--- a/test/lib/composure.bats
+++ b/test/lib/composure.bats
@@ -1,6 +1,11 @@
-#!/usr/bin/env bats
+# shellcheck shell=bats
 
-load ../test_helper
+load "${MAIN_BASH_IT_DIR?}/test/test_helper.bash"
+
+function local_setup_file() {
+  true
+  # don't load any libraries as the tests here test the *whole* kit
+}
 
 @test "lib composure: _composure_keywords()" {
   run _composure_keywords

From 1ddec65d56dbc92d0391f563d8c725f49386562f Mon Sep 17 00:00:00 2001
From: John D Pell <John+Git@gaelicWizard.net>
Date: Mon, 31 Jan 2022 11:08:26 -0800
Subject: [PATCH 08/23] test/helpers: adopt newly revamped `setup()`

---
 test/lib/helpers.bats | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)
 mode change 100755 => 100644 test/lib/helpers.bats

diff --git a/test/lib/helpers.bats b/test/lib/helpers.bats
old mode 100755
new mode 100644
index 8c340c58..38a917fe
--- a/test/lib/helpers.bats
+++ b/test/lib/helpers.bats
@@ -1,21 +1,15 @@
-#!/usr/bin/env bats
+# shellcheck shell=bats
 
-load ../test_helper
-load ../test_helper_libs
-load ../../plugins/available/base.plugin
-load ../../lib/colors
+load "${MAIN_BASH_IT_DIR?}/test/test_helper.bash"
 
-function local_setup {
-  setup_test_fixture
+function local_setup_file() {
+  setup_libs "colors"
+  load "${BASH_IT?}/plugins/available/base.plugin.bash"
+}
 
+function local_setup() {
   # Copy the test fixture to the Bash-it folder
-  if command -v rsync &> /dev/null; then
-    rsync -a "$BASH_IT/test/fixtures/bash_it/" "$BASH_IT/"
-  else
-    find "$BASH_IT/test/fixtures/bash_it" \
-      -mindepth 1 -maxdepth 1 \
-      -exec cp -r {} "$BASH_IT/" \;
-  fi
+  cp -RP "$BASH_IT/test/fixtures/bash_it"/* "$BASH_IT/"
 }
 
 # TODO Create global __is_enabled function

From e5cd10112cb61846264242f54b3ccbba018f57f5 Mon Sep 17 00:00:00 2001
From: John D Pell <John+Git@gaelicWizard.net>
Date: Thu, 3 Feb 2022 21:40:08 -0800
Subject: [PATCH 09/23] test/log: adopt newly revamped `setup()`

---
 test/lib/log.bats | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/test/lib/log.bats b/test/lib/log.bats
index bd118999..7d868fd6 100644
--- a/test/lib/log.bats
+++ b/test/lib/log.bats
@@ -1,11 +1,10 @@
-#!/usr/bin/env bats
+# shellcheck shell=bats
 
-load ../test_helper
-load ../../lib/colors
+load "${MAIN_BASH_IT_DIR?}/test/test_helper.bash"
 
-load ../../lib/log
-load ../../lib/helpers
-load ../../plugins/available/base.plugin
+function local_setup_file() {
+  setup_libs "log"
+}
 
 @test "lib log: basic debug logging with BASH_IT_LOG_LEVEL_ALL" {
   BASH_IT_LOG_LEVEL=$BASH_IT_LOG_LEVEL_ALL

From 629a1b0c0d5b2019ffca03f4aa10a7fc6630152a Mon Sep 17 00:00:00 2001
From: John D Pell <John+Git@gaelicWizard.net>
Date: Mon, 31 Jan 2022 11:08:33 -0800
Subject: [PATCH 10/23] test/search: adopt newly revamped `setup()`

---
 test/lib/search.bats | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)
 mode change 100755 => 100644 test/lib/search.bats

diff --git a/test/lib/search.bats b/test/lib/search.bats
old mode 100755
new mode 100644
index 057951a0..e28922f4
--- a/test/lib/search.bats
+++ b/test/lib/search.bats
@@ -1,28 +1,14 @@
-#!/usr/bin/env bats
+# shellcheck shell=bats
 
-load ../test_helper
-load ../test_helper_libs
+load "${MAIN_BASH_IT_DIR?}/test/test_helper.bash"
 
-load ../../plugins/available/base.plugin
-load ../../aliases/available/git.aliases
-load ../../plugins/available/ruby.plugin
-load ../../plugins/available/rails.plugin
-load ../../completion/available/bundler.completion
-load ../../completion/available/gem.completion
-load ../../completion/available/rake.completion
-
-load ../../lib/helpers
-
-function local_setup {
-  setup_test_fixture
-
-  export OLD_PATH="$PATH"
-  export PATH="/usr/bin:/bin:/usr/sbin"
+function local_setup_file() {
+  setup_libs "search"
 }
 
-function local_teardown {
-  export PATH="$OLD_PATH"
-  unset OLD_PATH
+function local_setup() {
+    # shellcheck disable=SC2034
+    BASH_IT_SEARCH_USE_COLOR=false
 }
 
 @test "search: plugin base" {

From fd912117047139dfe37a6f48c7d306923d9b3896 Mon Sep 17 00:00:00 2001
From: John D Pell <John+Git@gaelicWizard.net>
Date: Mon, 31 Jan 2022 11:08:37 -0800
Subject: [PATCH 11/23] test/utilities: adopt newly revamped `setup()`

---
 test/lib/utilities.bats | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/test/lib/utilities.bats b/test/lib/utilities.bats
index a0968fce..78913870 100644
--- a/test/lib/utilities.bats
+++ b/test/lib/utilities.bats
@@ -1,10 +1,9 @@
-#!/usr/bin/env bats
+# shellcheck shell=bats
 
-load ../test_helper
-load ../test_helper_libs
+load "${MAIN_BASH_IT_DIR?}/test/test_helper.bash"
 
-function local_setup {
-  setup_test_fixture
+function local_setup_file() {
+  setup_libs "helpers"
 }
 
 @test "_bash-it-component-item-is-enabled() - for a disabled item" {

From beac9c430a5a9a144d5064c653d00f144945bcb8 Mon Sep 17 00:00:00 2001
From: John D Pell <John+Git@gaelicWizard.net>
Date: Sun, 13 Feb 2022 16:25:21 -0800
Subject: [PATCH 12/23] test/aliases: adopt newly revamped `setup()`

---
 test/completion/aliases.completion.bats | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/test/completion/aliases.completion.bats b/test/completion/aliases.completion.bats
index 813a7bbd..83ae947a 100644
--- a/test/completion/aliases.completion.bats
+++ b/test/completion/aliases.completion.bats
@@ -1,28 +1,30 @@
-#!/usr/bin/env bats
+# shellcheck shell=bats
 
-load ../test_helper
-load ../test_helper_libs
+load "${MAIN_BASH_IT_DIR?}/test/test_helper.bash"
 
-# Load something, anything...
-load ../../completion/available/capistrano.completion
+function local_setup_file() {
+  setup_libs "helpers"
+  # Load something, anything...
+  load ../../completion/available/capistrano.completion
+}
 
 @test "alias-completion: See that aliases with double quotes and brackets do not break the plugin" {
   alias gtest="git log --graph --pretty=format:'%C(bold)%h%Creset%C(magenta)%d%Creset %s %C(yellow)<%an> %C(cyan)(%cr)%Creset' --abbrev-commit --date=relative"
-  run load ../../completion/available/aliases.completion
+  run load "${BASH_IT?}/completion/available/aliases.completion.bash"
 
   assert_success
 }
 
 @test "alias-completion: See that aliases with single quotes and brackets do not break the plugin" {
   alias gtest='git log --graph --pretty=format:"%C(bold)%h%Creset%C(magenta)%d%Creset %s %C(yellow)<%an> %C(cyan)(%cr)%Creset" --abbrev-commit --date=relative'
-  run load ../../completion/available/aliases.completion
+  run load "${BASH_IT?}/completion/available/aliases.completion.bash"
 
   assert_success
 }
 
 @test "alias-completion: See that having aliased rm command does not output unnecessary output" {
   alias rm='rm -v'
-  run load ../../completion/available/aliases.completion
+  run load "${BASH_IT?}/completion/available/aliases.completion.bash"
 
   refute_output
 }

From 6e2e0af7f9f3592d5eda3c94e436cc21b01c9a11 Mon Sep 17 00:00:00 2001
From: John D Pell <John+Git@gaelicWizard.net>
Date: Mon, 31 Jan 2022 11:08:53 -0800
Subject: [PATCH 13/23] test/battery: adopt newly revamped `setup()`

---
 test/plugins/battery.plugin.bats | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
 mode change 100755 => 100644 test/plugins/battery.plugin.bats

diff --git a/test/plugins/battery.plugin.bats b/test/plugins/battery.plugin.bats
old mode 100755
new mode 100644
index 51ef93e9..487fb68f
--- a/test/plugins/battery.plugin.bats
+++ b/test/plugins/battery.plugin.bats
@@ -1,9 +1,11 @@
-#!/usr/bin/env bats
+# shellcheck shell=bats
 
-load ../test_helper
-load ../test_helper_libs
+load "${MAIN_BASH_IT_DIR?}/test/test_helper.bash"
 
-load ../../plugins/available/battery.plugin
+function local_setup_file() {
+  setup_libs "helpers"
+  load "${BASH_IT?}/plugins/available/battery.plugin.bash"
+}
 
 # Sets up the `_command_exists` function so that it only responds `true` if called with
 # the name of the function that was passed in as an argument to `setup_command_exists`.

From 4a9df8ec885cb937d9d571bae8bd6536883e323f Mon Sep 17 00:00:00 2001
From: John D Pell <John+Git@gaelicWizard.net>
Date: Mon, 31 Jan 2022 11:09:02 -0800
Subject: [PATCH 14/23] test/cmd-returned-notify: adopt newly revamped
 `setup()`

---
 test/plugins/cmd-returned-notify.plugin.bats | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
 mode change 100755 => 100644 test/plugins/cmd-returned-notify.plugin.bats

diff --git a/test/plugins/cmd-returned-notify.plugin.bats b/test/plugins/cmd-returned-notify.plugin.bats
old mode 100755
new mode 100644
index 6f3cf25a..ca40f3b5
--- a/test/plugins/cmd-returned-notify.plugin.bats
+++ b/test/plugins/cmd-returned-notify.plugin.bats
@@ -1,9 +1,11 @@
-#!/usr/bin/env bats
+# shellcheck shell=bats
 
-load ../test_helper
-load ../test_helper_libs
+load "${MAIN_BASH_IT_DIR?}/test/test_helper.bash"
 
-load ../../plugins/available/cmd-returned-notify.plugin
+function local_setup_file() {
+  setup_libs "preexec" #"command_duration"
+  load "${BASH_IT?}/plugins/available/cmd-returned-notify.plugin.bash"
+}
 
 @test "plugins cmd-returned-notify: notify after elapsed time" {
     export NOTIFY_IF_COMMAND_RETURNS_AFTER=0

From fbf7efa1b851402a51cd694d84f7706df2475ce3 Mon Sep 17 00:00:00 2001
From: John D Pell <John+Git@gaelicWizard.net>
Date: Thu, 3 Feb 2022 21:42:25 -0800
Subject: [PATCH 15/23] test/go: adopt newly revamped `setup()`

---
 test/plugins/go.plugin.bats | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/test/plugins/go.plugin.bats b/test/plugins/go.plugin.bats
index 258e4254..ebb9cd88 100644
--- a/test/plugins/go.plugin.bats
+++ b/test/plugins/go.plugin.bats
@@ -1,11 +1,9 @@
-#!/usr/bin/env bats
+# shellcheck shell=bats
 
-load ../test_helper
-load ../test_helper_libs
+load "${MAIN_BASH_IT_DIR?}/test/test_helper.bash"
 
-function local_setup()
-{
-  setup_test_fixture
+function local_setup_file() {
+  setup_libs "helpers"
 }
 
 function setup_go_path()

From a36a4c4038f6c0f685348fca0b77dfce4bd7593a Mon Sep 17 00:00:00 2001
From: John D Pell <John+Git@gaelicWizard.net>
Date: Mon, 31 Jan 2022 11:09:09 -0800
Subject: [PATCH 16/23] test/ruby: adopt newly revamped `setup()`

---
 test/plugins/ruby.plugin.bats | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)
 mode change 100755 => 100644 test/plugins/ruby.plugin.bats

diff --git a/test/plugins/ruby.plugin.bats b/test/plugins/ruby.plugin.bats
old mode 100755
new mode 100644
index b80adde7..7bfc6455
--- a/test/plugins/ruby.plugin.bats
+++ b/test/plugins/ruby.plugin.bats
@@ -1,24 +1,15 @@
-#!/usr/bin/env bats
+# shellcheck shell=bats
 
-load ../test_helper
-load ../test_helper_libs
+load "${MAIN_BASH_IT_DIR?}/test/test_helper.bash"
 
-function local_setup {
-  setup_test_fixture
-
-  _command_exists "ruby" && mkdir -p "$(ruby -e 'print Gem.user_dir')/bin"
-
-  export OLD_PATH="$PATH"
-  export PATH="/usr/bin:/bin:/usr/sbin"
-}
-
-function local_teardown {
-  export PATH="$OLD_PATH"
-  unset OLD_PATH
+function local_setup_file() {
+  setup_libs "helpers"
 }
 
 @test "plugins ruby: remove_gem is defined" {
-  load ../../plugins/available/ruby.plugin
+  run load "${BASH_IT?}/plugins/available/ruby.plugin.bash"
+  assert_success
+  load "${BASH_IT?}/plugins/available/ruby.plugin.bash"
 
   run type remove_gem
   assert_line -n 1 "remove_gem () "
@@ -31,7 +22,9 @@ function local_teardown {
 
   mkdir -p "$(ruby -e 'print Gem.user_dir')/bin"
 
-  load ../../plugins/available/ruby.plugin
+  run load "${BASH_IT?}/plugins/available/ruby.plugin.bash"
+  assert_success
+  load "${BASH_IT?}/plugins/available/ruby.plugin.bash"
 
   local last_path_entry="$(tail -1 <<<"${PATH//:/$'\n'}")"
   [[ "${last_path_entry}" == "$(ruby -e 'print Gem.user_dir')/bin" ]]

From b6865158774690000d64925fbbc3595e2643b910 Mon Sep 17 00:00:00 2001
From: John D Pell <John+Git@gaelicWizard.net>
Date: Mon, 31 Jan 2022 11:09:12 -0800
Subject: [PATCH 17/23] test/xterm: adopt newly revamped `setup()`

---
 test/plugins/xterm.plugin.bats | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/test/plugins/xterm.plugin.bats b/test/plugins/xterm.plugin.bats
index c175d854..4cb1ffda 100644
--- a/test/plugins/xterm.plugin.bats
+++ b/test/plugins/xterm.plugin.bats
@@ -1,21 +1,10 @@
-#!/usr/bin/env bats
+# shellcheck shell=bats
 
-load ../test_helper
-load ../test_helper_libs
+load "${MAIN_BASH_IT_DIR?}/test/test_helper.bash"
 
-load ../../plugins/available/xterm.plugin
-
-function local_setup {
-  setup_test_fixture
-
-  # Copy the test fixture to the Bash-it folder
-  if _command_exists rsync; then
-    rsync -a "$BASH_IT/test/fixtures/plugin/xterm/" "$BASH_IT/"
-  else
-    find "$BASH_IT/test/fixtures/plugin/xterm" \
-      -mindepth 1 -maxdepth 1 \
-      -exec cp -r {} "$BASH_IT/" \;
-  fi
+function local_setup_file() {
+  setup_libs "helpers"
+  load "${BASH_IT?}/plugins/available/xterm.plugin.bash"
 }
 
 @test "plugins xterm: shorten command output" {

From f0dfe1a67f1a1181e788fe85a518291a3ff732b1 Mon Sep 17 00:00:00 2001
From: John D Pell <John+Git@gaelicWizard.net>
Date: Mon, 31 Jan 2022 11:09:20 -0800
Subject: [PATCH 18/23] test/theme: adopt newly revamped `setup()`

---
 test/themes/base.theme.bats     | 23 +++++++++++++----------
 test/themes/base.theme.git.bats | 15 ++++++++++-----
 test/themes/base.theme.svn.bats | 29 +++++------------------------
 3 files changed, 28 insertions(+), 39 deletions(-)

diff --git a/test/themes/base.theme.bats b/test/themes/base.theme.bats
index 63f25133..81b08a01 100644
--- a/test/themes/base.theme.bats
+++ b/test/themes/base.theme.bats
@@ -1,8 +1,11 @@
-#!/usr/bin/env bats
+# shellcheck shell=bats
 
-load ../test_helper
-load ../test_helper_libs
-load ../../themes/base.theme
+load "${MAIN_BASH_IT_DIR?}/test/test_helper.bash"
+
+function local_setup_file() {
+  setup_libs "colors" #"theme"
+  load "${BASH_IT?}/themes/base.theme.bash"
+}
 
 @test 'themes base: battery_percentage should not exist' {
   run type -a battery_percentage &> /dev/null
@@ -10,7 +13,7 @@ load ../../themes/base.theme
 }
 
 @test 'themes base: battery_percentage should exist if battery plugin loaded' {
-  load ../../plugins/available/battery.plugin
+  load "${BASH_IT?}/plugins/available/battery.plugin.bash"
 
   run type -a battery_percentage &> /dev/null
   assert_success
@@ -28,12 +31,12 @@ load ../../themes/base.theme
 @test 'themes base: battery_char should exist if battery plugin loaded' {
   unset -f battery_char
 
-  load ../../plugins/available/battery.plugin
+  load "${BASH_IT?}/plugins/available/battery.plugin.bash"
   run type -t battery_percentage
   assert_success
   assert_line "function"
 
-  load ../../themes/base.theme
+  load "${BASH_IT?}/themes/base.theme.bash"
   run type -t battery_char
   assert_success
   assert_line "function"
@@ -51,13 +54,13 @@ load ../../themes/base.theme
 
   run battery_charge
   assert_success
-  assert_line -n 0 ""
+  assert_output ""
 }
 
 @test 'themes base: battery_charge should exist if battery plugin loaded' {
   unset -f battery_charge
-  load ../../plugins/available/battery.plugin
-  load ../../themes/base.theme
+  load "${BASH_IT?}/plugins/available/battery.plugin.bash"
+  load "${BASH_IT?}/themes/base.theme.bash"
 
   run type -a battery_charge &> /dev/null
   assert_success
diff --git a/test/themes/base.theme.git.bats b/test/themes/base.theme.git.bats
index ad2c5a8d..b2bc7c5a 100644
--- a/test/themes/base.theme.git.bats
+++ b/test/themes/base.theme.git.bats
@@ -1,9 +1,14 @@
-#!/usr/bin/env bats
+# shellcheck shell=bats
+# shellcheck disable=SC2034
+# shellcheck disable=SC2016
 
-load ../test_helper
-load ../test_helper_libs
-load ../../themes/githelpers.theme
-load ../../themes/base.theme
+load "${MAIN_BASH_IT_DIR?}/test/test_helper.bash"
+
+function local_setup_file() {
+  setup_libs "colors" #"theme"
+  load "${BASH_IT?}/themes/base.theme.bash"
+  load "${BASH_IT?}/themes/githelpers.theme.bash"
+}
 
 add_commit() {
   local file_name="general-${RANDOM}"
diff --git a/test/themes/base.theme.svn.bats b/test/themes/base.theme.svn.bats
index 789d85e5..360e8636 100644
--- a/test/themes/base.theme.svn.bats
+++ b/test/themes/base.theme.svn.bats
@@ -1,29 +1,10 @@
-#!/usr/bin/env bats
+# shellcheck shell=bats
 
-load ../test_helper
-load ../test_helper_libs
+load "${MAIN_BASH_IT_DIR?}/test/test_helper.bash"
 
-function local_setup {
-  setup_test_fixture
-
-  # Copy the test fixture to the Bash-it folder
-  if command -v rsync &> /dev/null
-  then
-    rsync -a "$BASH_IT/test/fixtures/bash_it/" "$BASH_IT/"
-  else
-    find "$BASH_IT/test/fixtures/bash_it" \
-      -mindepth 1 -maxdepth 1 \
-      -exec cp -r {} "$BASH_IT/" \;
-  fi
-
-  export OLD_PATH="$PATH"
-
-  load ../../themes/base.theme
-}
-
-function local_teardown {
-  export PATH="$OLD_PATH"
-  unset OLD_PATH
+function local_setup_file() {
+  setup_libs "colors" #"theme"
+  load "${BASH_IT?}/themes/base.theme.bash"
 }
 
 function setup_repo {

From 0d55a2406c61c9769060a41e23cac879fc287b3b Mon Sep 17 00:00:00 2001
From: John D Pell <John+Git@gaelicWizard.net>
Date: Mon, 31 Jan 2022 11:15:06 -0800
Subject: [PATCH 19/23] test/base: adopt newly revamped `setup()`

---
 test/plugins/base.plugin.bats | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/plugins/base.plugin.bats b/test/plugins/base.plugin.bats
index bb8c3c89..f11983f1 100644
--- a/test/plugins/base.plugin.bats
+++ b/test/plugins/base.plugin.bats
@@ -1,9 +1,9 @@
-#!/usr/bin/env bats
+# shellcheck shell=bats
 
 load "${MAIN_BASH_IT_DIR?}/test/test_helper.bash"
 
-function local_setup() {
-  setup_libs
+function local_setup_file() {
+  setup_libs "helpers"
   load "${BASH_IT?}/plugins/available/base.plugin.bash"
 }
 

From a9dda3d3584270388f4d32772027651dd73fed24 Mon Sep 17 00:00:00 2001
From: John D Pell <John+Git@gaelicWizard.net>
Date: Mon, 31 Jan 2022 11:26:31 -0800
Subject: [PATCH 20/23] test/preexec: adopt newly revamped `setup()`

---
 test/lib/preexec.bats | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/lib/preexec.bats b/test/lib/preexec.bats
index d85f952c..10dc666d 100644
--- a/test/lib/preexec.bats
+++ b/test/lib/preexec.bats
@@ -111,7 +111,7 @@ function local_setup {
 
 @test "lib preexec: __check_precmd_conflict()" {
 	test_precmd_function_name="test"
-	load ../test_helper_libs
+	setup_libs "preexec"
 
 	run __check_precmd_conflict "$test_precmd_function_name"
 	assert_failure
@@ -124,7 +124,7 @@ function local_setup {
 
 @test "lib preexec: __check_preexec_conflict()" {
 	test_preexec_function_name="test"
-	load ../test_helper_libs
+	setup_libs "preexec"
 
 	run __check_preexec_conflict "$test_preexec_function_name"
 	assert_failure
@@ -137,7 +137,7 @@ function local_setup {
 
 @test "lib preexec: safe_append_prompt_command()" {
 	test_precmd_function_name="test"
-	load ../test_helper_libs
+	setup_libs "preexec"
 
 	export precmd_functions=()
 	assert_equal "${precmd_functions[*]}" ""
@@ -151,7 +151,7 @@ function local_setup {
 
 @test "lib preexec: safe_append_preexec()" {
 	test_preexec_function_name="test"
-	load ../test_helper_libs
+	setup_libs "preexec"
 
 	export preexec_functions=()
 	assert_equal "${preexec_functions[*]}" ""

From 6734baf950d8bd7bca8821c7ecde942e1f94a0f7 Mon Sep 17 00:00:00 2001
From: John D Pell <John+git@gaelicWizard.net>
Date: Thu, 3 Mar 2022 23:02:29 -0800
Subject: [PATCH 21/23] test/base: lose old TravisCS skip

---
 test/plugins/base.plugin.bats | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/test/plugins/base.plugin.bats b/test/plugins/base.plugin.bats
index f11983f1..6022451a 100644
--- a/test/plugins/base.plugin.bats
+++ b/test/plugins/base.plugin.bats
@@ -8,10 +8,6 @@ function local_setup_file() {
 }
 
 @test 'plugins base: ips()' {
-  if [[ -n "${CI:-}" ]]; then
-    skip 'ifconfig probably requires sudo on TravisCI'
-  fi
-
   declare -r localhost='127.0.0.1'
   run ips
   assert_success

From dc380e9ed6f42967e759e8b66791f796db964843 Mon Sep 17 00:00:00 2001
From: John D Pell <John+git@gaelicWizard.net>
Date: Thu, 3 Mar 2022 23:14:33 -0800
Subject: [PATCH 22/23] =?UTF-8?q?test/battery:=20fix=20tests=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/plugins/battery.plugin.bats | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/plugins/battery.plugin.bats b/test/plugins/battery.plugin.bats
index 487fb68f..1a206558 100644
--- a/test/plugins/battery.plugin.bats
+++ b/test/plugins/battery.plugin.bats
@@ -195,14 +195,14 @@ function setup_acpi {
 # Creates a `upower` function that simulates output like the real `upower` command.
 # The passed in parameter is used for the remaining battery percentage.
 function setup_upower {
+	trap -p PIPE | grep -q PIPE || trap '' PIPE
 	percent="$1"
 	BAT0="/org/freedesktop/UPower/devices/battery_BAT$RANDOM"
 
 	function upower {
 		case $1 in
 		'-e'|'--enumerate')
-			# don't just `echo` twice because `grep` will close the pipe after matching the first line...
-			echo "$BAT0"$'\n'"/org/freedesktop/UPower/devices/mouse_hid_${RANDOM}_battery"
+			printf '%s\n' "$BAT0" "/org/freedesktop/UPower/devices/mouse_hid_${RANDOM}_battery"
 			;;
 		'-i'|'--show-info')
 			if [[ $2 == "$BAT0" ]]

From 6d422f17e44760c644f2e01363353a655a95906a Mon Sep 17 00:00:00 2001
From: John D Pell <John+git@gaelicWizard.net>
Date: Thu, 3 Mar 2022 23:33:05 -0800
Subject: [PATCH 23/23] Revert dc380e9ed6f42967e759e8b66791f796db964843

---
 test/plugins/battery.plugin.bats | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/plugins/battery.plugin.bats b/test/plugins/battery.plugin.bats
index 1a206558..49199ef2 100644
--- a/test/plugins/battery.plugin.bats
+++ b/test/plugins/battery.plugin.bats
@@ -195,7 +195,6 @@ function setup_acpi {
 # Creates a `upower` function that simulates output like the real `upower` command.
 # The passed in parameter is used for the remaining battery percentage.
 function setup_upower {
-	trap -p PIPE | grep -q PIPE || trap '' PIPE
 	percent="$1"
 	BAT0="/org/freedesktop/UPower/devices/battery_BAT$RANDOM"