Fixes after using `setopt nounset` during tests

[zsh-autoenv.git] / tests / autoenv.t

diff --git a/tests/autoenv.t b/tests/autoenv.t
index 47509129e259bf31fd504573da2a28a02ef6277d..701e3b463967d21abb56e773929655f6d8ad343d 100644 (file)
--- a/tests/autoenv.t
+++ b/tests/autoenv.t
@@ -6,17 +6,18 @@ Lets set a simple .env action
 
 Manually create auth file
 
-  $ echo "$PWD/.env:$(echo echo ENTERED | shasum)" > $AUTOENV_ENV_FILENAME
+  $ test_autoenv_add_to_env $PWD/.env
   $ cd .
   ENTERED
 
 Now try to make it accept it
 
-  $ unset _dotenv_stack_entered
+  $ _autoenv_stack_entered=()
   $ rm $AUTOENV_ENV_FILENAME
-  $ _dotenv_read_answer() { echo 'y' }
+  $ _autoenv_ask_for_yes() { echo "yes" }
   $ cd .
-  Attempting to load unauthorized env file: /tmp/cramtests-??????/autoenv.t/.env (glob)
+  Attempting to load unauthorized env file!
+  -* /tmp/cramtests-*/autoenv.t/.env (glob)
   
   **********************************************
   
@@ -24,26 +25,24 @@ Now try to make it accept it
   
   **********************************************
   
-  Would you like to authorize it? [y/N] 
+  Would you like to authorize it? (type 'yes') yes
   ENTERED
 
 
+The last "ENTERED" is because it executed the command.
 
+Now lets see that it actually checks the shasum value.
 
-
-The last "ENTERED" is because it executed the command
-
-Now lets see that it actually checks the shasum value
-
-  $ unset _dotenv_stack_entered
+  $ _autoenv_stack_entered=()
   $ cd .
   ENTERED
 
-  $ unset _dotenv_stack_entered
+  $ _autoenv_stack_entered=()
   $ rm $AUTOENV_ENV_FILENAME
-  $ echo "$PWD/.env:$(echo mischief | shasum)" > $AUTOENV_ENV_FILENAME
+  $ test_autoenv_add_to_env $PWD/.env mischief
   $ cd .
-  Attempting to load unauthorized env file: /tmp/cramtests-??????/autoenv.t/.env (glob)
+  Attempting to load unauthorized env file!
+  -* /tmp/cramtests-*/autoenv.t/.env (glob)
   
   **********************************************
   
@@ -51,20 +50,18 @@ Now lets see that it actually checks the shasum value
   
   **********************************************
   
-  Would you like to authorize it? [y/N] 
+  Would you like to authorize it? (type 'yes') yes
   ENTERED
 
 
-
-
-
 Now, will it take no for an answer?
 
-  $ unset _dotenv_stack_entered
+  $ _autoenv_stack_entered=()
   $ rm $AUTOENV_ENV_FILENAME
-  $ _dotenv_read_answer() { echo 'n' }
+  $ _autoenv_ask_for_yes() { echo "no"; return 1 }
   $ cd .
-  Attempting to load unauthorized env file: /tmp/cramtests-??????/autoenv.t/.env (glob)
+  Attempting to load unauthorized env file!
+  -* /tmp/cramtests-*/autoenv.t/.env (glob)
   
   **********************************************
   
@@ -72,16 +69,14 @@ Now, will it take no for an answer?
   
   **********************************************
   
-  Would you like to authorize it? [y/N] 
-
-
-
+  Would you like to authorize it? (type 'yes') no
 
 
-Lets also try one more time to ensure it didnt add it
+Lets also try one more time to ensure it didn't add it.
 
   $ cd .
-  Attempting to load unauthorized env file: /tmp/cramtests-??????/autoenv.t/.env (glob)
+  Attempting to load unauthorized env file!
+  -* /tmp/cramtests-*/autoenv.t/.env (glob)
   
   **********************************************
   
@@ -89,4 +84,4 @@ Lets also try one more time to ensure it didnt add it
   
   **********************************************
   
-  Would you like to authorize it? [y/N] 
+  Would you like to authorize it? (type 'yes') no