tests: define/use $TEST_SOURCE_AUTOENV

This handled (re)loading autoenv for
ZDOTDIR=tests/ZDOTDIR.loadviafunction.

diff --git a/tests/ZDOTDIR.loadviafunction/.zshenv b/tests/ZDOTDIR.loadviafunction/.zshenv
index 4e41fbcf592187c2c97bd32432eaad7eb3e695b2..8f836b576731accd240846fa3af59f245a7029e3 100644 (file)
--- a/tests/ZDOTDIR.loadviafunction/.zshenv
+++ b/tests/ZDOTDIR.loadviafunction/.zshenv
@@ -5,7 +5,6 @@ AUTOENV_DEBUG=0
 antigen-like-loader-function() {
   source "$TESTDIR/../autoenv.plugin.zsh"
 }
-antigen-like-loader-function
 
 export AUTOENV_ENV_FILENAME="$PWD/.env_auth"
 

diff --git a/tests/autoenv.t b/tests/autoenv.t
index 35cd9631c16680354c6f8078da5d2df291a06cf0..67be7ca7f27891ca676f32ca90f42fe06166f4cb 100644 (file)
--- a/tests/autoenv.t
+++ b/tests/autoenv.t
@@ -91,5 +91,5 @@ Lets also try one more time to ensure it didn't add it.
 Reloading the script should keep the current state, e.g. when reloading your
 ~/.zshrc.
 
-  $ source $TEST_AUTOENV_PLUGIN_FILE
+  $ $TEST_SOURCE_AUTOENV
   $ cd .

diff --git a/tests/setup.sh b/tests/setup.sh
index 9e5cf7b9f84427f3e718412c40b63b49d07eeb4b..27ba4239c446bdab4a71530af6210d5029e4edd4 100644 (file)
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -18,8 +18,12 @@ fi
 _save_errexit=${options[errexit]}
 set -e
 
-export TEST_AUTOENV_PLUGIN_FILE="$TESTDIR/../autoenv.plugin.zsh"
-source $TEST_AUTOENV_PLUGIN_FILE
+if (( ${+functions[antigen-like-loader-function]} )); then
+  TEST_SOURCE_AUTOENV=antigen-like-loader-function
+else
+  TEST_SOURCE_AUTOENV=(source $TESTDIR/../autoenv.plugin.zsh)
+fi
+$TEST_SOURCE_AUTOENV
 
 # Reset any authentication.
 echo -n >| $AUTOENV_ENV_FILENAME

diff --git a/tests/varstash_export.t b/tests/varstash_export.t
index d666d6666bfaddcefac8b1a8e8bd99c4a00ee632..2b758482e94882f2e175f09b7cddbdf4e42fe36f 100644 (file)
--- a/tests/varstash_export.t
+++ b/tests/varstash_export.t
@@ -35,14 +35,14 @@ The variable is not available in a subshell, only the exported one.
 
 Activate autoenv in the subshell.
 
-  $ $SHELL -c 'source $TEST_AUTOENV_PLUGIN_FILE; echo ${MYVAR}; echo $MYEXPORT'
+  $ $SHELL -c "$TEST_SOURCE_AUTOENV; echo \${MYVAR}; echo \$MYEXPORT"
   ENTER
   changed
   changed_export
 
 "autounstash" should handle the exported variables.
 
-  $ $SHELL -c 'source $TEST_AUTOENV_PLUGIN_FILE; cd ..; echo ${MYVAR:-empty}; echo $MYEXPORT'
+  $ $SHELL -c "$TEST_SOURCE_AUTOENV; cd ..; echo \${MYVAR:-empty}; echo \$MYEXPORT"
   ENTER
   LEAVE
   empty