diff --git a/script/detect_secrets b/script/detect_secrets index 1322528b..46bbed83 100755 --- a/script/detect_secrets +++ b/script/detect_secrets @@ -40,4 +40,5 @@ def main(arg): if __name__ == "__main__": arg = sys.argv[1] if len(sys.argv) > 1 else None + print("Finished scanning for secrets") sys.exit(main(arg)) diff --git a/script/include/helper_functions.inc.sh b/script/include/helper_functions.inc.sh index 44ca5882..0df1323a 100644 --- a/script/include/helper_functions.inc.sh +++ b/script/include/helper_functions.inc.sh @@ -53,3 +53,19 @@ reset_db() { # Seed database data seed_db } + +output_divider() { + if tty -s; then + echo "$( tput bold )$( tput smul )$( tput setaf 6 )${1}$( tput sgr 0)" + else + echo $1 + fi +} + +warning() { + if tty -s; then + echo "$( tput bold )$( tput setaf 1 )${1}$( tput sgr 0)" + else + echo $1 + fi +} diff --git a/script/include/run_test b/script/include/run_test index 847ad693..e176483c 100644 --- a/script/include/run_test +++ b/script/include/run_test @@ -15,12 +15,12 @@ if [ "${RESET_DB}" = "true" ]; then source ./script/get_db_settings if [ -n "${PGDATABASE}" ]; then - echo "Resetting database ${PGDATABASE}..." + output_divider "Reset database ${PGDATABASE}" # Reset the db reset_db "${PGDATABASE}" else - echo "ERROR: RESET_DB is set, but PGDATABASE is not!" - echo "Skipping database reset..." + warning "warning: RESET_DB is set, but PGDATABASE is not!" + warning "Skipping database reset..." fi fi @@ -29,15 +29,18 @@ if [ "${RUN_PYTHON_TESTS}" = "true" ]; then python_test_status=0 set +e + output_divider "Lint Python files" run_python_lint "${PYTHON_FILES}" ((python_test_status+=$?)) + output_divider "Perform static analysis on Python files" run_python_static_analysis "${PYTHON_FILES}" ((python_test_status+=$?)) + output_divider "Run Python unit test suite" run_python_unit_tests "${PYTHON_FILES}" ((python_test_status+=$?)) if [ "${python_test_status}" != "0" ]; then - echo "Failed to pass one or more Python checks" + warning "Failed to pass one or more Python checks" exit ${python_test_status} fi @@ -45,6 +48,8 @@ if [ "${RUN_PYTHON_TESTS}" = "true" ]; then fi if [ "${RUN_JS_TESTS}" = "true" ]; then + output_divider "Render Vue components" run_python_render_vue_component + output_divider "Run JavaScript unit test suite" run_javascript_tests fi diff --git a/script/test b/script/test index fa95fa6b..fc9a3c85 100755 --- a/script/test +++ b/script/test @@ -6,9 +6,6 @@ source "$(dirname "${0}")"/../script/include/global_header.inc.sh export FLASK_ENV=test -# create upload directory for app -mkdir uploads | true - # Enable database resetting RESET_DB="true" @@ -22,9 +19,11 @@ RUN_PYTHON_TESTS="true" RUN_JS_TESTS="true" # Check python formatting +output_divider "Run formatting check" source ./script/format check # Check for secrets +output_divider "Run detect secrets" ./script/detect_secrets # Run the shared test script