Change default for AUTOENV_FILE_LEAVE to .env_leave

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

diff --git a/tests/recurse-upwards.t b/tests/recurse-upwards.t
index aa36edd22d43db5807ccf25eb04fa2aa35e97207..ff4fce65ba130d7c43213d4c5982683e7acfd823 100644 (file)
--- a/tests/recurse-upwards.t
+++ b/tests/recurse-upwards.t
@@ -1,6 +1,6 @@
 Test recursing into parent .env files.
 
-  $ source $TESTDIR/setup.sh
+  $ source $TESTDIR/setup.zsh || return 1
 
 Setup env actions / output.
 
@@ -9,17 +9,17 @@ Setup env actions / output.
 Create env files in root dir.
 
   $ echo 'echo ENTERED_root: PWD:${PWD:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t}' > .env
-  $ echo 'echo LEFT_root: PWD:${PWD:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t}' > .env.leave
+  $ echo 'echo LEFT_root: PWD:${PWD:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t}' > .env_leave
   $ test_autoenv_auth_env_files
 
 Create env files in sub dir.
 
   $ mkdir -p sub/sub2
   $ cd sub
-  ENTERED_root: PWD:recurse-upwards.t from:recurse-upwards.t to:sub
+  ENTERED_root: PWD:sub from:recurse-upwards.t to:sub
 
   $ echo 'echo ENTERED_sub: PWD:${PWD:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t}' > .env
-  $ echo 'echo LEFT_sub: PWD:${PWD:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t}' > .env.leave
+  $ echo 'echo LEFT_sub: PWD:${PWD:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t}' > .env_leave
   $ test_autoenv_auth_env_files
 
 The actual tests.
@@ -28,10 +28,10 @@ The actual tests.
   ENTERED_sub: PWD:sub from:sub to:sub
 
   $ cd ..
-  LEFT_sub: PWD:sub from:sub to:recurse-upwards.t
+  LEFT_sub: PWD:recurse-upwards.t from:sub to:recurse-upwards.t
 
   $ cd sub/sub2
-  ENTERED_sub: PWD:sub from:recurse-upwards.t to:sub2
+  ENTERED_sub: PWD:sub2 from:recurse-upwards.t to:sub2
 
   $ cd ..
 
@@ -54,7 +54,7 @@ Add sub/sub2/.env file, with a call to autoenv_source_parent.
   $ test_autoenv_add_to_env sub2/.env
   $ cd sub2
   autoenv_source_parent_from_sub2:
-  ENTERED_sub: PWD:sub from:sub to:sub2
+  ENTERED_sub: PWD:sub2 from:sub to:sub2
   ENTER2
   done_sub2
 
@@ -64,7 +64,7 @@ Move sub/.env away, now the root .env file should get sourced.
   $ touch -t 201401010102 .env
   $ cd .
   autoenv_source_parent_from_sub2:
-  ENTERED_root: PWD:recurse-upwards.t from:sub2 to:sub2
+  ENTERED_root: PWD:sub2 from:sub2 to:sub2
   done_sub2
   $ mv ../.env.out ../.env
 
@@ -78,7 +78,7 @@ Prepend call to autoenv_source_parent to sub/.env file.
 
   $ cd .
   autoenv_source_parent_from_sub:
-  ENTERED_root: PWD:recurse-upwards.t from:sub to:sub
+  ENTERED_root: PWD:sub from:sub to:sub
   ENTERED_sub: PWD:sub from:sub to:sub
   ENTER2
   done_sub
@@ -86,13 +86,13 @@ Prepend call to autoenv_source_parent to sub/.env file.
 
 Add sub/sub2/.env file.
 
-  $ echo -e "echo autoenv_source_parent_from_sub2:\nautoenv_source_parent\necho done_sub2\n" > sub2/.env
+  $ echo -e "echo autoenv_source_parent_from_sub2:\nautoenv_source_parent\necho done_sub2\n" >| sub2/.env
   $ test_autoenv_add_to_env sub2/.env
   $ cd sub2
   autoenv_source_parent_from_sub2:
   autoenv_source_parent_from_sub:
-  ENTERED_root: PWD:recurse-upwards.t from:sub to:sub
-  ENTERED_sub: PWD:sub from:sub to:sub
+  ENTERED_root: PWD:sub2 from:sub to:sub2
+  ENTERED_sub: PWD:sub2 from:sub to:sub2
   ENTER2
   done_sub
   done_sub2
@@ -102,14 +102,14 @@ This should not trigger the enter event, because it was handled via
 autoenv_source_parent already.
 
   $ cd ../..
-  LEFT_sub: PWD:sub from:sub2 to:recurse-upwards.t
+  LEFT_sub: PWD:recurse-upwards.t from:sub2 to:recurse-upwards.t
 
 
 Changing the root .env should trigger re-authentication via autoenv_source_parent.
 
 First, let's answer "no".
 
-  $ echo "echo NEW" > .env
+  $ echo "echo NEW" >| .env
   $ _autoenv_ask_for_yes() { echo "no"; return 1 }
   $ cd sub
   autoenv_source_parent_from_sub:
@@ -155,13 +155,13 @@ Touching the .env file will now source the parent env file.
 
 
   $ cd ..
-  LEFT_sub: PWD:sub from:sub to:recurse-upwards.t
+  LEFT_sub: PWD:recurse-upwards.t from:sub to:recurse-upwards.t
   $ mkdir sub/sub2/sub3
   $ cd sub/sub2/sub3
   autoenv_source_parent_from_sub2:
   autoenv_source_parent_from_sub:
   NEW
-  ENTERED_sub: PWD:sub from:recurse-upwards.t to:sub
+  ENTERED_sub: PWD:sub3 from:recurse-upwards.t to:sub3
   ENTER2
   done_sub
   done_sub2