Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

## Unreleased

- Fixed false negative with `set -e`
- Fixed name rendered when having `test_test_*`
- Fixed display test with multiple outputs in multiline
- Improved output: adding a space between each test file
Expand Down
19 changes: 15 additions & 4 deletions src/runner.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,16 +146,19 @@ function runner::run_test() {
exec 3>&1

local test_execution_result=$(
trap '
state::set_test_exit_code $?
runner::run_tear_down
runner::clear_mocks
state::export_subshell_context
' EXIT
Comment on lines +149 to +154

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very clever 🧠 πŸ‘πŸΌ

state::initialize_assertions_count
runner::run_set_up

# 2>&1: Redirects the std-error (FD 2) to the std-output (FD 1).
# points to the original std-output.
"$function_name" "$@" 2>&1

runner::run_tear_down
runner::clear_mocks
state::export_subshell_context
)

# Closes FD 3, which was used temporarily to hold the original stdout.
Expand DownExpand Up@@ -216,8 +219,9 @@ function runner::run_test() {
runner::parse_result "$function_name" "$test_execution_result" "$@"

local total_assertions="$(state::calculate_total_assertions "$test_execution_result")"
local test_exit_code="$(state::get_test_exit_code)"

if [[ -n $runtime_error ]]; then
if [[ -n $runtime_error || $test_exit_code -ne 0 ]]; then
state::add_tests_failed
console_results::print_error_test "$function_name" "$runtime_error"
reports::add_test_failed "$test_file" "$function_name" "$duration" "$total_assertions"
Expand DownExpand Up@@ -360,13 +364,20 @@ function runner::parse_result_sync() {
sed -E -e 's/.*##ASSERTIONS_SNAPSHOT=([0-9]*)##.*/\1/g'\
)

local test_exit_code=$(\
echo "$execution_result" |\
tail -n 1 |\
sed -E -e 's/.*##TEST_EXIT_CODE=([0-9]*)##.*/\1/g'\
)

log "debug" "[SYNC]" "function_name:$function_name" "execution_result:$execution_result"

((_ASSERTIONS_PASSED += assertions_passed)) || true
((_ASSERTIONS_FAILED += assertions_failed)) || true
((_ASSERTIONS_SKIPPED += assertions_skipped)) || true
((_ASSERTIONS_INCOMPLETE += assertions_incomplete)) || true
((_ASSERTIONS_SNAPSHOT += assertions_snapshot)) || true
((_TEST_EXIT_CODE += test_exit_code)) || true
}

function runner::write_failure_result_output() {
Expand Down
10 changes: 10 additions & 0 deletions src/state.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ _DUPLICATED_FUNCTION_NAMES=""
_FILE_WITH_DUPLICATED_FUNCTION_NAMES=""
_DUPLICATED_TEST_FUNCTIONS_FOUND=false
_TEST_OUTPUT=""
_TEST_EXIT_CODE=0

function state::get_tests_passed() {
echo "$_TESTS_PASSED"
Expand DownExpand Up@@ -123,6 +124,14 @@ function state::add_test_output() {
_TEST_OUTPUT+="$1"
}

function state::get_test_exit_code() {
echo "$_TEST_EXIT_CODE"
}

function state::set_test_exit_code() {
_TEST_EXIT_CODE="$1"
}

function state::set_duplicated_functions_merged() {
state::set_duplicated_test_functions_found
state::set_file_with_duplicated_function_names "$1"
Expand DownExpand Up@@ -155,6 +164,7 @@ function state::export_subshell_context() {
##ASSERTIONS_SKIPPED=$_ASSERTIONS_SKIPPED\
##ASSERTIONS_INCOMPLETE=$_ASSERTIONS_INCOMPLETE\
##ASSERTIONS_SNAPSHOT=$_ASSERTIONS_SNAPSHOT\
##TEST_EXIT_CODE=$_TEST_EXIT_CODE\
##TEST_OUTPUT=$encoded_test_output\
##
EOF
Expand Down
7 changes: 7 additions & 0 deletions tests/acceptance/bashunit_fail_test.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,13 @@ function test_bashunit_with_multiple_failing_tests() {
assert_general_error "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file" --simple)"
}

function test_bashunit_with_a_test_fail_and_exit_immediately() {
local test_file=./tests/acceptance/fixtures/test_bashunit_when_exit_immediately_after_execution_error.sh

assert_match_snapshot "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file")"
assert_general_error "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file" --simple)"
}

function test_different_simple_snapshots_matches() {
todo "The different snapshots for these tests should also be identical to each other, option to choose snapshot name?"
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
#!/bin/bash

function test_error() {
set -e
invalid_function_name arg1 arg2 &>/dev/null
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
Running ./tests/acceptance/fixtures/test_bashunit_when_exit_immediately_after_execution_error.sh
βœ— Error: Error


There was 1 failure:

|1) ./tests/acceptance/fixtures/test_bashunit_when_exit_immediately_after_execution_error.sh

Tests:  1 failed, 1 total
Assertions: 0 failed, 0 total

 Some tests failed 
4 changes: 4 additions & 0 deletions tests/unit/state_test.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -254,6 +254,7 @@ function test_initialize_assertions_count() {
##ASSERTIONS_SKIPPED=0\
##ASSERTIONS_INCOMPLETE=0\
##ASSERTIONS_SNAPSHOT=0\
##TEST_EXIT_CODE=0\
##TEST_OUTPUT=\
##"\
"$export_assertions_count"
Expand All@@ -270,6 +271,7 @@ function test_export_assertions_count() {
_ASSERTIONS_INCOMPLETE=12
_ASSERTIONS_SNAPSHOT=33
_ASSERTIONS_SNAPSHOT=33
_TEST_EXIT_CODE=1
_TEST_OUTPUT="something"

state::export_subshell_context
Expand All@@ -281,6 +283,7 @@ function test_export_assertions_count() {
##ASSERTIONS_SKIPPED=42\
##ASSERTIONS_INCOMPLETE=12\
##ASSERTIONS_SNAPSHOT=33\
##TEST_EXIT_CODE=1\
##TEST_OUTPUT=$(echo -n "something" | base64)##"\
"$export_assertions_count"
}
Expand All@@ -291,6 +294,7 @@ function test_calculate_total_assertions() {
##ASSERTIONS_SKIPPED=3\
##ASSERTIONS_INCOMPLETE=4\
##ASSERTIONS_SNAPSHOT=5\
##TEST_EXIT_CODE=0\
##TEST_OUTPUT=3zhbEncodedBase64##"

assert_same 15 "$(state::calculate_total_assertions "$input")"
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

## Unreleased

- Fixed false negative with `set -e`
- Fixed name rendered when having `test_test_*`
- Fixed display test with multiple outputs in multiline
- Improved output: adding a space between each test file
Expand Down
19 changes: 15 additions & 4 deletions src/runner.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,16 +146,19 @@ function runner::run_test() {
exec 3>&1

local test_execution_result=$(
trap '
state::set_test_exit_code $?
runner::run_tear_down
runner::clear_mocks
state::export_subshell_context
' EXIT
Comment on lines +149 to +154

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very clever 🧠 πŸ‘πŸΌ

state::initialize_assertions_count
runner::run_set_up

# 2>&1: Redirects the std-error (FD 2) to the std-output (FD 1).
# points to the original std-output.
"$function_name" "$@" 2>&1

runner::run_tear_down
runner::clear_mocks
state::export_subshell_context
)

# Closes FD 3, which was used temporarily to hold the original stdout.
Expand DownExpand Up@@ -216,8 +219,9 @@ function runner::run_test() {
runner::parse_result "$function_name" "$test_execution_result" "$@"

local total_assertions="$(state::calculate_total_assertions "$test_execution_result")"
local test_exit_code="$(state::get_test_exit_code)"

if [[ -n $runtime_error ]]; then
if [[ -n $runtime_error || $test_exit_code -ne 0 ]]; then
state::add_tests_failed
console_results::print_error_test "$function_name" "$runtime_error"
reports::add_test_failed "$test_file" "$function_name" "$duration" "$total_assertions"
Expand DownExpand Up@@ -360,13 +364,20 @@ function runner::parse_result_sync() {
sed -E -e 's/.*##ASSERTIONS_SNAPSHOT=([0-9]*)##.*/\1/g'\
)

local test_exit_code=$(\
echo "$execution_result" |\
tail -n 1 |\
sed -E -e 's/.*##TEST_EXIT_CODE=([0-9]*)##.*/\1/g'\
)

log "debug" "[SYNC]" "function_name:$function_name" "execution_result:$execution_result"

((_ASSERTIONS_PASSED += assertions_passed)) || true
((_ASSERTIONS_FAILED += assertions_failed)) || true
((_ASSERTIONS_SKIPPED += assertions_skipped)) || true
((_ASSERTIONS_INCOMPLETE += assertions_incomplete)) || true
((_ASSERTIONS_SNAPSHOT += assertions_snapshot)) || true
((_TEST_EXIT_CODE += test_exit_code)) || true
}

function runner::write_failure_result_output() {
Expand Down
10 changes: 10 additions & 0 deletions src/state.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ _DUPLICATED_FUNCTION_NAMES=""
_FILE_WITH_DUPLICATED_FUNCTION_NAMES=""
_DUPLICATED_TEST_FUNCTIONS_FOUND=false
_TEST_OUTPUT=""
_TEST_EXIT_CODE=0

function state::get_tests_passed() {
echo "$_TESTS_PASSED"
Expand DownExpand Up@@ -123,6 +124,14 @@ function state::add_test_output() {
_TEST_OUTPUT+="$1"
}

function state::get_test_exit_code() {
echo "$_TEST_EXIT_CODE"
}

function state::set_test_exit_code() {
_TEST_EXIT_CODE="$1"
}

function state::set_duplicated_functions_merged() {
state::set_duplicated_test_functions_found
state::set_file_with_duplicated_function_names "$1"
Expand DownExpand Up@@ -155,6 +164,7 @@ function state::export_subshell_context() {
##ASSERTIONS_SKIPPED=$_ASSERTIONS_SKIPPED\
##ASSERTIONS_INCOMPLETE=$_ASSERTIONS_INCOMPLETE\
##ASSERTIONS_SNAPSHOT=$_ASSERTIONS_SNAPSHOT\
##TEST_EXIT_CODE=$_TEST_EXIT_CODE\
##TEST_OUTPUT=$encoded_test_output\
##
EOF
Expand Down
7 changes: 7 additions & 0 deletions tests/acceptance/bashunit_fail_test.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,13 @@ function test_bashunit_with_multiple_failing_tests() {
assert_general_error "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file" --simple)"
}

function test_bashunit_with_a_test_fail_and_exit_immediately() {
local test_file=./tests/acceptance/fixtures/test_bashunit_when_exit_immediately_after_execution_error.sh

assert_match_snapshot "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file")"
assert_general_error "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file" --simple)"
}

function test_different_simple_snapshots_matches() {
todo "The different snapshots for these tests should also be identical to each other, option to choose snapshot name?"
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
#!/bin/bash

function test_error() {
set -e
invalid_function_name arg1 arg2 &>/dev/null
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
Running ./tests/acceptance/fixtures/test_bashunit_when_exit_immediately_after_execution_error.sh
βœ— Error: Error


There was 1 failure:

|1) ./tests/acceptance/fixtures/test_bashunit_when_exit_immediately_after_execution_error.sh

Tests:  1 failed, 1 total
Assertions: 0 failed, 0 total

 Some tests failed 
4 changes: 4 additions & 0 deletions tests/unit/state_test.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -254,6 +254,7 @@ function test_initialize_assertions_count() {
##ASSERTIONS_SKIPPED=0\
##ASSERTIONS_INCOMPLETE=0\
##ASSERTIONS_SNAPSHOT=0\
##TEST_EXIT_CODE=0\
##TEST_OUTPUT=\
##"\
"$export_assertions_count"
Expand All@@ -270,6 +271,7 @@ function test_export_assertions_count() {
_ASSERTIONS_INCOMPLETE=12
_ASSERTIONS_SNAPSHOT=33
_ASSERTIONS_SNAPSHOT=33
_TEST_EXIT_CODE=1
_TEST_OUTPUT="something"

state::export_subshell_context
Expand All@@ -281,6 +283,7 @@ function test_export_assertions_count() {
##ASSERTIONS_SKIPPED=42\
##ASSERTIONS_INCOMPLETE=12\
##ASSERTIONS_SNAPSHOT=33\
##TEST_EXIT_CODE=1\
##TEST_OUTPUT=$(echo -n "something" | base64)##"\
"$export_assertions_count"
}
Expand All@@ -291,6 +294,7 @@ function test_calculate_total_assertions() {
##ASSERTIONS_SKIPPED=3\
##ASSERTIONS_INCOMPLETE=4\
##ASSERTIONS_SNAPSHOT=5\
##TEST_EXIT_CODE=0\
##TEST_OUTPUT=3zhbEncodedBase64##"

assert_same 15 "$(state::calculate_total_assertions "$input")"
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

## Unreleased

- Fixed false negative with `set -e`
- Fixed name rendered when having `test_test_*`
- Fixed display test with multiple outputs in multiline
- Improved output: adding a space between each test file
Expand Down
19 changes: 15 additions & 4 deletions src/runner.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,16 +146,19 @@ function runner::run_test() {
exec 3>&1

local test_execution_result=$(
trap '
state::set_test_exit_code $?
runner::run_tear_down
runner::clear_mocks
state::export_subshell_context
' EXIT
Comment on lines +149 to +154

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very clever 🧠 πŸ‘πŸΌ

state::initialize_assertions_count
runner::run_set_up

# 2>&1: Redirects the std-error (FD 2) to the std-output (FD 1).
# points to the original std-output.
"$function_name" "$@" 2>&1

runner::run_tear_down
runner::clear_mocks
state::export_subshell_context
)

# Closes FD 3, which was used temporarily to hold the original stdout.
Expand DownExpand Up@@ -216,8 +219,9 @@ function runner::run_test() {
runner::parse_result "$function_name" "$test_execution_result" "$@"

local total_assertions="$(state::calculate_total_assertions "$test_execution_result")"
local test_exit_code="$(state::get_test_exit_code)"

if [[ -n $runtime_error ]]; then
if [[ -n $runtime_error || $test_exit_code -ne 0 ]]; then
state::add_tests_failed
console_results::print_error_test "$function_name" "$runtime_error"
reports::add_test_failed "$test_file" "$function_name" "$duration" "$total_assertions"
Expand DownExpand Up@@ -360,13 +364,20 @@ function runner::parse_result_sync() {
sed -E -e 's/.*##ASSERTIONS_SNAPSHOT=([0-9]*)##.*/\1/g'\
)

local test_exit_code=$(\
echo "$execution_result" |\
tail -n 1 |\
sed -E -e 's/.*##TEST_EXIT_CODE=([0-9]*)##.*/\1/g'\
)

log "debug" "[SYNC]" "function_name:$function_name" "execution_result:$execution_result"

((_ASSERTIONS_PASSED += assertions_passed)) || true
((_ASSERTIONS_FAILED += assertions_failed)) || true
((_ASSERTIONS_SKIPPED += assertions_skipped)) || true
((_ASSERTIONS_INCOMPLETE += assertions_incomplete)) || true
((_ASSERTIONS_SNAPSHOT += assertions_snapshot)) || true
((_TEST_EXIT_CODE += test_exit_code)) || true
}

function runner::write_failure_result_output() {
Expand Down
10 changes: 10 additions & 0 deletions src/state.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ _DUPLICATED_FUNCTION_NAMES=""
_FILE_WITH_DUPLICATED_FUNCTION_NAMES=""
_DUPLICATED_TEST_FUNCTIONS_FOUND=false
_TEST_OUTPUT=""
_TEST_EXIT_CODE=0

function state::get_tests_passed() {
echo "$_TESTS_PASSED"
Expand DownExpand Up@@ -123,6 +124,14 @@ function state::add_test_output() {
_TEST_OUTPUT+="$1"
}

function state::get_test_exit_code() {
echo "$_TEST_EXIT_CODE"
}

function state::set_test_exit_code() {
_TEST_EXIT_CODE="$1"
}

function state::set_duplicated_functions_merged() {
state::set_duplicated_test_functions_found
state::set_file_with_duplicated_function_names "$1"
Expand DownExpand Up@@ -155,6 +164,7 @@ function state::export_subshell_context() {
##ASSERTIONS_SKIPPED=$_ASSERTIONS_SKIPPED\
##ASSERTIONS_INCOMPLETE=$_ASSERTIONS_INCOMPLETE\
##ASSERTIONS_SNAPSHOT=$_ASSERTIONS_SNAPSHOT\
##TEST_EXIT_CODE=$_TEST_EXIT_CODE\
##TEST_OUTPUT=$encoded_test_output\
##
EOF
Expand Down
7 changes: 7 additions & 0 deletions tests/acceptance/bashunit_fail_test.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,13 @@ function test_bashunit_with_multiple_failing_tests() {
assert_general_error "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file" --simple)"
}

function test_bashunit_with_a_test_fail_and_exit_immediately() {
local test_file=./tests/acceptance/fixtures/test_bashunit_when_exit_immediately_after_execution_error.sh

assert_match_snapshot "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file")"
assert_general_error "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file" --simple)"
}

function test_different_simple_snapshots_matches() {
todo "The different snapshots for these tests should also be identical to each other, option to choose snapshot name?"
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
#!/bin/bash

function test_error() {
set -e
invalid_function_name arg1 arg2 &>/dev/null
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
Running ./tests/acceptance/fixtures/test_bashunit_when_exit_immediately_after_execution_error.sh
βœ— Error: Error


There was 1 failure:

|1) ./tests/acceptance/fixtures/test_bashunit_when_exit_immediately_after_execution_error.sh

Tests:  1 failed, 1 total
Assertions: 0 failed, 0 total

 Some tests failed 
4 changes: 4 additions & 0 deletions tests/unit/state_test.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -254,6 +254,7 @@ function test_initialize_assertions_count() {
##ASSERTIONS_SKIPPED=0\
##ASSERTIONS_INCOMPLETE=0\
##ASSERTIONS_SNAPSHOT=0\
##TEST_EXIT_CODE=0\
##TEST_OUTPUT=\
##"\
"$export_assertions_count"
Expand All@@ -270,6 +271,7 @@ function test_export_assertions_count() {
_ASSERTIONS_INCOMPLETE=12
_ASSERTIONS_SNAPSHOT=33
_ASSERTIONS_SNAPSHOT=33
_TEST_EXIT_CODE=1
_TEST_OUTPUT="something"

state::export_subshell_context
Expand All@@ -281,6 +283,7 @@ function test_export_assertions_count() {
##ASSERTIONS_SKIPPED=42\
##ASSERTIONS_INCOMPLETE=12\
##ASSERTIONS_SNAPSHOT=33\
##TEST_EXIT_CODE=1\
##TEST_OUTPUT=$(echo -n "something" | base64)##"\
"$export_assertions_count"
}
Expand All@@ -291,6 +294,7 @@ function test_calculate_total_assertions() {
##ASSERTIONS_SKIPPED=3\
##ASSERTIONS_INCOMPLETE=4\
##ASSERTIONS_SNAPSHOT=5\
##TEST_EXIT_CODE=0\
##TEST_OUTPUT=3zhbEncodedBase64##"

assert_same 15 "$(state::calculate_total_assertions "$input")"
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

## Unreleased

- Fixed false negative with `set -e`
- Fixed name rendered when having `test_test_*`
- Fixed display test with multiple outputs in multiline
- Improved output: adding a space between each test file
Expand Down
19 changes: 15 additions & 4 deletions src/runner.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,16 +146,19 @@ function runner::run_test() {
exec 3>&1

local test_execution_result=$(
trap '
state::set_test_exit_code $?
runner::run_tear_down
runner::clear_mocks
state::export_subshell_context
' EXIT
Comment on lines +149 to +154

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very clever 🧠 πŸ‘πŸΌ

state::initialize_assertions_count
runner::run_set_up

# 2>&1: Redirects the std-error (FD 2) to the std-output (FD 1).
# points to the original std-output.
"$function_name" "$@" 2>&1

runner::run_tear_down
runner::clear_mocks
state::export_subshell_context
)

# Closes FD 3, which was used temporarily to hold the original stdout.
Expand DownExpand Up@@ -216,8 +219,9 @@ function runner::run_test() {
runner::parse_result "$function_name" "$test_execution_result" "$@"

local total_assertions="$(state::calculate_total_assertions "$test_execution_result")"
local test_exit_code="$(state::get_test_exit_code)"

if [[ -n $runtime_error ]]; then
if [[ -n $runtime_error || $test_exit_code -ne 0 ]]; then
state::add_tests_failed
console_results::print_error_test "$function_name" "$runtime_error"
reports::add_test_failed "$test_file" "$function_name" "$duration" "$total_assertions"
Expand DownExpand Up@@ -360,13 +364,20 @@ function runner::parse_result_sync() {
sed -E -e 's/.*##ASSERTIONS_SNAPSHOT=([0-9]*)##.*/\1/g'\
)

local test_exit_code=$(\
echo "$execution_result" |\
tail -n 1 |\
sed -E -e 's/.*##TEST_EXIT_CODE=([0-9]*)##.*/\1/g'\
)

log "debug" "[SYNC]" "function_name:$function_name" "execution_result:$execution_result"

((_ASSERTIONS_PASSED += assertions_passed)) || true
((_ASSERTIONS_FAILED += assertions_failed)) || true
((_ASSERTIONS_SKIPPED += assertions_skipped)) || true
((_ASSERTIONS_INCOMPLETE += assertions_incomplete)) || true
((_ASSERTIONS_SNAPSHOT += assertions_snapshot)) || true
((_TEST_EXIT_CODE += test_exit_code)) || true
}

function runner::write_failure_result_output() {
Expand Down
10 changes: 10 additions & 0 deletions src/state.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ _DUPLICATED_FUNCTION_NAMES=""
_FILE_WITH_DUPLICATED_FUNCTION_NAMES=""
_DUPLICATED_TEST_FUNCTIONS_FOUND=false
_TEST_OUTPUT=""
_TEST_EXIT_CODE=0

function state::get_tests_passed() {
echo "$_TESTS_PASSED"
Expand DownExpand Up@@ -123,6 +124,14 @@ function state::add_test_output() {
_TEST_OUTPUT+="$1"
}

function state::get_test_exit_code() {
echo "$_TEST_EXIT_CODE"
}

function state::set_test_exit_code() {
_TEST_EXIT_CODE="$1"
}

function state::set_duplicated_functions_merged() {
state::set_duplicated_test_functions_found
state::set_file_with_duplicated_function_names "$1"
Expand DownExpand Up@@ -155,6 +164,7 @@ function state::export_subshell_context() {
##ASSERTIONS_SKIPPED=$_ASSERTIONS_SKIPPED\
##ASSERTIONS_INCOMPLETE=$_ASSERTIONS_INCOMPLETE\
##ASSERTIONS_SNAPSHOT=$_ASSERTIONS_SNAPSHOT\
##TEST_EXIT_CODE=$_TEST_EXIT_CODE\
##TEST_OUTPUT=$encoded_test_output\
##
EOF
Expand Down
7 changes: 7 additions & 0 deletions tests/acceptance/bashunit_fail_test.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,13 @@ function test_bashunit_with_multiple_failing_tests() {
assert_general_error "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file" --simple)"
}

function test_bashunit_with_a_test_fail_and_exit_immediately() {
local test_file=./tests/acceptance/fixtures/test_bashunit_when_exit_immediately_after_execution_error.sh

assert_match_snapshot "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file")"
assert_general_error "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file" --simple)"
}

function test_different_simple_snapshots_matches() {
todo "The different snapshots for these tests should also be identical to each other, option to choose snapshot name?"
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
#!/bin/bash

function test_error() {
set -e
invalid_function_name arg1 arg2 &>/dev/null
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
Running ./tests/acceptance/fixtures/test_bashunit_when_exit_immediately_after_execution_error.sh
βœ— Error: Error


There was 1 failure:

|1) ./tests/acceptance/fixtures/test_bashunit_when_exit_immediately_after_execution_error.sh

Tests:  1 failed, 1 total
Assertions: 0 failed, 0 total

 Some tests failed 
4 changes: 4 additions & 0 deletions tests/unit/state_test.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -254,6 +254,7 @@ function test_initialize_assertions_count() {
##ASSERTIONS_SKIPPED=0\
##ASSERTIONS_INCOMPLETE=0\
##ASSERTIONS_SNAPSHOT=0\
##TEST_EXIT_CODE=0\
##TEST_OUTPUT=\
##"\
"$export_assertions_count"
Expand All@@ -270,6 +271,7 @@ function test_export_assertions_count() {
_ASSERTIONS_INCOMPLETE=12
_ASSERTIONS_SNAPSHOT=33
_ASSERTIONS_SNAPSHOT=33
_TEST_EXIT_CODE=1
_TEST_OUTPUT="something"

state::export_subshell_context
Expand All@@ -281,6 +283,7 @@ function test_export_assertions_count() {
##ASSERTIONS_SKIPPED=42\
##ASSERTIONS_INCOMPLETE=12\
##ASSERTIONS_SNAPSHOT=33\
##TEST_EXIT_CODE=1\
##TEST_OUTPUT=$(echo -n "something" | base64)##"\
"$export_assertions_count"
}
Expand All@@ -291,6 +294,7 @@ function test_calculate_total_assertions() {
##ASSERTIONS_SKIPPED=3\
##ASSERTIONS_INCOMPLETE=4\
##ASSERTIONS_SNAPSHOT=5\
##TEST_EXIT_CODE=0\
##TEST_OUTPUT=3zhbEncodedBase64##"

assert_same 15 "$(state::calculate_total_assertions "$input")"
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

## Unreleased

- Fixed false negative with `set -e`
- Fixed name rendered when having `test_test_*`
- Fixed display test with multiple outputs in multiline
- Improved output: adding a space between each test file
Expand Down
19 changes: 15 additions & 4 deletions src/runner.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,16 +146,19 @@ function runner::run_test() {
exec 3>&1

local test_execution_result=$(
trap '
state::set_test_exit_code $?
runner::run_tear_down
runner::clear_mocks
state::export_subshell_context
' EXIT
Comment on lines +149 to +154

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very clever 🧠 πŸ‘πŸΌ

state::initialize_assertions_count
runner::run_set_up

# 2>&1: Redirects the std-error (FD 2) to the std-output (FD 1).
# points to the original std-output.
"$function_name" "$@" 2>&1

runner::run_tear_down
runner::clear_mocks
state::export_subshell_context
)

# Closes FD 3, which was used temporarily to hold the original stdout.
Expand DownExpand Up@@ -216,8 +219,9 @@ function runner::run_test() {
runner::parse_result "$function_name" "$test_execution_result" "$@"

local total_assertions="$(state::calculate_total_assertions "$test_execution_result")"
local test_exit_code="$(state::get_test_exit_code)"

if [[ -n $runtime_error ]]; then
if [[ -n $runtime_error || $test_exit_code -ne 0 ]]; then
state::add_tests_failed
console_results::print_error_test "$function_name" "$runtime_error"
reports::add_test_failed "$test_file" "$function_name" "$duration" "$total_assertions"
Expand DownExpand Up@@ -360,13 +364,20 @@ function runner::parse_result_sync() {
sed -E -e 's/.*##ASSERTIONS_SNAPSHOT=([0-9]*)##.*/\1/g'\
)

local test_exit_code=$(\
echo "$execution_result" |\
tail -n 1 |\
sed -E -e 's/.*##TEST_EXIT_CODE=([0-9]*)##.*/\1/g'\
)

log "debug" "[SYNC]" "function_name:$function_name" "execution_result:$execution_result"

((_ASSERTIONS_PASSED += assertions_passed)) || true
((_ASSERTIONS_FAILED += assertions_failed)) || true
((_ASSERTIONS_SKIPPED += assertions_skipped)) || true
((_ASSERTIONS_INCOMPLETE += assertions_incomplete)) || true
((_ASSERTIONS_SNAPSHOT += assertions_snapshot)) || true
((_TEST_EXIT_CODE += test_exit_code)) || true
}

function runner::write_failure_result_output() {
Expand Down
10 changes: 10 additions & 0 deletions src/state.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ _DUPLICATED_FUNCTION_NAMES=""
_FILE_WITH_DUPLICATED_FUNCTION_NAMES=""
_DUPLICATED_TEST_FUNCTIONS_FOUND=false
_TEST_OUTPUT=""
_TEST_EXIT_CODE=0

function state::get_tests_passed() {
echo "$_TESTS_PASSED"
Expand DownExpand Up@@ -123,6 +124,14 @@ function state::add_test_output() {
_TEST_OUTPUT+="$1"
}

function state::get_test_exit_code() {
echo "$_TEST_EXIT_CODE"
}

function state::set_test_exit_code() {
_TEST_EXIT_CODE="$1"
}

function state::set_duplicated_functions_merged() {
state::set_duplicated_test_functions_found
state::set_file_with_duplicated_function_names "$1"
Expand DownExpand Up@@ -155,6 +164,7 @@ function state::export_subshell_context() {
##ASSERTIONS_SKIPPED=$_ASSERTIONS_SKIPPED\
##ASSERTIONS_INCOMPLETE=$_ASSERTIONS_INCOMPLETE\
##ASSERTIONS_SNAPSHOT=$_ASSERTIONS_SNAPSHOT\
##TEST_EXIT_CODE=$_TEST_EXIT_CODE\
##TEST_OUTPUT=$encoded_test_output\
##
EOF
Expand Down
7 changes: 7 additions & 0 deletions tests/acceptance/bashunit_fail_test.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,13 @@ function test_bashunit_with_multiple_failing_tests() {
assert_general_error "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file" --simple)"
}

function test_bashunit_with_a_test_fail_and_exit_immediately() {
local test_file=./tests/acceptance/fixtures/test_bashunit_when_exit_immediately_after_execution_error.sh

assert_match_snapshot "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file")"
assert_general_error "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file" --simple)"
}

function test_different_simple_snapshots_matches() {
todo "The different snapshots for these tests should also be identical to each other, option to choose snapshot name?"
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
#!/bin/bash

function test_error() {
set -e
invalid_function_name arg1 arg2 &>/dev/null
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
Running ./tests/acceptance/fixtures/test_bashunit_when_exit_immediately_after_execution_error.sh
βœ— Error: Error


There was 1 failure:

|1) ./tests/acceptance/fixtures/test_bashunit_when_exit_immediately_after_execution_error.sh

Tests:  1 failed, 1 total
Assertions: 0 failed, 0 total

 Some tests failed 
4 changes: 4 additions & 0 deletions tests/unit/state_test.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -254,6 +254,7 @@ function test_initialize_assertions_count() {
##ASSERTIONS_SKIPPED=0\
##ASSERTIONS_INCOMPLETE=0\
##ASSERTIONS_SNAPSHOT=0\
##TEST_EXIT_CODE=0\
##TEST_OUTPUT=\
##"\
"$export_assertions_count"
Expand All@@ -270,6 +271,7 @@ function test_export_assertions_count() {
_ASSERTIONS_INCOMPLETE=12
_ASSERTIONS_SNAPSHOT=33
_ASSERTIONS_SNAPSHOT=33
_TEST_EXIT_CODE=1
_TEST_OUTPUT="something"

state::export_subshell_context
Expand All@@ -281,6 +283,7 @@ function test_export_assertions_count() {
##ASSERTIONS_SKIPPED=42\
##ASSERTIONS_INCOMPLETE=12\
##ASSERTIONS_SNAPSHOT=33\
##TEST_EXIT_CODE=1\
##TEST_OUTPUT=$(echo -n "something" | base64)##"\
"$export_assertions_count"
}
Expand All@@ -291,6 +294,7 @@ function test_calculate_total_assertions() {
##ASSERTIONS_SKIPPED=3\
##ASSERTIONS_INCOMPLETE=4\
##ASSERTIONS_SNAPSHOT=5\
##TEST_EXIT_CODE=0\
##TEST_OUTPUT=3zhbEncodedBase64##"

assert_same 15 "$(state::calculate_total_assertions "$input")"
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

## Unreleased

- Fixed false negative with `set -e`
- Fixed name rendered when having `test_test_*`
- Fixed display test with multiple outputs in multiline
- Improved output: adding a space between each test file
Expand Down
19 changes: 15 additions & 4 deletions src/runner.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,16 +146,19 @@ function runner::run_test() {
exec 3>&1

local test_execution_result=$(
trap '
state::set_test_exit_code $?
runner::run_tear_down
runner::clear_mocks
state::export_subshell_context
' EXIT
Comment on lines +149 to +154

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very clever 🧠 πŸ‘πŸΌ

state::initialize_assertions_count
runner::run_set_up

# 2>&1: Redirects the std-error (FD 2) to the std-output (FD 1).
# points to the original std-output.
"$function_name" "$@" 2>&1

runner::run_tear_down
runner::clear_mocks
state::export_subshell_context
)

# Closes FD 3, which was used temporarily to hold the original stdout.
Expand DownExpand Up@@ -216,8 +219,9 @@ function runner::run_test() {
runner::parse_result "$function_name" "$test_execution_result" "$@"

local total_assertions="$(state::calculate_total_assertions "$test_execution_result")"
local test_exit_code="$(state::get_test_exit_code)"

if [[ -n $runtime_error ]]; then
if [[ -n $runtime_error || $test_exit_code -ne 0 ]]; then
state::add_tests_failed
console_results::print_error_test "$function_name" "$runtime_error"
reports::add_test_failed "$test_file" "$function_name" "$duration" "$total_assertions"
Expand DownExpand Up@@ -360,13 +364,20 @@ function runner::parse_result_sync() {
sed -E -e 's/.*##ASSERTIONS_SNAPSHOT=([0-9]*)##.*/\1/g'\
)

local test_exit_code=$(\
echo "$execution_result" |\
tail -n 1 |\
sed -E -e 's/.*##TEST_EXIT_CODE=([0-9]*)##.*/\1/g'\
)

log "debug" "[SYNC]" "function_name:$function_name" "execution_result:$execution_result"

((_ASSERTIONS_PASSED += assertions_passed)) || true
((_ASSERTIONS_FAILED += assertions_failed)) || true
((_ASSERTIONS_SKIPPED += assertions_skipped)) || true
((_ASSERTIONS_INCOMPLETE += assertions_incomplete)) || true
((_ASSERTIONS_SNAPSHOT += assertions_snapshot)) || true
((_TEST_EXIT_CODE += test_exit_code)) || true
}

function runner::write_failure_result_output() {
Expand Down
10 changes: 10 additions & 0 deletions src/state.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ _DUPLICATED_FUNCTION_NAMES=""
_FILE_WITH_DUPLICATED_FUNCTION_NAMES=""
_DUPLICATED_TEST_FUNCTIONS_FOUND=false
_TEST_OUTPUT=""
_TEST_EXIT_CODE=0

function state::get_tests_passed() {
echo "$_TESTS_PASSED"
Expand DownExpand Up@@ -123,6 +124,14 @@ function state::add_test_output() {
_TEST_OUTPUT+="$1"
}

function state::get_test_exit_code() {
echo "$_TEST_EXIT_CODE"
}

function state::set_test_exit_code() {
_TEST_EXIT_CODE="$1"
}

function state::set_duplicated_functions_merged() {
state::set_duplicated_test_functions_found
state::set_file_with_duplicated_function_names "$1"
Expand DownExpand Up@@ -155,6 +164,7 @@ function state::export_subshell_context() {
##ASSERTIONS_SKIPPED=$_ASSERTIONS_SKIPPED\
##ASSERTIONS_INCOMPLETE=$_ASSERTIONS_INCOMPLETE\
##ASSERTIONS_SNAPSHOT=$_ASSERTIONS_SNAPSHOT\
##TEST_EXIT_CODE=$_TEST_EXIT_CODE\
##TEST_OUTPUT=$encoded_test_output\
##
EOF
Expand Down
7 changes: 7 additions & 0 deletions tests/acceptance/bashunit_fail_test.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,13 @@ function test_bashunit_with_multiple_failing_tests() {
assert_general_error "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file" --simple)"
}

function test_bashunit_with_a_test_fail_and_exit_immediately() {
local test_file=./tests/acceptance/fixtures/test_bashunit_when_exit_immediately_after_execution_error.sh

assert_match_snapshot "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file")"
assert_general_error "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file" --simple)"
}

function test_different_simple_snapshots_matches() {
todo "The different snapshots for these tests should also be identical to each other, option to choose snapshot name?"
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
#!/bin/bash

function test_error() {
set -e
invalid_function_name arg1 arg2 &>/dev/null
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
Running ./tests/acceptance/fixtures/test_bashunit_when_exit_immediately_after_execution_error.sh
βœ— Error: Error


There was 1 failure:

|1) ./tests/acceptance/fixtures/test_bashunit_when_exit_immediately_after_execution_error.sh

Tests:  1 failed, 1 total
Assertions: 0 failed, 0 total

 Some tests failed 
4 changes: 4 additions & 0 deletions tests/unit/state_test.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -254,6 +254,7 @@ function test_initialize_assertions_count() {
##ASSERTIONS_SKIPPED=0\
##ASSERTIONS_INCOMPLETE=0\
##ASSERTIONS_SNAPSHOT=0\
##TEST_EXIT_CODE=0\
##TEST_OUTPUT=\
##"\
"$export_assertions_count"
Expand All@@ -270,6 +271,7 @@ function test_export_assertions_count() {
_ASSERTIONS_INCOMPLETE=12
_ASSERTIONS_SNAPSHOT=33
_ASSERTIONS_SNAPSHOT=33
_TEST_EXIT_CODE=1
_TEST_OUTPUT="something"

state::export_subshell_context
Expand All@@ -281,6 +283,7 @@ function test_export_assertions_count() {
##ASSERTIONS_SKIPPED=42\
##ASSERTIONS_INCOMPLETE=12\
##ASSERTIONS_SNAPSHOT=33\
##TEST_EXIT_CODE=1\
##TEST_OUTPUT=$(echo -n "something" | base64)##"\
"$export_assertions_count"
}
Expand All@@ -291,6 +294,7 @@ function test_calculate_total_assertions() {
##ASSERTIONS_SKIPPED=3\
##ASSERTIONS_INCOMPLETE=4\
##ASSERTIONS_SNAPSHOT=5\
##TEST_EXIT_CODE=0\
##TEST_OUTPUT=3zhbEncodedBase64##"

assert_same 15 "$(state::calculate_total_assertions "$input")"
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

## Unreleased

- Fixed false negative with `set -e`
- Fixed name rendered when having `test_test_*`
- Fixed display test with multiple outputs in multiline
- Improved output: adding a space between each test file
Expand Down
19 changes: 15 additions & 4 deletions src/runner.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,16 +146,19 @@ function runner::run_test() {
exec 3>&1

local test_execution_result=$(
trap '
state::set_test_exit_code $?
runner::run_tear_down
runner::clear_mocks
state::export_subshell_context
' EXIT
Comment on lines +149 to +154

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very clever 🧠 πŸ‘πŸΌ

state::initialize_assertions_count
runner::run_set_up

# 2>&1: Redirects the std-error (FD 2) to the std-output (FD 1).
# points to the original std-output.
"$function_name" "$@" 2>&1

runner::run_tear_down
runner::clear_mocks
state::export_subshell_context
)

# Closes FD 3, which was used temporarily to hold the original stdout.
Expand DownExpand Up@@ -216,8 +219,9 @@ function runner::run_test() {
runner::parse_result "$function_name" "$test_execution_result" "$@"

local total_assertions="$(state::calculate_total_assertions "$test_execution_result")"
local test_exit_code="$(state::get_test_exit_code)"

if [[ -n $runtime_error ]]; then
if [[ -n $runtime_error || $test_exit_code -ne 0 ]]; then
state::add_tests_failed
console_results::print_error_test "$function_name" "$runtime_error"
reports::add_test_failed "$test_file" "$function_name" "$duration" "$total_assertions"
Expand DownExpand Up@@ -360,13 +364,20 @@ function runner::parse_result_sync() {
sed -E -e 's/.*##ASSERTIONS_SNAPSHOT=([0-9]*)##.*/\1/g'\
)

local test_exit_code=$(\
echo "$execution_result" |\
tail -n 1 |\
sed -E -e 's/.*##TEST_EXIT_CODE=([0-9]*)##.*/\1/g'\
)

log "debug" "[SYNC]" "function_name:$function_name" "execution_result:$execution_result"

((_ASSERTIONS_PASSED += assertions_passed)) || true
((_ASSERTIONS_FAILED += assertions_failed)) || true
((_ASSERTIONS_SKIPPED += assertions_skipped)) || true
((_ASSERTIONS_INCOMPLETE += assertions_incomplete)) || true
((_ASSERTIONS_SNAPSHOT += assertions_snapshot)) || true
((_TEST_EXIT_CODE += test_exit_code)) || true
}

function runner::write_failure_result_output() {
Expand Down
10 changes: 10 additions & 0 deletions src/state.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ _DUPLICATED_FUNCTION_NAMES=""
_FILE_WITH_DUPLICATED_FUNCTION_NAMES=""
_DUPLICATED_TEST_FUNCTIONS_FOUND=false
_TEST_OUTPUT=""
_TEST_EXIT_CODE=0

function state::get_tests_passed() {
echo "$_TESTS_PASSED"
Expand DownExpand Up@@ -123,6 +124,14 @@ function state::add_test_output() {
_TEST_OUTPUT+="$1"
}

function state::get_test_exit_code() {
echo "$_TEST_EXIT_CODE"
}

function state::set_test_exit_code() {
_TEST_EXIT_CODE="$1"
}

function state::set_duplicated_functions_merged() {
state::set_duplicated_test_functions_found
state::set_file_with_duplicated_function_names "$1"
Expand DownExpand Up@@ -155,6 +164,7 @@ function state::export_subshell_context() {
##ASSERTIONS_SKIPPED=$_ASSERTIONS_SKIPPED\
##ASSERTIONS_INCOMPLETE=$_ASSERTIONS_INCOMPLETE\
##ASSERTIONS_SNAPSHOT=$_ASSERTIONS_SNAPSHOT\
##TEST_EXIT_CODE=$_TEST_EXIT_CODE\
##TEST_OUTPUT=$encoded_test_output\
##
EOF
Expand Down
7 changes: 7 additions & 0 deletions tests/acceptance/bashunit_fail_test.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,13 @@ function test_bashunit_with_multiple_failing_tests() {
assert_general_error "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file" --simple)"
}

function test_bashunit_with_a_test_fail_and_exit_immediately() {
local test_file=./tests/acceptance/fixtures/test_bashunit_when_exit_immediately_after_execution_error.sh

assert_match_snapshot "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file")"
assert_general_error "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file" --simple)"
}

function test_different_simple_snapshots_matches() {
todo "The different snapshots for these tests should also be identical to each other, option to choose snapshot name?"
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
#!/bin/bash

function test_error() {
set -e
invalid_function_name arg1 arg2 &>/dev/null
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
Running ./tests/acceptance/fixtures/test_bashunit_when_exit_immediately_after_execution_error.sh
βœ— Error: Error


There was 1 failure:

|1) ./tests/acceptance/fixtures/test_bashunit_when_exit_immediately_after_execution_error.sh

Tests:  1 failed, 1 total
Assertions: 0 failed, 0 total

 Some tests failed 
4 changes: 4 additions & 0 deletions tests/unit/state_test.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -254,6 +254,7 @@ function test_initialize_assertions_count() {
##ASSERTIONS_SKIPPED=0\
##ASSERTIONS_INCOMPLETE=0\
##ASSERTIONS_SNAPSHOT=0\
##TEST_EXIT_CODE=0\
##TEST_OUTPUT=\
##"\
"$export_assertions_count"
Expand All@@ -270,6 +271,7 @@ function test_export_assertions_count() {
_ASSERTIONS_INCOMPLETE=12
_ASSERTIONS_SNAPSHOT=33
_ASSERTIONS_SNAPSHOT=33
_TEST_EXIT_CODE=1
_TEST_OUTPUT="something"

state::export_subshell_context
Expand All@@ -281,6 +283,7 @@ function test_export_assertions_count() {
##ASSERTIONS_SKIPPED=42\
##ASSERTIONS_INCOMPLETE=12\
##ASSERTIONS_SNAPSHOT=33\
##TEST_EXIT_CODE=1\
##TEST_OUTPUT=$(echo -n "something" | base64)##"\
"$export_assertions_count"
}
Expand All@@ -291,6 +294,7 @@ function test_calculate_total_assertions() {
##ASSERTIONS_SKIPPED=3\
##ASSERTIONS_INCOMPLETE=4\
##ASSERTIONS_SNAPSHOT=5\
##TEST_EXIT_CODE=0\
##TEST_OUTPUT=3zhbEncodedBase64##"

assert_same 15 "$(state::calculate_total_assertions "$input")"
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

## Unreleased

- Fixed false negative with `set -e`
- Fixed name rendered when having `test_test_*`
- Fixed display test with multiple outputs in multiline
- Improved output: adding a space between each test file
Expand Down
19 changes: 15 additions & 4 deletions src/runner.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,16 +146,19 @@ function runner::run_test() {
exec 3>&1

local test_execution_result=$(
trap '
state::set_test_exit_code $?
runner::run_tear_down
runner::clear_mocks
state::export_subshell_context
' EXIT
Comment on lines +149 to +154

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very clever 🧠 πŸ‘πŸΌ

state::initialize_assertions_count
runner::run_set_up

# 2>&1: Redirects the std-error (FD 2) to the std-output (FD 1).
# points to the original std-output.
"$function_name" "$@" 2>&1

runner::run_tear_down
runner::clear_mocks
state::export_subshell_context
)

# Closes FD 3, which was used temporarily to hold the original stdout.
Expand DownExpand Up@@ -216,8 +219,9 @@ function runner::run_test() {
runner::parse_result "$function_name" "$test_execution_result" "$@"

local total_assertions="$(state::calculate_total_assertions "$test_execution_result")"
local test_exit_code="$(state::get_test_exit_code)"

if [[ -n $runtime_error ]]; then
if [[ -n $runtime_error || $test_exit_code -ne 0 ]]; then
state::add_tests_failed
console_results::print_error_test "$function_name" "$runtime_error"
reports::add_test_failed "$test_file" "$function_name" "$duration" "$total_assertions"
Expand DownExpand Up@@ -360,13 +364,20 @@ function runner::parse_result_sync() {
sed -E -e 's/.*##ASSERTIONS_SNAPSHOT=([0-9]*)##.*/\1/g'\
)

local test_exit_code=$(\
echo "$execution_result" |\
tail -n 1 |\
sed -E -e 's/.*##TEST_EXIT_CODE=([0-9]*)##.*/\1/g'\
)

log "debug" "[SYNC]" "function_name:$function_name" "execution_result:$execution_result"

((_ASSERTIONS_PASSED += assertions_passed)) || true
((_ASSERTIONS_FAILED += assertions_failed)) || true
((_ASSERTIONS_SKIPPED += assertions_skipped)) || true
((_ASSERTIONS_INCOMPLETE += assertions_incomplete)) || true
((_ASSERTIONS_SNAPSHOT += assertions_snapshot)) || true
((_TEST_EXIT_CODE += test_exit_code)) || true
}

function runner::write_failure_result_output() {
Expand Down
10 changes: 10 additions & 0 deletions src/state.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ _DUPLICATED_FUNCTION_NAMES=""
_FILE_WITH_DUPLICATED_FUNCTION_NAMES=""
_DUPLICATED_TEST_FUNCTIONS_FOUND=false
_TEST_OUTPUT=""
_TEST_EXIT_CODE=0

function state::get_tests_passed() {
echo "$_TESTS_PASSED"
Expand DownExpand Up@@ -123,6 +124,14 @@ function state::add_test_output() {
_TEST_OUTPUT+="$1"
}

function state::get_test_exit_code() {
echo "$_TEST_EXIT_CODE"
}

function state::set_test_exit_code() {
_TEST_EXIT_CODE="$1"
}

function state::set_duplicated_functions_merged() {
state::set_duplicated_test_functions_found
state::set_file_with_duplicated_function_names "$1"
Expand DownExpand Up@@ -155,6 +164,7 @@ function state::export_subshell_context() {
##ASSERTIONS_SKIPPED=$_ASSERTIONS_SKIPPED\
##ASSERTIONS_INCOMPLETE=$_ASSERTIONS_INCOMPLETE\
##ASSERTIONS_SNAPSHOT=$_ASSERTIONS_SNAPSHOT\
##TEST_EXIT_CODE=$_TEST_EXIT_CODE\
##TEST_OUTPUT=$encoded_test_output\
##
EOF
Expand Down
7 changes: 7 additions & 0 deletions tests/acceptance/bashunit_fail_test.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,13 @@ function test_bashunit_with_multiple_failing_tests() {
assert_general_error "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file" --simple)"
}

function test_bashunit_with_a_test_fail_and_exit_immediately() {
local test_file=./tests/acceptance/fixtures/test_bashunit_when_exit_immediately_after_execution_error.sh

assert_match_snapshot "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file")"
assert_general_error "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file" --simple)"
}

function test_different_simple_snapshots_matches() {
todo "The different snapshots for these tests should also be identical to each other, option to choose snapshot name?"
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
#!/bin/bash

function test_error() {
set -e
invalid_function_name arg1 arg2 &>/dev/null
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
Running ./tests/acceptance/fixtures/test_bashunit_when_exit_immediately_after_execution_error.sh
βœ— Error: Error


There was 1 failure:

|1) ./tests/acceptance/fixtures/test_bashunit_when_exit_immediately_after_execution_error.sh

Tests:  1 failed, 1 total
Assertions: 0 failed, 0 total

 Some tests failed 
4 changes: 4 additions & 0 deletions tests/unit/state_test.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -254,6 +254,7 @@ function test_initialize_assertions_count() {
##ASSERTIONS_SKIPPED=0\
##ASSERTIONS_INCOMPLETE=0\
##ASSERTIONS_SNAPSHOT=0\
##TEST_EXIT_CODE=0\
##TEST_OUTPUT=\
##"\
"$export_assertions_count"
Expand All@@ -270,6 +271,7 @@ function test_export_assertions_count() {
_ASSERTIONS_INCOMPLETE=12
_ASSERTIONS_SNAPSHOT=33
_ASSERTIONS_SNAPSHOT=33
_TEST_EXIT_CODE=1
_TEST_OUTPUT="something"

state::export_subshell_context
Expand All@@ -281,6 +283,7 @@ function test_export_assertions_count() {
##ASSERTIONS_SKIPPED=42\
##ASSERTIONS_INCOMPLETE=12\
##ASSERTIONS_SNAPSHOT=33\
##TEST_EXIT_CODE=1\
##TEST_OUTPUT=$(echo -n "something" | base64)##"\
"$export_assertions_count"
}
Expand All@@ -291,6 +294,7 @@ function test_calculate_total_assertions() {
##ASSERTIONS_SKIPPED=3\
##ASSERTIONS_INCOMPLETE=4\
##ASSERTIONS_SNAPSHOT=5\
##TEST_EXIT_CODE=0\
##TEST_OUTPUT=3zhbEncodedBase64##"

assert_same 15 "$(state::calculate_total_assertions "$input")"
Expand Down