The windows-test-parity ratchet greps test source for fs.rmSync-without-
maxRetries (and six other Windows-portability anti-patterns), failing when an
integer offender COUNT exceeds a frozen baseline (rmSync: 95). A count ratchet
is a Goodhart metric: fixing one offender and adding another keeps the count
constant, so a new defect slips through green. Replace it — and every other
count ratchet in the repo — with a layered, masking-proof design.
Behavioral seam test
- tests/helpers-cleanup.test.cjs proves helpers.cleanup() carries the Windows
EBUSY retry budget. cleanup() delegates retries to Node's fs.rmSync via
maxRetries (it owns no loop), so the test asserts the option contract
(recursive/force/maxRetries>0/retryDelay>0) + real-FS removal + the cwd-guard,
rather than a loop that does not exist. The EBUSY risk is now tested ONCE at
the helper, not approximated textually at every call site.
Write-time ESLint rule (AST-accurate, replaces the grep)
- eslint-rules/no-raw-rmsync-in-tests.cjs (error in tests/**/*.test.cjs) bans
raw fs.rmSync, steering to cleanup(). Catches member, computed (fs['rmSync']),
destructured and aliased forms; escape hatch is inline
`// eslint-disable-next-line local/no-raw-rmsync-in-tests -- <reason>` only.
- Migrated 336 raw fs.rmSync teardown calls across ~116 test files to cleanup().
~18 genuinely load-bearing sites (mid-test SUT/fault-injection removals,
error-swallowing or name-colliding local teardown helpers) keep the raw call
with an inline eslint-disable + reason.
Shared anti-ratchet primitive
- scripts/lib/allowlist-ratchet.cjs:
- assertWithinAllowlist: fails on NOVEL ids (new offender introduced) AND on
STALE ids (a known offender was fixed but not pruned) — identity, not count,
and a ratchet DOWN toward zero.
- assertTightCeiling: a size/length budget whose ceiling must stay within a
grace band of the high-water mark, so budgets may only tighten, never creep.
Ratchets converted onto the primitive
- windows-test-parity-guard.test.cjs: rmSync rule deleted (now ESLint-enforced);
the remaining six patterns moved from integer baselines to named-set
allowlists with ratchet-down.
- scripts/lint-test-file-count.{cjs,allowlist.json}: per-module integer counts →
named filename sets (closes the swap-a-file-keep-the-count blind spot); a
module dropping under cap now FAILS to force pruning its allowlist entry.
- enh-2790 skill-count `<= 63` → named skill allowlist (ratchets toward ~58).
Size budgets hardened (tighten-only)
- agent-size / workflow-size / feat-3039 help-tiered: ceilings lowered to the
current high-water mark and an assertTightCeiling anti-creep check added per
tier. Fixed external-contract limits (description ≤100 chars, agent ≤100 KB)
are intentionally left as-is — they are not grandfathered creeping budgets.
No user-facing behavior change (tests + tooling only); no USER_FACING_PREFIXES
touched, so no changeset fragment is required.
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
198 lines
7.5 KiB
JavaScript
198 lines
7.5 KiB
JavaScript
/**
|
|
* Tests for pruneOrphanedWorktrees()
|
|
*
|
|
* Uses real temporary git repos (no mocks).
|
|
* All 4 tests must fail (RED) before implementation is added.
|
|
*/
|
|
|
|
'use strict';
|
|
|
|
const { describe, test, beforeEach, afterEach } = require('node:test');
|
|
const assert = require('node:assert/strict');
|
|
const fs = require('fs');
|
|
const path = require('path');
|
|
const { execSync } = require('child_process');
|
|
const { createTempDir, cleanup } = require('./helpers.cjs');
|
|
|
|
// Lazy-loaded so tests can fail clearly when the export doesn't exist yet.
|
|
function getPruneOrphanedWorktrees() {
|
|
const { pruneOrphanedWorktrees } = require('../get-shit-done/bin/lib/core.cjs');
|
|
return pruneOrphanedWorktrees;
|
|
}
|
|
|
|
// Create a minimal git repo with an initial commit on main.
|
|
function canonicalPath(p) {
|
|
try {
|
|
return fs.realpathSync.native(path.resolve(p));
|
|
} catch {
|
|
return path.resolve(p);
|
|
}
|
|
}
|
|
|
|
function listedWorktreePaths(repoDir) {
|
|
const out = execSync('git worktree list --porcelain', { cwd: repoDir, encoding: 'utf8' });
|
|
return new Set(
|
|
out
|
|
.split('\n')
|
|
.filter((line) => line.startsWith('worktree '))
|
|
.map((line) => canonicalPath(line.slice('worktree '.length).trim()))
|
|
);
|
|
}
|
|
|
|
function createGitRepo(dir) {
|
|
fs.mkdirSync(dir, { recursive: true });
|
|
execSync('git init', { cwd: dir, stdio: 'pipe' });
|
|
execSync('git config user.email "test@test.com"', { cwd: dir, stdio: 'pipe' });
|
|
execSync('git config user.name "Test"', { cwd: dir, stdio: 'pipe' });
|
|
execSync('git config commit.gpgsign false', { cwd: dir, stdio: 'pipe' });
|
|
fs.writeFileSync(path.join(dir, 'README.md'), '# Test\n');
|
|
execSync('git add -A', { cwd: dir, stdio: 'pipe' });
|
|
execSync('git commit -m "initial commit"', { cwd: dir, stdio: 'pipe' });
|
|
// Rename to main if it isn't already (handles older git defaults)
|
|
try {
|
|
execSync('git branch -m master main', { cwd: dir, stdio: 'pipe' });
|
|
} catch { /* already named main */ }
|
|
}
|
|
|
|
// --- Test suite ---------------------------------------------------------------
|
|
|
|
describe('pruneOrphanedWorktrees', () => {
|
|
let tmpBase;
|
|
|
|
beforeEach(() => {
|
|
tmpBase = createTempDir('prune-wt-test-');
|
|
});
|
|
|
|
afterEach(() => {
|
|
cleanup(tmpBase);
|
|
});
|
|
|
|
// Test 1: keeps a merged worktree (destructive removal disabled by default)
|
|
test('keeps a worktree whose branch is merged into main', () => {
|
|
const repoDir = path.join(tmpBase, 'repo');
|
|
const worktreeDir = path.join(tmpBase, 'wt-merged');
|
|
|
|
createGitRepo(repoDir);
|
|
|
|
// Create worktree on a new branch (main is checked out in repoDir)
|
|
execSync('git worktree add "' + worktreeDir + '" -b fix/old-work', { cwd: repoDir, stdio: 'pipe' });
|
|
assert.ok(fs.existsSync(worktreeDir), 'worktree dir should exist before prune');
|
|
|
|
// Add a commit in the worktree
|
|
fs.writeFileSync(path.join(worktreeDir, 'feature.txt'), 'work\n');
|
|
execSync('git add -A', { cwd: worktreeDir, stdio: 'pipe' });
|
|
execSync('git commit -m "old work"', { cwd: worktreeDir, stdio: 'pipe' });
|
|
|
|
// Merge the branch into main from repoDir
|
|
execSync('git merge fix/old-work --no-ff -m "merge old-work"', { cwd: repoDir, stdio: 'pipe' });
|
|
|
|
// Act
|
|
const pruneOrphanedWorktrees = getPruneOrphanedWorktrees();
|
|
pruneOrphanedWorktrees(repoDir);
|
|
|
|
// Assert: worktree directory still exists
|
|
assert.ok(
|
|
fs.existsSync(worktreeDir),
|
|
'merged worktree should not be removed by default: ' + worktreeDir
|
|
);
|
|
|
|
// Assert: git worktree list still shows it
|
|
const listed = listedWorktreePaths(repoDir);
|
|
assert.ok(
|
|
listed.has(canonicalPath(worktreeDir)),
|
|
'git worktree list should still reference merged worktree'
|
|
);
|
|
});
|
|
|
|
// Test 2: keeps a worktree whose branch has unmerged commits
|
|
test('keeps a worktree whose branch has unmerged commits', () => {
|
|
const repoDir = path.join(tmpBase, 'repo2');
|
|
const worktreeDir = path.join(tmpBase, 'wt-active');
|
|
|
|
createGitRepo(repoDir);
|
|
|
|
// Create the worktree on a new branch (main is checked out in repoDir)
|
|
execSync('git worktree add "' + worktreeDir + '" -b fix/active-work', { cwd: repoDir, stdio: 'pipe' });
|
|
|
|
// Add a commit in the worktree (NOT merged into main)
|
|
fs.writeFileSync(path.join(worktreeDir, 'active.txt'), 'active\n');
|
|
execSync('git add -A', { cwd: worktreeDir, stdio: 'pipe' });
|
|
execSync('git commit -m "active work"', { cwd: worktreeDir, stdio: 'pipe' });
|
|
// main stays at its original commit — no merge
|
|
|
|
// Act
|
|
const pruneOrphanedWorktrees = getPruneOrphanedWorktrees();
|
|
pruneOrphanedWorktrees(repoDir);
|
|
|
|
// Assert: worktree directory still exists
|
|
assert.ok(
|
|
fs.existsSync(worktreeDir),
|
|
'worktree directory should NOT have been removed: ' + worktreeDir
|
|
);
|
|
});
|
|
|
|
// Test 3: never removes the worktree at process.cwd()
|
|
test('never removes the worktree at process.cwd()', () => {
|
|
const repoDir = path.join(tmpBase, 'repo3');
|
|
const wtDir = path.join(tmpBase, 'wt-cwd-test');
|
|
|
|
createGitRepo(repoDir);
|
|
|
|
// Create a worktree, add a commit, merge it into main
|
|
execSync('git worktree add "' + wtDir + '" -b fix/another-merged', { cwd: repoDir, stdio: 'pipe' });
|
|
fs.writeFileSync(path.join(wtDir, 'more.txt'), 'more\n');
|
|
execSync('git add -A', { cwd: wtDir, stdio: 'pipe' });
|
|
execSync('git commit -m "another merged"', { cwd: wtDir, stdio: 'pipe' });
|
|
execSync('git checkout main', { cwd: repoDir, stdio: 'pipe' });
|
|
execSync('git merge fix/another-merged --no-ff -m "merge another"', { cwd: repoDir, stdio: 'pipe' });
|
|
|
|
// Run pruning
|
|
const pruneOrphanedWorktrees = getPruneOrphanedWorktrees();
|
|
const pruned = pruneOrphanedWorktrees(repoDir);
|
|
|
|
// No destructive removals are performed by default
|
|
assert.deepStrictEqual(pruned, []);
|
|
|
|
// The main worktree (repoDir) itself must still exist
|
|
assert.ok(
|
|
fs.existsSync(repoDir),
|
|
'main repo dir should still exist: ' + repoDir
|
|
);
|
|
});
|
|
|
|
// Test 4: runs git worktree prune to clear stale references
|
|
test('runs git worktree prune to clear stale references', () => {
|
|
const repoDir = path.join(tmpBase, 'repo4');
|
|
const worktreeDir = path.join(tmpBase, 'wt-stale');
|
|
|
|
createGitRepo(repoDir);
|
|
|
|
// Create a worktree
|
|
execSync('git worktree add "' + worktreeDir + '" -b fix/stale-ref', { cwd: repoDir, stdio: 'pipe' });
|
|
assert.ok(fs.existsSync(worktreeDir), 'worktree dir should exist before manual deletion');
|
|
|
|
// Use the canonicalPath helper so Windows 8.3 short-name (RUNNER~1) vs
|
|
// long-form (runneradmin) and slash-direction differences both collapse
|
|
// to the same key before comparison. git stores the long-form path in
|
|
// its administrative files; substring matching on the raw path fails.
|
|
// Capture the canonical key BEFORE deletion since canonicalPath calls
|
|
// realpathSync.native which fails on missing paths.
|
|
const wantedKey = canonicalPath(worktreeDir);
|
|
assert.ok(listedWorktreePaths(repoDir).has(wantedKey), 'worktree should appear in list before deletion');
|
|
|
|
// Manually delete the worktree directory (simulate orphan)
|
|
// eslint-disable-next-line local/no-raw-rmsync-in-tests -- mid-test fault injection: simulates an orphaned worktree dir that git still references
|
|
fs.rmSync(worktreeDir, { recursive: true, force: true });
|
|
|
|
// Act
|
|
const pruneOrphanedWorktrees = getPruneOrphanedWorktrees();
|
|
pruneOrphanedWorktrees(repoDir);
|
|
|
|
// Assert: git worktree list no longer shows the stale entry.
|
|
assert.ok(
|
|
!listedWorktreePaths(repoDir).has(wantedKey),
|
|
'git worktree list still shows stale entry after prune'
|
|
);
|
|
});
|
|
});
|