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

Author: DannyBen

lib/bashly/libraries.yml

@@ -37,7 +37,7 @@ test:
   post_install_message: |
     Edit your tests in !txtgrn!test/approve!txtrst! and then run:
 
-      !txtpur!$ ./test/approve!txtrst!"
+      !txtpur!$ test/approve!txtrst!
 
     Docs: !undblu!https://github.com/DannyBen/approvals.bash
 

lib/bashly/templates/test/approvals.bash

@@ -1,4 +1,4 @@
-# approvals.bash v0.2.7
+# approvals.bash v0.3.2
 #
 # Interactive approval testing for Bash.
 # https://github.com/DannyBen/approvals.bash
@@ -26,7 +26,7 @@ approve() {
   fi
 
   if [[ "$(printf "%b" "$actual")" = "$(printf "%b" "$expected")" ]]; then
-    green "PASS $cmd"
+    pass "$cmd"
   else
     echo "--- [$(blue "diff: $cmd")] ---"
     $diff_cmd <(printf "%b" "$expected\n") <(printf "%b" "$actual\n" )  | tail -n +4
@@ -36,16 +36,21 @@ approve() {
 }
 
 describe() {
-  cyan "TEST $*"
+  echo "  $*"
+}
+
+context() {
+  echo
+  echo "$*"
 }
 
 fail() {
-  red "FAIL $*"
+  red "    FAILED $*"
   exit 1
 }
 
 pass() {
-  green "PASS $*"
+  green "    approved: $*"
   return 0
 }
 
@@ -86,6 +91,24 @@ user_approval() {
   fi
 }
 
+onexit() {
+  exitcode=$?
+  if [[ "$exitcode" == 0 ]]; then
+    green "\nFinished successfully"
+  else
+    red "\nFinished with failures"
+  fi
+  exit $exitcode
+}
+
+onerror() {
+  fail "Caller: $(caller)"
+}
+
+set -e
+trap 'onexit' EXIT
+trap 'onerror' ERR
+
 if diff --help | grep -- --color > /dev/null 2>&1; then
   diff_cmd="diff --unified --color=always"
 else

lib/bashly/templates/test/approve

@@ -8,13 +8,20 @@ PATH="$PATH:../"
 # Update me
 cli=download
 
-# Tests
-describe "root command"
-  approve "$cli"
-  approve "$cli --help"
+# Tests (context and describe are optional)
+context "when DEBUG is on"
+  export DEBUG=1
 
-describe "some other command"
-  approve "$cli other"
-  approve "$cli other --help"
+  describe "root command"
+    # for commands that fail (like without parameters), we add || 0
+    approve "$cli" || 0
+    approve "$cli --help"
+
+context "when DEBUG is off"
+  unset DEBUG
+
+  describe "some other command"
+    approve "$cli other" || 0
+    approve "$cli other --help"
 
 # ...more tests...

spec/approvals/cli/add/test

@@ -3,7 +3,7 @@ created spec/tmp/test/approve
 
 Edit your tests in test/approve and then run:
 
-  $ ./test/approve"
+  $ test/approve
 
 Docs: https://github.com/DannyBen/approvals.bash