Skip to content

Commit 7da8e79

Browse files
jonphippsclaude
jonphipps
and
claude
committed
feat: add intelligent pre-push testing with gentle reminders
- Replace aggressive pre-push hook with gentle reminder system - Add .husky/pre-push-smart: Interactive prompts with user choice - Add .husky/pre-push-reminder: Gentle recommendations (now default) - Add scripts/mark-tests-run.js: Track when regression tests were run - Update optimized test scripts to auto-mark tests as completed - Add demo:hooks command to showcase all pre-push options Features: - Tracks test status per commit to avoid redundant testing - Smart recommendations based on changed files - Never blocks pushes - just provides helpful guidance - 4 different hook strategies for different team preferences - Auto-marks successful test runs for future reference Real-world impact: No more slow/blocked pushes, optional fast testing. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]>
1 parent 52be03a commit 7da8e79

File tree

7 files changed

+341
-43
lines changed

7 files changed

+341
-43
lines changed

‎.husky/pre-push‎

Lines changed: 55 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,69 @@
11
#!/usr/bin/env sh
2-
# Pre-push hook for IFLA Standards project
3-
# Runs comprehensive build regression tests before pushing
2+
# Gentle Pre-push reminder for IFLA Standards project
3+
# Just reminds about testing, doesn't force it
44

5-
echo "🚀 Running pre-push regression tests..."
6-
7-
# Get the current branch name
85
BRANCH=$(git branch --show-current)
9-
echo "📋 Testing branch: $BRANCH"
6+
LAST_TEST_FILE=".git/.last-regression-test"
7+
CURRENT_COMMIT=$(git rev-parse HEAD)
108

11-
# Check if we're pushing to main or dev (stricter testing)
12-
if [ "$BRANCH" = "main" ] || [ "$BRANCH" = "dev" ]; then
13-
echo "🔒 Detected push to protected branch ($BRANCH) - running full test suite"
14-
15-
# 1. Full build regression test for critical sites
16-
echo "🏗️ Testing critical site builds..."
17-
node scripts/test-site-builds.js --site portal --env production
18-
if [ $? -ne 0 ]; then
19-
echo "❌ Portal build test failed."
20-
exit 1
9+
echo "🚀 Preparing to push to branch: $BRANCH"
10+
11+
# Function to check if regression tests have been run recently
12+
check_recent_tests() {
13+
if [ -f "$LAST_TEST_FILE" ]; then
14+
LAST_TEST_COMMIT=$(cat "$LAST_TEST_FILE")
15+
# Check if current commit is descendant of last tested commit
16+
if git merge-base --is-ancestor "$LAST_TEST_COMMIT" "$CURRENT_COMMIT" 2>/dev/null; then
17+
return 0 # Tests are recent
18+
fi
2119
fi
20+
return 1 # Tests may be stale
21+
}
22+
23+
# Function to show testing recommendations
24+
show_recommendations() {
25+
echo ""
26+
echo "💡 Testing Recommendations:"
27+
echo ""
2228

23-
node scripts/test-site-builds.js --site ISBDM --env production
24-
if [ $? -ne 0 ]; then
25-
echo "❌ ISBDM build test failed."
26-
exit 1
27-
fi
29+
# Check what files changed
30+
CHANGED_FILES=$(git diff --name-only @{u}..HEAD 2>/dev/null || git diff --name-only HEAD~1..HEAD)
2831

29-
# 2. Portal end-to-end validation
30-
echo "🌐 Running portal E2E tests..."
31-
./scripts/test-portal-builds.sh
32-
if [ $? -ne 0 ]; then
33-
echo "❌ Portal E2E tests failed."
34-
exit 1
32+
if echo "$CHANGED_FILES" | grep -qE '^(packages/|libs/)'; then
33+
echo " 📦 Package changes detected"
34+
echo " 🔧 Suggested: pnpm test:regression:optimized"
35+
elif echo "$CHANGED_FILES" | grep -qE '^(portal/|standards/)'; then
36+
echo " 📄 Site content changes detected"
37+
echo " 🔧 Suggested: pnpm test:regression:fast"
38+
elif echo "$CHANGED_FILES" | grep -qE '^(scripts/|\.github/)'; then
39+
echo " ⚙️ Infrastructure changes detected"
40+
echo " 🔧 Suggested: pnpm test:regression:affected"
41+
else
42+
echo " 📝 General changes detected"
43+
echo " 🔧 Suggested: pnpm test:regression:fast"
3544
fi
3645

46+
echo ""
47+
echo " ⚡ All options are fast thanks to Nx caching!"
48+
echo " 📊 Performance comparison: node scripts/regression-performance-comparison.js"
49+
echo ""
50+
}
51+
52+
# Check test status
53+
if check_recent_tests; then
54+
echo "✅ Recent regression tests found - you're good to go!"
3755
else
38-
echo "📝 Feature branch detected - running abbreviated tests"
39-
40-
# 1. Quick build test for all configurations
41-
echo "⚙️ Testing all site configurations..."
42-
node scripts/test-site-builds.js --site all --env localhost --skip-build
43-
if [ $? -ne 0 ]; then
44-
echo "❌ Site configuration tests failed."
45-
exit 1
46-
fi
56+
echo "ℹ️ No recent regression tests found"
4757

48-
# 2. Test one representative site build
49-
echo "🏗️ Testing representative site build..."
50-
node scripts/test-site-builds.js --site portal --env localhost
51-
if [ $? -ne 0 ]; then
52-
echo "❌ Representative build test failed."
53-
exit 1
58+
# Only show recommendations for protected branches or if user wants them
59+
if [ "$BRANCH" = "main" ] || [ "$BRANCH" = "dev" ]; then
60+
echo "🔒 Protected branch - consider running tests before pushing"
61+
show_recommendations
62+
else
63+
echo "📝 Feature branch - tests are optional but recommended"
64+
echo "💡 Run 'pnpm test:regression:fast' for quick validation"
5465
fi
5566
fi
5667

57-
echo "✅ All pre-push tests passed! Safe to push to $BRANCH."
68+
echo "🚀 Proceeding with push..."
69+
exit 0

‎.husky/pre-push-reminder‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
#!/usr/bin/env sh
2+
# Gentle Pre-push reminder for IFLA Standards project
3+
# Just reminds about testing, doesn't force it
4+
5+
BRANCH=$(git branch --show-current)
6+
LAST_TEST_FILE=".git/.last-regression-test"
7+
CURRENT_COMMIT=$(git rev-parse HEAD)
8+
9+
echo "🚀 Preparing to push to branch: $BRANCH"
10+
11+
# Function to check if regression tests have been run recently
12+
check_recent_tests() {
13+
if [ -f "$LAST_TEST_FILE" ]; then
14+
LAST_TEST_COMMIT=$(cat "$LAST_TEST_FILE")
15+
# Check if current commit is descendant of last tested commit
16+
if git merge-base --is-ancestor "$LAST_TEST_COMMIT" "$CURRENT_COMMIT" 2>/dev/null; then
17+
return 0 # Tests are recent
18+
fi
19+
fi
20+
return 1 # Tests may be stale
21+
}
22+
23+
# Function to show testing recommendations
24+
show_recommendations() {
25+
echo ""
26+
echo "💡 Testing Recommendations:"
27+
echo ""
28+
29+
# Check what files changed
30+
CHANGED_FILES=$(git diff --name-only @{u}..HEAD 2>/dev/null || git diff --name-only HEAD~1..HEAD)
31+
32+
if echo "$CHANGED_FILES" | grep -qE '^(packages/|libs/)'; then
33+
echo " 📦 Package changes detected"
34+
echo " 🔧 Suggested: pnpm test:regression:optimized"
35+
elif echo "$CHANGED_FILES" | grep -qE '^(portal/|standards/)'; then
36+
echo " 📄 Site content changes detected"
37+
echo " 🔧 Suggested: pnpm test:regression:fast"
38+
elif echo "$CHANGED_FILES" | grep -qE '^(scripts/|\.github/)'; then
39+
echo " ⚙️ Infrastructure changes detected"
40+
echo " 🔧 Suggested: pnpm test:regression:affected"
41+
else
42+
echo " 📝 General changes detected"
43+
echo " 🔧 Suggested: pnpm test:regression:fast"
44+
fi
45+
46+
echo ""
47+
echo " ⚡ All options are fast thanks to Nx caching!"
48+
echo " 📊 Performance comparison: node scripts/regression-performance-comparison.js"
49+
echo ""
50+
}
51+
52+
# Check test status
53+
if check_recent_tests; then
54+
echo "✅ Recent regression tests found - you're good to go!"
55+
else
56+
echo "ℹ️ No recent regression tests found"
57+
58+
# Only show recommendations for protected branches or if user wants them
59+
if [ "$BRANCH" = "main" ] || [ "$BRANCH" = "dev" ]; then
60+
echo "🔒 Protected branch - consider running tests before pushing"
61+
show_recommendations
62+
else
63+
echo "📝 Feature branch - tests are optional but recommended"
64+
echo "💡 Run 'pnpm test:regression:fast' for quick validation"
65+
fi
66+
fi
67+
68+
echo "🚀 Proceeding with push..."
69+
exit 0

‎.husky/pre-push-smart‎

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
#!/usr/bin/env sh
2+
# Smart Pre-push hook for IFLA Standards project
3+
# Prompts for testing only when needed, tracks test status
4+
5+
BRANCH=$(git branch --show-current)
6+
LAST_TEST_FILE=".git/.last-regression-test"
7+
CURRENT_COMMIT=$(git rev-parse HEAD)
8+
9+
echo "🚀 Pre-push check for branch: $BRANCH"
10+
11+
# Function to check if regression tests have been run since last push
12+
check_test_status() {
13+
if [ -f "$LAST_TEST_FILE" ]; then
14+
LAST_TEST_COMMIT=$(cat "$LAST_TEST_FILE")
15+
# Check if current commit is descendant of last tested commit
16+
if git merge-base --is-ancestor "$LAST_TEST_COMMIT" "$CURRENT_COMMIT" 2>/dev/null; then
17+
return 0 # Tests are up to date
18+
fi
19+
fi
20+
return 1 # Tests need to be run
21+
}
22+
23+
# Function to update test status
24+
update_test_status() {
25+
echo "$CURRENT_COMMIT" > "$LAST_TEST_FILE"
26+
}
27+
28+
# Function to prompt user for testing
29+
prompt_for_tests() {
30+
local test_type="$1"
31+
local test_command="$2"
32+
33+
echo ""
34+
echo "⚠️ Regression tests haven't been run since your last changes."
35+
echo "📋 Recommended: Run $test_type tests before pushing"
36+
echo "🔧 Command: $test_command"
37+
echo ""
38+
39+
# Check if we're in a CI environment or non-interactive shell
40+
if [ -n "$CI" ] || [ ! -t 0 ]; then
41+
echo "🤖 CI/non-interactive environment detected - skipping test prompt"
42+
return 0
43+
fi
44+
45+
echo "Choose an option:"
46+
echo " 1) Run tests now (recommended)"
47+
echo " 2) Skip tests and push anyway"
48+
echo " 3) Cancel push"
49+
echo ""
50+
printf "Choice [1]: "
51+
52+
read -r choice
53+
choice=${choice:-1} # Default to 1 if empty
54+
55+
case $choice in
56+
1)
57+
echo "🧪 Running $test_type tests..."
58+
if eval "$test_command"; then
59+
echo "✅ Tests passed!"
60+
update_test_status
61+
return 0
62+
else
63+
echo "❌ Tests failed. Push cancelled."
64+
return 1
65+
fi
66+
;;
67+
2)
68+
echo "⚠️ Skipping tests and proceeding with push..."
69+
echo "💡 Remember to run tests later: $test_command"
70+
return 0
71+
;;
72+
3|*)
73+
echo "🛑 Push cancelled"
74+
return 1
75+
;;
76+
esac
77+
}
78+
79+
# Check if tests are needed
80+
if check_test_status; then
81+
echo "✅ Regression tests are up to date - proceeding with push"
82+
exit 0
83+
fi
84+
85+
# Determine test strategy based on branch and changes
86+
if [ "$BRANCH" = "main" ] || [ "$BRANCH" = "dev" ]; then
87+
echo "🔒 Protected branch detected ($BRANCH)"
88+
89+
# For protected branches, suggest comprehensive testing
90+
TEST_COMMAND="pnpm test:regression:optimized"
91+
prompt_for_tests "comprehensive regression" "$TEST_COMMAND"
92+
93+
else
94+
echo "📝 Feature branch detected"
95+
96+
# Check what files changed to suggest appropriate tests
97+
CHANGED_FILES=$(git diff --name-only @{u}..HEAD 2>/dev/null || git diff --name-only HEAD~1..HEAD)
98+
99+
# Determine test strategy based on changes
100+
if echo "$CHANGED_FILES" | grep -qE '^(packages/|libs/)'; then
101+
# Package changes - suggest comprehensive testing
102+
TEST_COMMAND="pnpm test:regression:optimized"
103+
prompt_for_tests "comprehensive regression (package changes detected)" "$TEST_COMMAND"
104+
elif echo "$CHANGED_FILES" | grep -qE '^(portal/|standards/)'; then
105+
# Site content changes - suggest fast testing
106+
TEST_COMMAND="pnpm test:regression:fast"
107+
prompt_for_tests "fast regression" "$TEST_COMMAND"
108+
elif echo "$CHANGED_FILES" | grep -qE '^(scripts/|\.github/)'; then
109+
# Infrastructure changes - suggest affected testing
110+
TEST_COMMAND="pnpm test:regression:affected"
111+
prompt_for_tests "affected project" "$TEST_COMMAND"
112+
else
113+
# Other changes - minimal testing
114+
TEST_COMMAND="pnpm test:regression:fast"
115+
prompt_for_tests "configuration" "$TEST_COMMAND"
116+
fi
117+
fi
118+
119+
exit $?

‎package.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,10 @@
112112
"test:regression:affected": "node scripts/test-site-builds-optimized.js --affected-only",
113113
"test:portal:optimized": "./scripts/test-portal-builds-optimized.sh",
114114
"test:pre-push:optimized": "./.husky/pre-push-optimized",
115+
"test:pre-push:smart": "./.husky/pre-push-smart",
116+
"test:pre-push:reminder": "./.husky/pre-push-reminder",
117+
"test:mark-run": "node scripts/mark-tests-run.js",
118+
"demo:hooks": "./scripts/demo-hooks.sh",
115119
"typecheck": "tsc --noEmit",
116120
"typecheck:all": "nx run-many --target=typecheck --all",
117121
"lint:all": "nx run-many --target=lint --all",

‎scripts/demo-hooks.sh‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
#!/bin/bash
2+
3+
# Demo script to show different pre-push hook options
4+
5+
echo "🎯 Pre-push Hook Options Demo"
6+
echo "==============================="
7+
echo ""
8+
9+
echo "1. 🛡️ Current (Gentle Reminder):"
10+
echo " - Just shows recommendations"
11+
echo " - Never blocks pushes"
12+
echo " - Tracks test status"
13+
echo ""
14+
./.husky/pre-push
15+
echo ""
16+
echo "---"
17+
echo ""
18+
19+
echo "2. 🤖 Smart (Interactive Prompts):"
20+
echo " - Prompts for testing when needed"
21+
echo " - User can choose to test, skip, or cancel"
22+
echo " - Smarter about what tests to suggest"
23+
echo ""
24+
echo "To enable: cp .husky/pre-push-smart .husky/pre-push"
25+
echo ""
26+
27+
echo "3. 🔒 Original (Force Testing):"
28+
echo " - Always runs comprehensive tests"
29+
echo " - Blocks pushes on test failures"
30+
echo " - Slower but most thorough"
31+
echo ""
32+
echo "To enable: cp .husky/pre-push-original .husky/pre-push"
33+
echo ""
34+
35+
echo "4. 🚀 Optimized (Force Fast Testing):"
36+
echo " - Uses Nx affected detection"
37+
echo " - Parallel execution and caching"
38+
echo " - Still blocks but much faster"
39+
echo ""
40+
echo "To enable: cp .husky/pre-push-optimized .husky/pre-push"
41+
echo ""
42+
43+
echo "📊 Current configuration: Gentle Reminder (recommended)"
44+
echo "💡 Change anytime by copying one of the hook variants!"
45+
echo ""
46+
47+
echo "⚡ Test commands available:"
48+
echo " - pnpm test:regression:fast (30 seconds)"
49+
echo " - pnpm test:regression:affected (varies)"
50+
echo " - pnpm test:regression:optimized (2-3 minutes)"
51+
echo " - pnpm test:portal:optimized (2 seconds)"
52+
echo ""
53+
54+
echo "🎉 Happy coding with faster testing!"

0 commit comments

Comments
 (0)