test: adapt snapshots tests

TypedDevs · Oct 13, 2024 · 5a370f7 · 5a370f7
1 parent a03100d
commit 5a370f7
Show file tree

Hide file tree

Showing 17 changed files with 34 additions and 26 deletions.
diff --git a/src/runner.sh b/src/runner.sh
@@ -108,12 +108,18 @@ function runner::call_test_functions() {
 }
 
 function runner::render_running_file_header() {
-  if ! env::is_simple_output_enabled && ! parallel::is_enabled; then
-    printf "${_COLOR_BOLD}%s${_COLOR_DEFAULT}\n" "Running: $script"
+  if parallel::is_enabled; then
+    return
   fi
 
-  if env::is_simple_output_enabled && env::is_verbose_enabled; then
-    printf "\n${_COLOR_BOLD}%s${_COLOR_DEFAULT}" "Running: $script"
+  if ! env::is_simple_output_enabled; then
+    if env::is_verbose_enabled; then
+      printf "\n${_COLOR_BOLD}%s${_COLOR_DEFAULT}\n" "Running $script"
+    else
+      printf "${_COLOR_BOLD}%s${_COLOR_DEFAULT}\n" "Running $script"
+    fi
+  elif env::is_verbose_enabled; then
+    printf "\n\n${_COLOR_BOLD}%s${_COLOR_DEFAULT}" "Running $script"
   fi
 }
 

diff --git a/tests/acceptance/bashunit_execution_error_test.sh b/tests/acceptance/bashunit_execution_error_test.sh
@@ -36,7 +36,7 @@ function test_bashunit_when_a_execution_error() {
   }
 
   fixture_start=$(
-    printf "Running ./tests/acceptance/fixtures/test_bashunit_when_a_execution_error.sh"
+    printf "${color_bold}%s${color_default}\n" "Running ./tests/acceptance/fixtures/test_bashunit_when_a_execution_error.sh"
     format_fail_title "✗ Failed" ": Error"
     format_expect_title "Expected"
     format_expect_value "'127'"
@@ -53,7 +53,9 @@ function test_bashunit_when_a_execution_error() {
   todo "Add snapshots with regex to assert this test (part of the error message is localized)"
   todo "Add snapshots with simple/verbose modes as in bashunit_pass_test and bashunit_fail_test"
 
-  assert_contains "$fixture_start" "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file")"
-  assert_contains "$fixture_end" "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file")"
+  # shellcheck disable=SC2155
+  local actual="$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file")"
+  assert_contains "$fixture_start" "$actual"
+  assert_contains "$fixture_end" "$actual"
   assert_general_error "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file")"
 }
diff --git a/...napshots/bashunit_fail_test_sh.test_bashunit_when_a_test_fail_verbose_output_env.snapshot b/...napshots/bashunit_fail_test_sh.test_bashunit_when_a_test_fail_verbose_output_env.snapshot
@@ -1,4 +1,4 @@
-Running ./tests/acceptance/fixtures/test_bashunit_when_a_test_fail.sh
+[1mRunning ./tests/acceptance/fixtures/test_bashunit_when_a_test_fail.sh[0m
 [32m✓ Passed[0m: Assert same
 [32m✓ Passed[0m: Assert contains
 [31m✗ Failed[0m: Assert failing

diff --git a/...shots/bashunit_fail_test_sh.test_bashunit_when_a_test_fail_verbose_output_option.snapshot b/...shots/bashunit_fail_test_sh.test_bashunit_when_a_test_fail_verbose_output_option.snapshot
@@ -1,4 +1,4 @@
-Running ./tests/acceptance/fixtures/test_bashunit_when_a_test_fail.sh
+[1mRunning ./tests/acceptance/fixtures/test_bashunit_when_a_test_fail.sh[0m
 [32m✓ Passed[0m: Assert same
 [32m✓ Passed[0m: Assert contains
 [31m✗ Failed[0m: Assert failing

diff --git a/...hots/bashunit_find_tests_command_line_test_sh.test_all_tests_files_with_wildcard.snapshot b/...hots/bashunit_find_tests_command_line_test_sh.test_all_tests_files_with_wildcard.snapshot
@@ -1,7 +1,7 @@
-Running ./tests/acceptance/fixtures/tests_path/a_test.sh
+[1mRunning ./tests/acceptance/fixtures/tests_path/a_test.sh[0m
 [32m✓ Passed[0m: Assert greater and less than
 [32m✓ Passed[0m: Assert empty
-Running ./tests/acceptance/fixtures/tests_path/other_test.sh
+[1mRunning ./tests/acceptance/fixtures/tests_path/other_test.sh[0m
 [32m✓ Passed[0m: Assert same
 [32m✓ Passed[0m: Assert contains
 

diff --git a/...bashunit_find_tests_command_line_test_sh.test_all_tests_files_within_a_directory.snapshot b/...bashunit_find_tests_command_line_test_sh.test_all_tests_files_within_a_directory.snapshot
@@ -1,7 +1,7 @@
-Running ./tests/acceptance/fixtures/tests_path/a_test.sh
+[1mRunning ./tests/acceptance/fixtures/tests_path/a_test.sh[0m
 [32m✓ Passed[0m: Assert greater and less than
 [32m✓ Passed[0m: Assert empty
-Running ./tests/acceptance/fixtures/tests_path/other_test.sh
+[1mRunning ./tests/acceptance/fixtures/tests_path/other_test.sh[0m
 [32m✓ Passed[0m: Assert same
 [32m✓ Passed[0m: Assert contains
 

diff --git a/...hots/bashunit_find_tests_command_line_test_sh.test_all_tests_files_within_a_file.snapshot b/...hots/bashunit_find_tests_command_line_test_sh.test_all_tests_files_within_a_file.snapshot
@@ -1,4 +1,4 @@
-Running ./tests/acceptance/fixtures/tests_path/a_test.sh
+[1mRunning ./tests/acceptance/fixtures/tests_path/a_test.sh[0m
 [32m✓ Passed[0m: Assert greater and less than
 [32m✓ Passed[0m: Assert empty
 

diff --git a/...acceptance/snapshots/bashunit_log_junit_test_sh.test_bashunit_when_log_junit_env.snapshot b/...acceptance/snapshots/bashunit_log_junit_test_sh.test_bashunit_when_log_junit_env.snapshot
@@ -1,4 +1,4 @@
-Running ./tests/acceptance/fixtures/test_bashunit_when_log_junit.sh
+[1mRunning ./tests/acceptance/fixtures/test_bashunit_when_log_junit.sh[0m
 [32m✓ Passed[0m: Success
 [31m✗ Failed[0m: Failure
     [2mExpected[0m [1m'2'[0m

diff --git a/...eptance/snapshots/bashunit_log_junit_test_sh.test_bashunit_when_log_junit_option.snapshot b/...eptance/snapshots/bashunit_log_junit_test_sh.test_bashunit_when_log_junit_option.snapshot
@@ -1,4 +1,4 @@
-Running ./tests/acceptance/fixtures/test_bashunit_when_log_junit.sh
+[1mRunning ./tests/acceptance/fixtures/test_bashunit_when_log_junit.sh[0m
 [32m✓ Passed[0m: Success
 [31m✗ Failed[0m: Failure
     [2mExpected[0m [1m'2'[0m

diff --git a/...pshots/bashunit_pass_test_sh.test_bashunit_when_a_test_passes_verbose_output_env.snapshot b/...pshots/bashunit_pass_test_sh.test_bashunit_when_a_test_passes_verbose_output_env.snapshot
@@ -1,4 +1,4 @@
-Running ./tests/acceptance/fixtures/test_bashunit_when_a_test_passes.sh
+[1mRunning ./tests/acceptance/fixtures/test_bashunit_when_a_test_passes.sh[0m
 [32m✓ Passed[0m: Assert same
 [32m✓ Passed[0m: Assert contains
 [32m✓ Passed[0m: Assert greater and less than

diff --git a/...ots/bashunit_pass_test_sh.test_bashunit_when_a_test_passes_verbose_output_option.snapshot b/...ots/bashunit_pass_test_sh.test_bashunit_when_a_test_passes_verbose_output_option.snapshot
@@ -1,4 +1,4 @@
-Running ./tests/acceptance/fixtures/test_bashunit_when_a_test_passes.sh
+[1mRunning ./tests/acceptance/fixtures/test_bashunit_when_a_test_passes.sh[0m
 [32m✓ Passed[0m: Assert same
 [32m✓ Passed[0m: Assert contains
 [32m✓ Passed[0m: Assert greater and less than

diff --git a/tests/acceptance/snapshots/bashunit_path_test_sh.test_bashunit_with_argument_path.snapshot b/tests/acceptance/snapshots/bashunit_path_test_sh.test_bashunit_with_argument_path.snapshot
@@ -1,7 +1,7 @@
-Running tests/acceptance/fixtures/tests_path/a_test.sh
+[1mRunning tests/acceptance/fixtures/tests_path/a_test.sh[0m
 [32m✓ Passed[0m: Assert greater and less than
 [32m✓ Passed[0m: Assert empty
-Running tests/acceptance/fixtures/tests_path/other_test.sh
+[1mRunning tests/acceptance/fixtures/tests_path/other_test.sh[0m
 [32m✓ Passed[0m: Assert same
 [32m✓ Passed[0m: Assert contains
 

diff --git a/...s/acceptance/snapshots/bashunit_path_test_sh.test_bashunit_with_env_default_path.snapshot b/...s/acceptance/snapshots/bashunit_path_test_sh.test_bashunit_with_env_default_path.snapshot
@@ -1,7 +1,7 @@
-Running tests/acceptance/fixtures/tests_path/a_test.sh
+[1mRunning tests/acceptance/fixtures/tests_path/a_test.sh[0m
 [32m✓ Passed[0m: Assert greater and less than
 [32m✓ Passed[0m: Assert empty
-Running tests/acceptance/fixtures/tests_path/other_test.sh
+[1mRunning tests/acceptance/fixtures/tests_path/other_test.sh[0m
 [32m✓ Passed[0m: Assert same
 [32m✓ Passed[0m: Assert contains
 

diff --git a/...ptance/snapshots/bashunit_report_html_test_sh.test_bashunit_when_report_html_env.snapshot b/...ptance/snapshots/bashunit_report_html_test_sh.test_bashunit_when_report_html_env.snapshot
@@ -1,4 +1,4 @@
-Running ./tests/acceptance/fixtures/test_bashunit_when_report_html.sh
+[1mRunning ./tests/acceptance/fixtures/test_bashunit_when_report_html.sh[0m
 [32m✓ Passed[0m: Success
 [31m✗ Failed[0m: Fail
     [2mExpected[0m [1m'to be empty'[0m

diff --git a/...nce/snapshots/bashunit_report_html_test_sh.test_bashunit_when_report_html_option.snapshot b/...nce/snapshots/bashunit_report_html_test_sh.test_bashunit_when_report_html_option.snapshot
@@ -1,4 +1,4 @@
-Running ./tests/acceptance/fixtures/test_bashunit_when_report_html.sh
+[1mRunning ./tests/acceptance/fixtures/test_bashunit_when_report_html.sh[0m
 [32m✓ Passed[0m: Success
 [31m✗ Failed[0m: Fail
     [2mExpected[0m [1m'to be empty'[0m

diff --git a/...napshots/bashunit_stop_on_failure_test_sh.test_bashunit_when_stop_on_failure_env.snapshot b/...napshots/bashunit_stop_on_failure_test_sh.test_bashunit_when_stop_on_failure_env.snapshot
@@ -1,4 +1,4 @@
-Running ./tests/acceptance/fixtures/test_bashunit_when_stop_on_failure.sh
+[1mRunning ./tests/acceptance/fixtures/test_bashunit_when_stop_on_failure.sh[0m
 [32m✓ Passed[0m: A success
 [31m✗ Failed[0m: B error
     [2mExpected[0m [1m'1'[0m

diff --git a/...shots/bashunit_stop_on_failure_test_sh.test_bashunit_when_stop_on_failure_option.snapshot b/...shots/bashunit_stop_on_failure_test_sh.test_bashunit_when_stop_on_failure_option.snapshot
@@ -1,4 +1,4 @@
-Running ./tests/acceptance/fixtures/test_bashunit_when_stop_on_failure.sh
+[1mRunning ./tests/acceptance/fixtures/test_bashunit_when_stop_on_failure.sh[0m
 [32m✓ Passed[0m: A success
 [31m✗ Failed[0m: B error
     [2mExpected[0m [1m'1'[0m