diff --git a/.githooks/post-receive b/.githooks/post-receive index 757faa0..5d835aa 100644 --- a/.githooks/post-receive +++ b/.githooks/post-receive @@ -259,6 +259,7 @@ } set -x +SKIP_DEPLOYMENT=true # Main script execution loop while read -r oldrev newrev ref; do tmpdir=$(mktemp -d) @@ -266,8 +267,12 @@ echo "--- Processing push for branch: $branch (from $oldrev to $newrev) ---" if run_postreceive_tests "$branch" "$tmpdir"; then echo "Tests passed for $branch. Proceeding with deployment." - deploy_expressjs_blog "$branch" "$tmpdir" - echo "Deployment of $branch complete." + if [[ -z "$SKIP_DEPLOYMENT" ]]; then + deploy_expressjs_blog "$branch" "$tmpdir" + echo "Deployment of $branch complete." + else + echo "Deployed to: $tmpdir" + fi else echo "Post-receive tests failed for $branch. Deployment aborted." exit 1 diff --git a/.githooks/pre-push b/.githooks/pre-push index 9b953a5..4a7a65f 100755 --- a/.githooks/pre-push +++ b/.githooks/pre-push @@ -9,6 +9,7 @@ set -euo pipefail # set -x +export TEST_SCHEMA="http" npm run test:prepush if [ $? -ne 0 ]; then diff --git a/test/routes.test.js b/test/routes.test.js index 9634747..ed1aabe 100644 --- a/test/routes.test.js +++ b/test/routes.test.js @@ -4,12 +4,13 @@ const http = require("http"); let port = process.env.TEST_PORT; +let schema = process.env.TEST_SCHEMA; require("dotenv").config(); -const domain = process.env.SERVER_DOMAIN; -port = port || process.env.SERVER_PORT; +// const domain = process.env.SERVER_DOMAIN; +port = port || process.env.TEST_PORT || process.env.SERVER_PORT; +schema = schema || process.env.TEST_SCHEMA || process.env.SERVER_SCHEMA; const server_address = process.env.SERVER_ADDRESS; -const schema = process.env.TEST_SCHEMA || process.env.SERVER_SCHEMA; const baseUrl = `${schema}://${server_address}:${port}`; // Create a proper HTTP agent