diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 53bcbf25..69c2b869 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -42,7 +42,7 @@ jobs: - name: Run tests shell: bash run: | - ./bashunit -e tests/bootstrap.sh tests/${{ matrix.test_chunk }}/*_test.sh + ./bashunit tests/${{ matrix.test_chunk }}/*_test.sh alpine: name: "On alpine-latest" @@ -73,4 +73,4 @@ jobs: - name: Run Tests run: | - ./bashunit -e tests/bootstrap.sh --simple tests/ + ./bashunit --simple tests/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 620dafef..1d50843c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,10 @@ - log - Improved clean up temporal files and directories - Improved CI test speed by running them in parallel +- Add default env values: + - `DEFAULT_PATH="tests"` + - `LOG_PATH="out.log"` + - `LOAD_FILE="tests/bootstrap.sh"` ## [0.17.0](https://github.com/TypedDevs/bashunit/compare/0.16.0...0.17.0) - 2024-10-01 diff --git a/src/env.sh b/src/env.sh index 98aba2c4..d7b3b202 100644 --- a/src/env.sh +++ b/src/env.sh @@ -7,26 +7,26 @@ set -o allexport [[ -f ".env" ]] && source .env set set +o allexport -_DEFAULT_DEFAULT_PATH= -_DEFAULT_LOG_JUNIT= -_DEFAULT_LOG_PATH=out.log -_DEFAULT_REPORT_HTML= -_DEFAULT_BASHUNIT_LOAD_FILE= +_DEFAULT_DEFAULT_PATH="tests" +_DEFAULT_LOG_PATH="out.log" +_DEFAULT_LOAD_FILE="tests/bootstrap.sh" +_DEFAULT_LOG_JUNIT="" +_DEFAULT_REPORT_HTML="" _DEFAULT_TERMINAL_WIDTH=100 : "${BASHUNIT_DEFAULT_PATH:=${DEFAULT_PATH:=$_DEFAULT_DEFAULT_PATH}}" : "${BASHUNIT_LOG_JUNIT:=${LOG_JUNIT:=$_DEFAULT_LOG_JUNIT}}" : "${BASHUNIT_LOG_PATH:=${LOG_PATH:=$_DEFAULT_LOG_PATH}}" : "${BASHUNIT_REPORT_HTML:=${REPORT_HTML:=$_DEFAULT_REPORT_HTML}}" -: "${BASHUNIT_LOAD_FILE:=${LOAD_FILE:=$_DEFAULT_BASHUNIT_LOAD_FILE}}" +: "${BASHUNIT_LOAD_FILE:=${LOAD_FILE:=$_DEFAULT_LOAD_FILE}}" # Booleans -_DEFAULT_PARALLEL_RUN=false -_DEFAULT_SHOW_HEADER=true -_DEFAULT_HEADER_ASCII_ART=false -_DEFAULT_SIMPLE_OUTPUT=false -_DEFAULT_STOP_ON_FAILURE=false -_DEFAULT_SHOW_EXECUTION_TIME=true +_DEFAULT_PARALLEL_RUN="false" +_DEFAULT_SHOW_HEADER="true" +_DEFAULT_HEADER_ASCII_ART="false" +_DEFAULT_SIMPLE_OUTPUT="false" +_DEFAULT_STOP_ON_FAILURE="false" +_DEFAULT_SHOW_EXECUTION_TIME="true" : "${BASHUNIT_PARALLEL_RUN:=${PARALLEL_RUN:=$_DEFAULT_PARALLEL_RUN}}" : "${BASHUNIT_SHOW_HEADER:=${SHOW_HEADER:=$_DEFAULT_SHOW_HEADER}}"