fix: resolve issues with --show-skipped and --show-incomplete flags

Author: Chemaclass

src/console_results.sh

@@ -307,13 +307,17 @@ function console_results::print_skipped_tests_and_reset() {
     local total_skipped
     total_skipped=$(state::get_tests_skipped)
 
+    if env::is_simple_output_enabled; then
+      printf "\n"
+    fi
+
     if [[ "$total_skipped" -eq 1 ]]; then
       echo -e "${_COLOR_BOLD}There was 1 skipped test:${_COLOR_DEFAULT}\n"
     else
       echo -e "${_COLOR_BOLD}There were $total_skipped skipped tests:${_COLOR_DEFAULT}\n"
     fi
 
-    sed '${/^$/d;}' "$SKIPPED_OUTPUT_PATH" | sed 's/^/|/'
+    tr -d '\r' < "$SKIPPED_OUTPUT_PATH" | sed '/^[[:space:]]*$/d' | sed 's/^/|/'
     rm "$SKIPPED_OUTPUT_PATH"
 
     echo ""
@@ -325,13 +329,17 @@ function console_results::print_incomplete_tests_and_reset() {
     local total_incomplete
     total_incomplete=$(state::get_tests_incomplete)
 
+    if env::is_simple_output_enabled; then
+      printf "\n"
+    fi
+
     if [[ "$total_incomplete" -eq 1 ]]; then
       echo -e "${_COLOR_BOLD}There was 1 incomplete test:${_COLOR_DEFAULT}\n"
     else
       echo -e "${_COLOR_BOLD}There were $total_incomplete incomplete tests:${_COLOR_DEFAULT}\n"
     fi
 
-    sed '${/^$/d;}' "$INCOMPLETE_OUTPUT_PATH" | sed 's/^/|/'
+    tr -d '\r' < "$INCOMPLETE_OUTPUT_PATH" | sed '/^[[:space:]]*$/d' | sed 's/^/|/'
     rm "$INCOMPLETE_OUTPUT_PATH"
 
     echo ""

src/main.sh

@@ -67,10 +67,10 @@ function main::cmd_test() {
         exit 0
         ;;
       --show-skipped)
-        export BASHUNIT_SHOW_SKIPPED=true
+        BASHUNIT_SHOW_SKIPPED=true
         ;;
       --show-incomplete)
-        export BASHUNIT_SHOW_INCOMPLETE=true
+        BASHUNIT_SHOW_INCOMPLETE=true
         ;;
       *)
         raw_args+=("$1")

src/runner.sh

@@ -65,7 +65,7 @@ function runner::load_test_files() {
     parallel::aggregate_test_results "$TEMP_DIR_PARALLEL_TEST_SUITE"
     # Kill the spinner once the aggregation finishes
     disown "$spinner_pid" && kill "$spinner_pid" &>/dev/null
-    printf "\r " # Clear the spinner output
+    printf "\r  \r" # Clear the spinner output
     for script_id in "${scripts_ids[@]}"; do
       export BASHUNIT_CURRENT_SCRIPT_ID="${script_id}"
       cleanup_script_temp_files
@@ -111,6 +111,13 @@ function runner::load_bench_files() {
 }
 
 function runner::spinner() {
+  # Only show spinner when output is to a terminal
+  if [[ ! -t 1 ]]; then
+    # Not a terminal, just wait silently
+    while true; do sleep 1; done
+    return
+  fi
+
   if env::is_simple_output_enabled; then
     printf "\n"
   fi