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
2 changes: 1 addition & 1 deletion src/assert.sh
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ function assertSuccessfulCode() {
local expected_exit_code=0
local label="${3:-$(normalizeTestFunctionName "${FUNCNAME[1]}")}"

if [ $actual_exit_code -ne "$expected_exit_code" ]; then
if [[ $actual_exit_code != "$expected_exit_code" ]]; then
((_ASSERTIONS_FAILED++))
printFailedTest "${label}" "${actual_exit_code}" "to be exactly" "${expected_exit_code}"
return
Expand Down
11 changes: 11 additions & 0 deletions src/helpers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,14 @@ function executeFunctionIfExists() {
"$function_name"
fi
}

function unsetIfExists() {
local function_name=$1

if declare -F | awk '{print $3}' | grep -Eq "^${function_name}$"; then
unset "$function_name"
return 0
fi

return 1
}
12 changes: 12 additions & 0 deletions src/runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,16 @@ function runTearDownAfterScript() {
executeFunctionIfExists 'tearDownAfterScript'
}

function cleanSetUpAndTearDownAfterTest() {
unsetIfExists 'setUp'
unsetIfExists 'tearDown'
}

function cleanSetUpAndTearDownAfterScript() {
unsetIfExists 'setUpBeforeScript'
unsetIfExists 'tearDownAfterScript'
}

###############
#### MAIN #####
###############
Expand Down Expand Up @@ -101,6 +111,8 @@ function loadTestFiles() {
wait
fi
runTearDownAfterScript

cleanSetUpAndTearDownAfterScript
done
}

Expand Down
17 changes: 17 additions & 0 deletions tests/unit/helpers_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,20 @@ function test_no_function_is_executed_with_execute_function_if_exists() {

assertEmpty "$(executeFunctionIfExists "$function_name")"
}

function test_unsuccessful_unsetIfExists() {
assertGeneralError "$(unsetIfExists "fake_function")"
}

function test_successful_unsetIfExists() {
# shellcheck disable=SC2317
function fake_function() {
return 0
}

assertSuccessfulCode "$(unsetIfExists "fake_function")"
}

function tearDown() {
unset fake_function
}