Merge pull request #285 from TypedDevs/fix/283-strictmode

Fix strictmode

Author: Chemaclass

CHANGELOG.md

@@ -9,7 +9,7 @@
 - Support for displaying the clock without `perl` (for non-macOS)
 - Add `-l|--log-junit <log.xml>` option
 - Add `-r|--report-html <report.html>` option
-- Foundation to enable strictmode
+- Enable strictmode
 
 ## [0.13.0](https://github.com/TypedDevs/bashunit/compare/0.12.0...0.13.0) - 2024-06-23
 

bashunit

@@ -1,9 +1,11 @@
 #!/bin/bash
+set -euo pipefail
 
 # shellcheck disable=SC2034
 declare -r BASHUNIT_VERSION="0.13.0"
 
-readonly BASHUNIT_ROOT_DIR="$(dirname "${BASH_SOURCE[0]}")"
+# shellcheck disable=SC2155
+declare -r BASHUNIT_ROOT_DIR="$(dirname "${BASH_SOURCE[0]}")"
 export BASHUNIT_ROOT_DIR
 
 source "$BASHUNIT_ROOT_DIR/src/default_env_config.sh"
@@ -40,15 +42,15 @@ while [[ $# -gt 0 ]]; do
  shift
  ;;
  -s|--simple)
- SIMPLE_OUTPUT=true
+ export SIMPLE_OUTPUT=true
  shift
  ;;
  -v|--verbose)
- SIMPLE_OUTPUT=false
+ export SIMPLE_OUTPUT=false
  shift
  ;;
  -S|--stop-on-failure)
- STOP_ON_FAILURE=true
+ export STOP_ON_FAILURE=true
  shift
  ;;
  -e|--env)
@@ -58,12 +60,12 @@ while [[ $# -gt 0 ]]; do
  shift
  ;;
  -l|--log-junit)
- LOG_JUNIT="$2";
+ export LOG_JUNIT="$2";
  shift
  shift
  ;;
  -r|--report-html)
- REPORT_HTML="$2";
+ export REPORT_HTML="$2";
  shift
  shift
  ;;
@@ -88,6 +90,8 @@ while [[ $# -gt 0 ]]; do
  esac
 done
 
+set +eu
+
 if [[ -n "$_ASSERT_FN" ]]; then
  main::exec_assert "$_ASSERT_FN" "${_ARGS[@]}"
 else

src/colors.sh

@@ -17,7 +17,6 @@ sgr() {
  echo $'\e'"[${codes}m"
 }
 
-_COLOR_DEFAULT="$(sgr 0)"
 _COLOR_BOLD="$(sgr 1)"
 _COLOR_FAINT="$(sgr 2)"
 _COLOR_BLACK="$(sgr 30)"
@@ -31,3 +30,4 @@ _COLOR_RETURN_SUCCESS="$(sgr 42)$_COLOR_BLACK$_COLOR_BOLD"
 _COLOR_RETURN_SKIPPED="$(sgr 43)$_COLOR_BLACK$_COLOR_BOLD"
 _COLOR_RETURN_INCOMPLETE="$(sgr 46)$_COLOR_BLACK$_COLOR_BOLD"
 _COLOR_RETURN_SNAPSHOT="$(sgr 44)$_COLOR_BLACK$_COLOR_BOLD"
+_COLOR_DEFAULT="$(sgr 0)"

src/console_results.sh

@@ -143,8 +143,8 @@ function console_results::print_failed_test() {
  local expected=$2
  local failure_condition_message=$3
  local actual=$4
- local extra_key=$5
- local extra_value=$6
+ local extra_key=${5-}
+ local extra_value=${6-}
 
  printf "\
 ${_COLOR_FAILED}✗ Failed${_COLOR_DEFAULT}: %s

src/test_doubles.sh

@@ -88,7 +88,7 @@ function assert_have_been_called_times() {
  actual="${variable}_times"
  local label="${3:-$(helper::normalize_test_function_name "${FUNCNAME[1]}")}"
 
- if [[ ${!actual} -ne $expected ]]; then
+ if [[ -z "${!actual-}" && $expected -ne 0 || ${!actual-0} -ne $expected ]]; then
  state::add_assertions_failed
  console_results::print_failed_test "${label}" "${command}" "to has been called" "${expected} times"
  return

tests/acceptance/bashunit_direct_fn_call_test.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -euo pipefail
 
 function set_up_before_script() {
  TEST_ENV_FILE="tests/acceptance/fixtures/.env.default"

tests/acceptance/bashunit_execution_error_test.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -euo pipefail
 
 function set_up_before_script() {
  TEST_ENV_FILE="tests/acceptance/fixtures/.env.default"

tests/acceptance/bashunit_fail_test.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -euo pipefail
 
 function set_up_before_script() {
  TEST_ENV_FILE="tests/acceptance/fixtures/.env.default"

tests/acceptance/bashunit_find_tests_command_line_test.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -euo pipefail
 
 function set_up_before_script() {
  TEST_ENV_FILE="tests/acceptance/fixtures/.env.default"

tests/acceptance/bashunit_pass_test.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -euo pipefail
 
 function set_up_before_script() {
  TEST_ENV_FILE="tests/acceptance/fixtures/.env.default"