- Update approvals.bash (bashly add test) to v0.3.3

Author: DannyBen

lib/bashly/templates/test/approvals.bash

@@ -1,14 +1,14 @@
-# approvals.bash v0.3.2
+# approvals.bash v0.3.3
 #
 # Interactive approval testing for Bash.
 # https://github.com/DannyBen/approvals.bash
 approve() {
   local expected approval approval_file actual cmd
   approvals_dir=${APPROVALS_DIR:=approvals}
-  
+
   cmd=$1
-  actual=$(eval "$cmd" 2>&1)  
-  last_exit_code=$?
+  last_exit_code=0
+  actual=$(eval "$cmd" 2>&1) || last_exit_code=$?
   approval=$(printf "%b" "$cmd" | tr -s -c "[:alnum:]" _)
   approval_file="$approvals_dir/${2:-"$approval"}"
 
@@ -29,28 +29,29 @@ approve() {
     pass "$cmd"
   else
     echo "--- [$(blue "diff: $cmd")] ---"
-    $diff_cmd <(printf "%b" "$expected\n") <(printf "%b" "$actual\n" )  | tail -n +4
+    $diff_cmd <(printf "%b" "$expected\n") <(printf "%b" "$actual\n") | tail -n +4
     echo "--- [$(blue "diff: $cmd")] ---"
     user_approval "$cmd" "$actual" "$approval_file"
   fi
 }
 
 describe() {
-  echo "  $*"
+  echo
+  blue "= $*"
 }
 
 context() {
   echo
-  echo "$*"
+  magenta "= $*"
 }
 
 fail() {
-  red "    FAILED $*"
+  red "  FAILED: $*"
   exit 1
 }
 
 pass() {
-  green "    approved: $*"
+  green "  approved: $*"
   return 0
 }
 
@@ -79,12 +80,12 @@ user_approval() {
     fail "$cmd"
   fi
 
-  echo 
+  echo
   printf "[A]pprove? \n"
   response=$(bash -c "read -n 1 key; echo \$key")
   printf "\r"
   if [[ $response =~ [Aa] ]]; then
-    printf "%b\n" "$actual" > "$approval_file"
+    printf "%b\n" "$actual" >"$approval_file"
     pass "$cmd"
   else
     fail "$cmd"
@@ -109,7 +110,7 @@ set -e
 trap 'onexit' EXIT
 trap 'onerror' ERR
 
-if diff --help | grep -- --color > /dev/null 2>&1; then
+if diff --help | grep -- --color >/dev/null 2>&1; then
   diff_cmd="diff --unified --color=always"
 else
   diff_cmd="diff --unified"

lib/bashly/templates/test/approve

@@ -3,25 +3,23 @@
 
 cd ./test || exit
 source approvals.bash
-PATH="$PATH:../"
 
 # Update me
-cli=download
+cli=./download
 
-# Tests (context and describe are optional)
+# Tests (context, describe and indentation are optional)
 context "when DEBUG is on"
   export DEBUG=1
 
   describe "root command"
-    # for commands that fail (like without parameters), we add || 0
-    approve "$cli" || 0
+    approve "$cli"
     approve "$cli --help"
 
 context "when DEBUG is off"
   unset DEBUG
 
   describe "some other command"
-    approve "$cli other" || 0
+    approve "$cli other"
     approve "$cli other --help"
 
 # ...more tests...