Change antidote sourcing in tests

mattmc3 · Oct 2, 2023 · 852d189 · 852d189
1 parent f984312
commit 852d189
Show file tree

Hide file tree

Showing 21 changed files with 24 additions and 1 deletion.
diff --git a/tests/README.md b/tests/README.md
@@ -21,6 +21,7 @@ But you probably just want to source setup...
 
 ```zsh
 % source ./tests/_setup.zsh
+% source ./antidote.zsh
 %
 ```
 

diff --git a/tests/functions/t_reset b/tests/functions/t_reset
@@ -1,6 +1,8 @@
 #!/bin/zsh
 function t_reset {
+  0=${(%):-%x}
   t_teardown
   t_setup
+  source ${0:A:h:h:h}/antidote.zsh
 }
 t_reset "$@"
diff --git a/tests/functions/t_setup b/tests/functions/t_setup
@@ -36,6 +36,5 @@ function t_setup {
 
   # load antidote
   typeset -g ANTIDOTE_HOME=$ZDOTDIR/antidote_home
-  source $prjdir/antidote.zsh
 }
 t_setup "$@"
diff --git a/tests/functions/t_setup_real b/tests/functions/t_setup_real
@@ -2,6 +2,7 @@
 function t_setup_real {
   0=${(%):-%x}
   local testdir="${0:A:h:h}"
+  local prjdir="${0:A:h:h:h}"
 
   # undo setup so we clone for real
   zstyle ':antidote:tests' cloning 'on'
@@ -20,5 +21,8 @@ function t_setup_real {
   # clean out antidote home
   [[ -d $ANTIDOTE_HOME ]] && rm -rf -- "$ANTIDOTE_HOME"
   mkdir -p "$ANTIDOTE_HOME"
+
+  # source antidote
+  source $prjdir/antidote.zsh
 }
 t_setup_real "$@"
diff --git a/tests/test_antidote.md b/tests/test_antidote.md
@@ -14,6 +14,7 @@ antidote: Expecting zsh. Found 'bash'.
 % echo $+functions[antidote]
 0
 % source ./tests/_setup.zsh
+% source ./antidote.zsh
 % echo $+functions[antidote]
 1
 % git --version

diff --git a/tests/test_bundle_helpers.md b/tests/test_bundle_helpers.md
@@ -5,6 +5,7 @@
 ```zsh
 % TESTDATA=$PWD/tests/testdata
 % source ./tests/_setup.zsh
+% source ./antidote.zsh
 % antidote-bundle -h &>/dev/null
 %
 ```

diff --git a/tests/test_cmd_bundle.md b/tests/test_cmd_bundle.md
@@ -4,6 +4,7 @@
 
 ```zsh
 % source ./tests/_setup.zsh
+% source ./antidote.zsh
 %
 ```
 

diff --git a/tests/test_cmd_help.md b/tests/test_cmd_help.md
@@ -4,6 +4,7 @@
 
 ```zsh
 % source ./tests/_setup.zsh
+% source ./antidote.zsh
 %
 ```
 

diff --git a/tests/test_cmd_home.md b/tests/test_cmd_home.md
@@ -4,6 +4,7 @@
 
 ```zsh
 % source ./tests/_setup.zsh
+% source ./antidote.zsh
 %
 ```
 

diff --git a/tests/test_cmd_init.md b/tests/test_cmd_init.md
@@ -4,6 +4,7 @@
 
 ```zsh
 % source ./tests/_setup.zsh
+% source ./antidote.zsh
 %
 ```
 

diff --git a/tests/test_cmd_install.md b/tests/test_cmd_install.md
@@ -4,6 +4,7 @@
 
 ```zsh
 % source ./tests/_setup.zsh
+% source ./antidote.zsh
 %
 ```
 

diff --git a/tests/test_cmd_list.md b/tests/test_cmd_list.md
@@ -4,6 +4,7 @@
 
 ```zsh
 % source ./tests/_setup.zsh
+% source ./antidote.zsh
 %
 ```
 

diff --git a/tests/test_cmd_load.md b/tests/test_cmd_load.md
@@ -4,6 +4,7 @@
 
 ```zsh
 % source ./tests/_setup.zsh
+% source ./antidote.zsh
 %
 ```
 

diff --git a/tests/test_cmd_main.md b/tests/test_cmd_main.md
@@ -4,6 +4,7 @@
 
 ```zsh
 % source ./tests/_setup.zsh
+% source ./antidote.zsh
 %
 ```
 

diff --git a/tests/test_cmd_path.md b/tests/test_cmd_path.md
@@ -4,6 +4,7 @@
 
 ```zsh
 % source ./tests/_setup.zsh
+% source ./antidote.zsh
 %
 ```
 

diff --git a/tests/test_cmd_purge.md b/tests/test_cmd_purge.md
@@ -4,6 +4,7 @@
 
 ```zsh
 % source ./tests/_setup.zsh
+% source ./antidote.zsh
 %
 ```
 

diff --git a/tests/test_cmd_script.md b/tests/test_cmd_script.md
@@ -4,6 +4,7 @@
 
 ```zsh
 % source ./tests/_setup.zsh
+% source ./antidote.zsh
 %
 ```
 

diff --git a/tests/test_cmd_script_use.md b/tests/test_cmd_script_use.md
@@ -4,6 +4,7 @@
 
 ```zsh
 % source ./tests/_setup.zsh
+% source ./antidote.zsh
 %
 ```
 

diff --git a/tests/test_cmd_update.md b/tests/test_cmd_update.md
@@ -4,6 +4,7 @@
 
 ```zsh
 % source ./tests/_setup.zsh
+% source ./antidote.zsh
 %
 ```
 

diff --git a/tests/test_helpers.md b/tests/test_helpers.md
@@ -4,6 +4,7 @@
 
 ```zsh
 % source ./tests/_setup.zsh
+% source ./antidote.zsh
 %
 ```
 

diff --git a/tests/test_setopts.md → tests/test_zsetopts.md b/tests/test_setopts.md → tests/test_zsetopts.md
@@ -4,6 +4,7 @@
 
 ```zsh
 % source ./tests/_setup.zsh
+% source ./antidote.zsh
 %
 ```