feat(projects): worktree remove + prune from any device (W4)
Closes the create-only loop — delete losing worktrees and prune stale ones without a terminal. Destructive, so guarded hard: - src/http/worktrees.ts: removeWorktree + pruneWorktrees (execFile, no shell, never rm -rf; git worktree remove [--force] / git worktree prune). Safeguards: (1) target realpath must match an entry git itself reports in `git worktree list` for THIS repo → 404 otherwise (arbitrary FS paths never match, so git is never invoked against them); (2) reject the MAIN worktree → 400; (3) realpath containment on request + each list entry, operating on git's canonical path (+ --); (4) dirty tree without force → 409 "force required"; (5) locked → 409; (6) errors classified to fixed safe strings (raw stderr/paths never leaked). - DELETE /projects/worktree + POST /projects/worktree/prune — both behind requireAllowedOrigin + worktreeEnabled + audit-logged, mirroring the create route. - public/projects.ts: ✕ remove button per linked-worktree row (hidden for main/locked) + a prune button; force needs an explicit second confirm (no single-click data loss). Verified: typecheck + build:web clean, worktree tests 108 pass (unit covers reject-non-registered / reject-main / reject-escape / refuse-dirty-without-force / clean-remove / force-remove / prune), full suite green at --test-timeout=30000.
This commit is contained in:
Yaojia Wang
186
test/http/worktrees-remove.test.ts
Normal file
186
test/http/worktrees-remove.test.ts
Normal file
@@ -0,0 +1,186 @@
|
||||
/**
|
||||
* test/http/worktrees-remove.test.ts — W4 worktree remove / prune (DESTRUCTIVE).
|
||||
*
|
||||
* Covers the two new exports of src/http/worktrees.ts:
|
||||
* - removeWorktree (registered-check + main/locked reject + realpath match +
|
||||
* dirty/force handling + safe error classification, SEC-M10)
|
||||
* - pruneWorktrees (idempotent prune of stale worktrees)
|
||||
*
|
||||
* Everything runs against real temporary git repos with real linked worktrees
|
||||
* (no network, no mocks) — mirrors worktrees-create.test.ts. Safety is the point:
|
||||
* these tests assert git is never invoked against an arbitrary / main / escaping
|
||||
* path, and that a dirty tree is refused without an explicit force.
|
||||
*/
|
||||
|
||||
import { describe, it, expect, beforeAll } from 'vitest'
|
||||
import fs from 'node:fs/promises'
|
||||
import os from 'node:os'
|
||||
import path from 'node:path'
|
||||
import { execFile } from 'node:child_process'
|
||||
import { promisify } from 'node:util'
|
||||
import { createWorktree, removeWorktree, pruneWorktrees } from '../../src/http/worktrees.js'
|
||||
|
||||
const execFileP = promisify(execFile)
|
||||
const TIMEOUT_MS = 10000
|
||||
|
||||
let gitAvailable = false
|
||||
beforeAll(async () => {
|
||||
try {
|
||||
await execFileP('git', ['--version'])
|
||||
gitAvailable = true
|
||||
} catch {
|
||||
gitAvailable = false
|
||||
}
|
||||
})
|
||||
|
||||
/** Create a temp git repo with one commit so `git worktree add` can run. */
|
||||
async function makeRepo(): Promise<string> {
|
||||
const dir = await fs.mkdtemp(path.join(os.tmpdir(), 'wtrm-repo-'))
|
||||
await execFileP('git', ['init', '-q', '-b', 'main'], { cwd: dir })
|
||||
await execFileP('git', ['config', 'user.email', 't@t.local'], { cwd: dir })
|
||||
await execFileP('git', ['config', 'user.name', 'tester'], { cwd: dir })
|
||||
await execFileP('git', ['config', 'commit.gpgsign', 'false'], { cwd: dir })
|
||||
await execFileP('git', ['commit', '-q', '--allow-empty', '-m', 'init'], { cwd: dir })
|
||||
return dir
|
||||
}
|
||||
|
||||
/** Create a repo + one linked worktree (via the shipped createWorktree). */
|
||||
async function makeRepoWithWorktree(branch = 'feature'): Promise<{ repo: string; wt: string }> {
|
||||
const repo = await makeRepo()
|
||||
const res = await createWorktree(repo, branch, { timeoutMs: TIMEOUT_MS })
|
||||
expect(res.ok).toBe(true)
|
||||
return { repo, wt: res.path as string }
|
||||
}
|
||||
|
||||
async function worktreeList(repo: string): Promise<string> {
|
||||
const { stdout } = await execFileP('git', ['worktree', 'list'], { cwd: repo })
|
||||
return stdout
|
||||
}
|
||||
|
||||
// ── removeWorktree ──────────────────────────────────────────────────────────────
|
||||
|
||||
describe('removeWorktree', () => {
|
||||
it('returns 404 for a non-git directory', async () => {
|
||||
const plain = await fs.mkdtemp(path.join(os.tmpdir(), 'wtrm-plain-'))
|
||||
const res = await removeWorktree(plain, plain, { timeoutMs: TIMEOUT_MS })
|
||||
expect(res).toMatchObject({ ok: false, status: 404 })
|
||||
})
|
||||
|
||||
it('returns 400 for an empty target path', async () => {
|
||||
if (!gitAvailable) return
|
||||
const repo = await makeRepo()
|
||||
const res = await removeWorktree(repo, '', { timeoutMs: TIMEOUT_MS })
|
||||
expect(res).toMatchObject({ ok: false, status: 400 })
|
||||
})
|
||||
|
||||
it('returns 404 for a path that is not a registered worktree (never rm arbitrary paths)', async () => {
|
||||
if (!gitAvailable) return
|
||||
const repo = await makeRepo()
|
||||
const stranger = await fs.mkdtemp(path.join(os.tmpdir(), 'wtrm-stranger-'))
|
||||
const res = await removeWorktree(repo, stranger, { timeoutMs: TIMEOUT_MS })
|
||||
expect(res).toMatchObject({ ok: false, status: 404 })
|
||||
// The stranger dir was never touched by git.
|
||||
await expect(fs.stat(stranger)).resolves.toBeDefined()
|
||||
})
|
||||
|
||||
it('refuses to remove the MAIN worktree (the repo itself) with 400', async () => {
|
||||
if (!gitAvailable) return
|
||||
const repo = await makeRepo()
|
||||
const res = await removeWorktree(repo, repo, { timeoutMs: TIMEOUT_MS })
|
||||
expect(res).toMatchObject({ ok: false, status: 400 })
|
||||
expect(res.error).toMatch(/main/i)
|
||||
// The repo still exists and is still a git repo.
|
||||
await expect(fs.stat(path.join(repo, '.git'))).resolves.toBeDefined()
|
||||
})
|
||||
|
||||
it('removes a clean linked worktree and returns ok', async () => {
|
||||
if (!gitAvailable) return
|
||||
const { repo, wt } = await makeRepoWithWorktree()
|
||||
expect(await worktreeList(repo)).toContain(wt)
|
||||
const res = await removeWorktree(repo, wt, { timeoutMs: TIMEOUT_MS })
|
||||
expect(res.ok).toBe(true)
|
||||
expect(res.path).toBeDefined()
|
||||
expect(await worktreeList(repo)).not.toContain(wt)
|
||||
})
|
||||
|
||||
it('refuses a dirty worktree without force (409), then removes it with force', async () => {
|
||||
if (!gitAvailable) return
|
||||
const { repo, wt } = await makeRepoWithWorktree()
|
||||
// Untracked file → git refuses `worktree remove` without --force.
|
||||
await fs.writeFile(path.join(wt, 'scratch.txt'), 'wip\n', 'utf8')
|
||||
|
||||
const refused = await removeWorktree(repo, wt, { timeoutMs: TIMEOUT_MS })
|
||||
expect(refused).toMatchObject({ ok: false, status: 409 })
|
||||
// Still present — no data was lost.
|
||||
expect(await worktreeList(repo)).toContain(wt)
|
||||
|
||||
const forced = await removeWorktree(repo, wt, { force: true, timeoutMs: TIMEOUT_MS })
|
||||
expect(forced.ok).toBe(true)
|
||||
expect(await worktreeList(repo)).not.toContain(wt)
|
||||
})
|
||||
|
||||
it('never leaks raw git stderr in the dirty-tree error (SEC-M10)', async () => {
|
||||
if (!gitAvailable) return
|
||||
const { repo, wt } = await makeRepoWithWorktree()
|
||||
await fs.writeFile(path.join(wt, 'scratch.txt'), 'wip\n', 'utf8')
|
||||
const res = await removeWorktree(repo, wt, { timeoutMs: TIMEOUT_MS })
|
||||
expect(res.ok).toBe(false)
|
||||
expect(res.error).toBeDefined()
|
||||
expect(res.error).not.toContain('fatal:')
|
||||
expect(res.error).not.toContain('error:')
|
||||
expect(res.error).not.toContain(wt) // no path leak
|
||||
})
|
||||
|
||||
it('refuses a locked worktree with 409 (unlock first; never auto -f -f)', async () => {
|
||||
if (!gitAvailable) return
|
||||
const { repo, wt } = await makeRepoWithWorktree()
|
||||
await execFileP('git', ['worktree', 'lock', wt], { cwd: repo })
|
||||
const res = await removeWorktree(repo, wt, { force: true, timeoutMs: TIMEOUT_MS })
|
||||
expect(res).toMatchObject({ ok: false, status: 409 })
|
||||
expect(res.error).toMatch(/lock/i)
|
||||
expect(await worktreeList(repo)).toContain(wt)
|
||||
})
|
||||
|
||||
it('matches a symlink alias via realpath and removes git\'s canonical path (M2)', async () => {
|
||||
if (!gitAvailable) return
|
||||
const { repo, wt } = await makeRepoWithWorktree()
|
||||
const aliasParent = await fs.mkdtemp(path.join(os.tmpdir(), 'wtrm-alias-'))
|
||||
const alias = path.join(aliasParent, 'link-to-wt')
|
||||
await fs.symlink(wt, alias)
|
||||
// Passing the symlink still resolves to the same registered worktree.
|
||||
const res = await removeWorktree(repo, alias, { timeoutMs: TIMEOUT_MS })
|
||||
expect(res.ok).toBe(true)
|
||||
expect(await worktreeList(repo)).not.toContain(wt)
|
||||
})
|
||||
})
|
||||
|
||||
// ── pruneWorktrees ──────────────────────────────────────────────────────────────
|
||||
|
||||
describe('pruneWorktrees', () => {
|
||||
it('returns 404 for a non-git directory', async () => {
|
||||
const plain = await fs.mkdtemp(path.join(os.tmpdir(), 'wtrm-pruneplain-'))
|
||||
const res = await pruneWorktrees(plain, { timeoutMs: TIMEOUT_MS })
|
||||
expect(res).toMatchObject({ ok: false, status: 404 })
|
||||
})
|
||||
|
||||
it('prunes a worktree whose folder was deleted out-of-band', async () => {
|
||||
if (!gitAvailable) return
|
||||
const { repo, wt } = await makeRepoWithWorktree()
|
||||
// Simulate a user rm -rf'ing the worktree dir behind git's back.
|
||||
await fs.rm(wt, { recursive: true, force: true })
|
||||
const res = await pruneWorktrees(repo, { timeoutMs: TIMEOUT_MS })
|
||||
expect(res.ok).toBe(true)
|
||||
expect(Array.isArray(res.pruned)).toBe(true)
|
||||
expect((res.pruned as string[]).length).toBeGreaterThanOrEqual(1)
|
||||
// git no longer lists the stale worktree.
|
||||
expect(await worktreeList(repo)).not.toContain(wt)
|
||||
})
|
||||
|
||||
it('is idempotent — a clean repo prunes nothing', async () => {
|
||||
if (!gitAvailable) return
|
||||
const repo = await makeRepo()
|
||||
const res = await pruneWorktrees(repo, { timeoutMs: TIMEOUT_MS })
|
||||
expect(res).toMatchObject({ ok: true })
|
||||
expect(res.pruned).toEqual([])
|
||||
})
|
||||
})
|
||||
@@ -190,6 +190,176 @@ describe('POST /projects/worktree (B3)', () => {
|
||||
})
|
||||
})
|
||||
|
||||
// ── DELETE /projects/worktree (W4 remove) ─────────────────────────────────────────
|
||||
|
||||
/** Create a worktree via the POST route; returns its git path. */
|
||||
async function createWorktreeViaRoute(
|
||||
port: number,
|
||||
origin: string,
|
||||
repo: string,
|
||||
branch: string,
|
||||
): Promise<string> {
|
||||
const res = await fetch(`http://127.0.0.1:${port}/projects/worktree`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json', Origin: origin },
|
||||
body: JSON.stringify({ path: repo, branch }),
|
||||
})
|
||||
expect(res.status).toBe(200)
|
||||
const body = (await res.json()) as { ok: boolean; path?: string }
|
||||
expect(body.ok).toBe(true)
|
||||
return body.path as string
|
||||
}
|
||||
|
||||
describe('DELETE /projects/worktree (W4)', () => {
|
||||
it('rejects a foreign Origin with 403 (SEC-C3)', async () => {
|
||||
const { port } = await spawnServer()
|
||||
const res = await fetch(`http://127.0.0.1:${port}/projects/worktree`, {
|
||||
method: 'DELETE',
|
||||
headers: { 'Content-Type': 'application/json', Origin: 'http://evil.example' },
|
||||
body: JSON.stringify({ path: '/tmp/x', worktreePath: '/tmp/x/wt' }),
|
||||
})
|
||||
expect(res.status).toBe(403)
|
||||
})
|
||||
|
||||
it('rejects a missing Origin with 403', async () => {
|
||||
const { port } = await spawnServer()
|
||||
const res = await fetch(`http://127.0.0.1:${port}/projects/worktree`, {
|
||||
method: 'DELETE',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ path: '/tmp/x', worktreePath: '/tmp/x/wt' }),
|
||||
})
|
||||
expect(res.status).toBe(403)
|
||||
})
|
||||
|
||||
it('returns 403 when WORKTREE_ENABLED=0', async () => {
|
||||
const { port, origin } = await spawnServer({ WORKTREE_ENABLED: '0' })
|
||||
const res = await fetch(`http://127.0.0.1:${port}/projects/worktree`, {
|
||||
method: 'DELETE',
|
||||
headers: { 'Content-Type': 'application/json', Origin: origin },
|
||||
body: JSON.stringify({ path: '/tmp/x', worktreePath: '/tmp/x/wt' }),
|
||||
})
|
||||
expect(res.status).toBe(403)
|
||||
})
|
||||
|
||||
it('returns 400 when worktreePath is missing', async () => {
|
||||
const { port, origin } = await spawnServer()
|
||||
const res = await fetch(`http://127.0.0.1:${port}/projects/worktree`, {
|
||||
method: 'DELETE',
|
||||
headers: { 'Content-Type': 'application/json', Origin: origin },
|
||||
body: JSON.stringify({ path: '/tmp/x' }),
|
||||
})
|
||||
expect(res.status).toBe(400)
|
||||
})
|
||||
|
||||
itGit('refuses to remove the main worktree with 400', async () => {
|
||||
const repo = await makeRealRepo()
|
||||
const { port, origin } = await spawnServer()
|
||||
const res = await fetch(`http://127.0.0.1:${port}/projects/worktree`, {
|
||||
method: 'DELETE',
|
||||
headers: { 'Content-Type': 'application/json', Origin: origin },
|
||||
body: JSON.stringify({ path: repo, worktreePath: repo }),
|
||||
})
|
||||
expect(res.status).toBe(400)
|
||||
})
|
||||
|
||||
itGit('removes a clean linked worktree and returns ok (200)', async () => {
|
||||
const repo = await makeRealRepo()
|
||||
const root = await fs.mkdtemp(path.join(os.tmpdir(), 'webterm-rmroot-'))
|
||||
tmpDirs.push(root)
|
||||
const { port, origin } = await spawnServer({ WORKTREE_ROOT: root })
|
||||
const wt = await createWorktreeViaRoute(port, origin, repo, 'to-remove')
|
||||
expect(execFileSync('git', ['worktree', 'list'], { cwd: repo }).toString()).toContain(wt)
|
||||
|
||||
const res = await fetch(`http://127.0.0.1:${port}/projects/worktree`, {
|
||||
method: 'DELETE',
|
||||
headers: { 'Content-Type': 'application/json', Origin: origin },
|
||||
body: JSON.stringify({ path: repo, worktreePath: wt }),
|
||||
})
|
||||
expect(res.status).toBe(200)
|
||||
const body = (await res.json()) as { ok: boolean; path?: string }
|
||||
expect(body.ok).toBe(true)
|
||||
expect(execFileSync('git', ['worktree', 'list'], { cwd: repo }).toString()).not.toContain(wt)
|
||||
})
|
||||
|
||||
itGit('refuses a dirty worktree (409), then removes it with force (200)', async () => {
|
||||
const repo = await makeRealRepo()
|
||||
const root = await fs.mkdtemp(path.join(os.tmpdir(), 'webterm-dirtyroot-'))
|
||||
tmpDirs.push(root)
|
||||
const { port, origin } = await spawnServer({ WORKTREE_ROOT: root })
|
||||
const wt = await createWorktreeViaRoute(port, origin, repo, 'dirty-one')
|
||||
await fs.writeFile(path.join(wt, 'scratch.txt'), 'wip\n', 'utf8')
|
||||
|
||||
const refused = await fetch(`http://127.0.0.1:${port}/projects/worktree`, {
|
||||
method: 'DELETE',
|
||||
headers: { 'Content-Type': 'application/json', Origin: origin },
|
||||
body: JSON.stringify({ path: repo, worktreePath: wt }),
|
||||
})
|
||||
expect(refused.status).toBe(409)
|
||||
|
||||
const forced = await fetch(`http://127.0.0.1:${port}/projects/worktree`, {
|
||||
method: 'DELETE',
|
||||
headers: { 'Content-Type': 'application/json', Origin: origin },
|
||||
body: JSON.stringify({ path: repo, worktreePath: wt, force: true }),
|
||||
})
|
||||
expect(forced.status).toBe(200)
|
||||
expect(execFileSync('git', ['worktree', 'list'], { cwd: repo }).toString()).not.toContain(wt)
|
||||
})
|
||||
})
|
||||
|
||||
// ── POST /projects/worktree/prune (W4) ────────────────────────────────────────────
|
||||
|
||||
describe('POST /projects/worktree/prune (W4)', () => {
|
||||
it('rejects a foreign Origin with 403', async () => {
|
||||
const { port } = await spawnServer()
|
||||
const res = await fetch(`http://127.0.0.1:${port}/projects/worktree/prune`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json', Origin: 'http://evil.example' },
|
||||
body: JSON.stringify({ path: '/tmp/x' }),
|
||||
})
|
||||
expect(res.status).toBe(403)
|
||||
})
|
||||
|
||||
it('returns 403 when WORKTREE_ENABLED=0', async () => {
|
||||
const { port, origin } = await spawnServer({ WORKTREE_ENABLED: '0' })
|
||||
const res = await fetch(`http://127.0.0.1:${port}/projects/worktree/prune`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json', Origin: origin },
|
||||
body: JSON.stringify({ path: '/tmp/x' }),
|
||||
})
|
||||
expect(res.status).toBe(403)
|
||||
})
|
||||
|
||||
it('returns 400 when path is missing', async () => {
|
||||
const { port, origin } = await spawnServer()
|
||||
const res = await fetch(`http://127.0.0.1:${port}/projects/worktree/prune`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json', Origin: origin },
|
||||
body: JSON.stringify({}),
|
||||
})
|
||||
expect(res.status).toBe(400)
|
||||
})
|
||||
|
||||
itGit('prunes a worktree whose folder was deleted out-of-band (200)', async () => {
|
||||
const repo = await makeRealRepo()
|
||||
const root = await fs.mkdtemp(path.join(os.tmpdir(), 'webterm-pruneroot-'))
|
||||
tmpDirs.push(root)
|
||||
const { port, origin } = await spawnServer({ WORKTREE_ROOT: root })
|
||||
const wt = await createWorktreeViaRoute(port, origin, repo, 'stale-one')
|
||||
await fs.rm(wt, { recursive: true, force: true })
|
||||
|
||||
const res = await fetch(`http://127.0.0.1:${port}/projects/worktree/prune`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json', Origin: origin },
|
||||
body: JSON.stringify({ path: repo }),
|
||||
})
|
||||
expect(res.status).toBe(200)
|
||||
const body = (await res.json()) as { ok: boolean; pruned: string[] }
|
||||
expect(body.ok).toBe(true)
|
||||
expect(Array.isArray(body.pruned)).toBe(true)
|
||||
expect(execFileSync('git', ['worktree', 'list'], { cwd: repo }).toString()).not.toContain(wt)
|
||||
})
|
||||
})
|
||||
|
||||
// ── GET /projects/diff ───────────────────────────────────────────────────────────
|
||||
|
||||
describe('GET /projects/diff (B1)', () => {
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
*/
|
||||
|
||||
import { describe, it, expect, vi, beforeEach } from 'vitest'
|
||||
import type { ProjectDetail } from '../src/types.js'
|
||||
import type { ProjectDetail, WorktreeInfo } from '../src/types.js'
|
||||
|
||||
// ── Stub @xterm/xterm (transitively via preview-grid.ts) ──────────────────────
|
||||
class FakeTerminal {
|
||||
@@ -41,8 +41,14 @@ const mockMountPrChip = vi.fn(() => mockPrChipHandle)
|
||||
vi.mock('../public/gh-chip.js', () => ({ mountPrChip: mockMountPrChip }))
|
||||
|
||||
// ── Import AFTER mocks ─────────────────────────────────────────────────────────
|
||||
const { validateBranchNameClient, renderNewWorktreeForm, renderProjectDetail } =
|
||||
await import('../public/projects.js')
|
||||
const {
|
||||
validateBranchNameClient,
|
||||
renderNewWorktreeForm,
|
||||
renderProjectDetail,
|
||||
makeWorktreeRow,
|
||||
confirmAndRemoveWorktree,
|
||||
confirmAndPruneWorktrees,
|
||||
} = await import('../public/projects.js')
|
||||
|
||||
/* ── Helpers ───────────────────────────────────────────────────────────────── */
|
||||
|
||||
@@ -579,3 +585,226 @@ describe('renderProjectDetail — A4 Activity section', () => {
|
||||
expect(mockDiffHandle.destroy).toHaveBeenCalled()
|
||||
})
|
||||
})
|
||||
|
||||
/* ── W4: makeWorktreeRow remove button ─────────────────────────────────────── */
|
||||
|
||||
function wt(overrides: Partial<WorktreeInfo> = {}): WorktreeInfo {
|
||||
return { path: '/repo/wt/feat', branch: 'feat', isMain: false, isCurrent: false, ...overrides }
|
||||
}
|
||||
|
||||
describe('makeWorktreeRow — W4 remove button', () => {
|
||||
const actions = { onRemove: vi.fn() }
|
||||
|
||||
it('adds a remove button for a non-main, non-locked worktree when actions are given', () => {
|
||||
const row = makeWorktreeRow(wt(), actions)
|
||||
expect(row.querySelector('.proj-wt-remove')).not.toBeNull()
|
||||
})
|
||||
|
||||
it('omits the remove button when no actions are given (read-only row)', () => {
|
||||
const row = makeWorktreeRow(wt())
|
||||
expect(row.querySelector('.proj-wt-remove')).toBeNull()
|
||||
})
|
||||
|
||||
it('never offers a remove button for the main worktree', () => {
|
||||
const row = makeWorktreeRow(wt({ isMain: true, branch: 'main' }), actions)
|
||||
expect(row.querySelector('.proj-wt-remove')).toBeNull()
|
||||
expect(row.textContent).toContain('main')
|
||||
})
|
||||
|
||||
it('never offers a remove button for a locked worktree (keeps the locked tag)', () => {
|
||||
const row = makeWorktreeRow(wt({ locked: true }), actions)
|
||||
expect(row.querySelector('.proj-wt-remove')).toBeNull()
|
||||
expect(row.textContent).toContain('locked')
|
||||
})
|
||||
|
||||
it('still offers a remove button for a prunable worktree', () => {
|
||||
const row = makeWorktreeRow(wt({ prunable: true }), actions)
|
||||
expect(row.querySelector('.proj-wt-remove')).not.toBeNull()
|
||||
})
|
||||
|
||||
it('clicking the remove button calls onRemove with the worktree', () => {
|
||||
const onRemove = vi.fn()
|
||||
const w = wt()
|
||||
const row = makeWorktreeRow(w, { onRemove })
|
||||
;(row.querySelector('.proj-wt-remove') as HTMLButtonElement).click()
|
||||
expect(onRemove).toHaveBeenCalledWith(w)
|
||||
})
|
||||
})
|
||||
|
||||
/* ── W4: renderProjectDetail prune button + remove wiring ──────────────────── */
|
||||
|
||||
describe('renderProjectDetail — W4 prune + remove wiring', () => {
|
||||
const mainWt: WorktreeInfo = { path: '/repo', branch: 'main', isMain: true, isCurrent: true }
|
||||
const featWt: WorktreeInfo = { path: '/repo/wt/feat', branch: 'feat', isMain: false, isCurrent: false }
|
||||
const staleWt: WorktreeInfo = {
|
||||
path: '/repo/wt/gone', branch: 'gone', isMain: false, isCurrent: false, prunable: true,
|
||||
}
|
||||
|
||||
it('shows a "Prune stale worktrees" button when a worktree is prunable and a callback is wired', () => {
|
||||
const root = renderProjectDetail(
|
||||
makeDetail({ worktrees: [mainWt, staleWt] }),
|
||||
makeHooks(),
|
||||
{ ...makeCbs(), onPruneWorktrees: vi.fn() },
|
||||
)
|
||||
expect(root.querySelector('.proj-wt-prune')).not.toBeNull()
|
||||
})
|
||||
|
||||
it('hides the prune button when no worktree is prunable', () => {
|
||||
const root = renderProjectDetail(
|
||||
makeDetail({ worktrees: [mainWt, featWt] }),
|
||||
makeHooks(),
|
||||
{ ...makeCbs(), onPruneWorktrees: vi.fn() },
|
||||
)
|
||||
expect(root.querySelector('.proj-wt-prune')).toBeNull()
|
||||
})
|
||||
|
||||
it('hides the prune button when no prune callback is wired (pre-W4 callers)', () => {
|
||||
const root = renderProjectDetail(makeDetail({ worktrees: [mainWt, staleWt] }), makeHooks(), makeCbs())
|
||||
expect(root.querySelector('.proj-wt-prune')).toBeNull()
|
||||
})
|
||||
|
||||
it('threads onRemoveWorktree so clicking a row remove button passes the worktree path', () => {
|
||||
const onRemoveWorktree = vi.fn()
|
||||
const root = renderProjectDetail(
|
||||
makeDetail({ worktrees: [mainWt, featWt] }),
|
||||
makeHooks(),
|
||||
{ ...makeCbs(), onRemoveWorktree },
|
||||
)
|
||||
const btn = root.querySelector('.proj-wt-remove') as HTMLButtonElement
|
||||
expect(btn).not.toBeNull()
|
||||
btn.click()
|
||||
expect(onRemoveWorktree).toHaveBeenCalledWith('/repo/wt/feat')
|
||||
})
|
||||
|
||||
it('clicking prune invokes onPruneWorktrees', () => {
|
||||
const onPruneWorktrees = vi.fn()
|
||||
const root = renderProjectDetail(
|
||||
makeDetail({ worktrees: [mainWt, staleWt] }),
|
||||
makeHooks(),
|
||||
{ ...makeCbs(), onPruneWorktrees },
|
||||
)
|
||||
;(root.querySelector('.proj-wt-prune') as HTMLButtonElement).click()
|
||||
expect(onPruneWorktrees).toHaveBeenCalled()
|
||||
})
|
||||
})
|
||||
|
||||
/* ── W4: confirmAndRemoveWorktree / confirmAndPruneWorktrees ───────────────── */
|
||||
|
||||
describe('confirmAndRemoveWorktree — confirm → (force) → refresh flow', () => {
|
||||
it('confirms, DELETEs with force:false, and returns "removed" on success', async () => {
|
||||
vi.spyOn(window, 'confirm').mockReturnValue(true)
|
||||
const mockFetch = vi.fn().mockResolvedValue({ ok: true, status: 200, json: async () => ({ ok: true }) })
|
||||
vi.stubGlobal('fetch', mockFetch)
|
||||
|
||||
const outcome = await confirmAndRemoveWorktree('/repo', '/repo/wt/feat', vi.fn())
|
||||
expect(outcome).toBe('removed')
|
||||
expect(mockFetch).toHaveBeenCalledWith(
|
||||
'/projects/worktree',
|
||||
expect.objectContaining({
|
||||
method: 'DELETE',
|
||||
body: JSON.stringify({ path: '/repo', worktreePath: '/repo/wt/feat', force: false }),
|
||||
}),
|
||||
)
|
||||
})
|
||||
|
||||
it('on a 409 dirty refusal, asks a SECOND confirm then retries with force:true', async () => {
|
||||
vi.spyOn(window, 'confirm').mockReturnValue(true)
|
||||
const mockFetch = vi
|
||||
.fn()
|
||||
.mockResolvedValueOnce({ ok: false, status: 409, json: async () => ({ ok: false, error: 'dirty' }) })
|
||||
.mockResolvedValueOnce({ ok: true, status: 200, json: async () => ({ ok: true }) })
|
||||
vi.stubGlobal('fetch', mockFetch)
|
||||
|
||||
const outcome = await confirmAndRemoveWorktree('/repo', '/repo/wt/feat', vi.fn())
|
||||
expect(outcome).toBe('removed')
|
||||
expect(mockFetch).toHaveBeenCalledTimes(2)
|
||||
// Second call carries force:true.
|
||||
expect(mockFetch.mock.calls[1]?.[1]).toMatchObject({
|
||||
body: JSON.stringify({ path: '/repo', worktreePath: '/repo/wt/feat', force: true }),
|
||||
})
|
||||
})
|
||||
|
||||
it('does NOT fetch when the user cancels the first confirm (no accidental delete)', async () => {
|
||||
vi.spyOn(window, 'confirm').mockReturnValue(false)
|
||||
const mockFetch = vi.fn()
|
||||
vi.stubGlobal('fetch', mockFetch)
|
||||
|
||||
const outcome = await confirmAndRemoveWorktree('/repo', '/repo/wt/feat', vi.fn())
|
||||
expect(outcome).toBe('cancelled')
|
||||
expect(mockFetch).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('does NOT force-delete when the user cancels the second (force) confirm', async () => {
|
||||
vi.spyOn(window, 'confirm').mockReturnValueOnce(true).mockReturnValueOnce(false)
|
||||
const mockFetch = vi
|
||||
.fn()
|
||||
.mockResolvedValueOnce({ ok: false, status: 409, json: async () => ({ ok: false, error: 'dirty' }) })
|
||||
vi.stubGlobal('fetch', mockFetch)
|
||||
|
||||
const outcome = await confirmAndRemoveWorktree('/repo', '/repo/wt/feat', vi.fn())
|
||||
expect(outcome).toBe('cancelled')
|
||||
expect(mockFetch).toHaveBeenCalledTimes(1) // only the non-force attempt
|
||||
})
|
||||
|
||||
it('reports a safe error via the onError callback and renders it via textContent (SEC-L3/H6)', async () => {
|
||||
vi.spyOn(window, 'confirm').mockReturnValue(true)
|
||||
const mockFetch = vi
|
||||
.fn()
|
||||
.mockResolvedValue({ ok: false, status: 500, json: async () => ({ ok: false, error: 'boom' }) })
|
||||
vi.stubGlobal('fetch', mockFetch)
|
||||
|
||||
const errEl = document.createElement('div')
|
||||
const onError = (msg: string): void => { errEl.textContent = msg }
|
||||
const outcome = await confirmAndRemoveWorktree('/repo', '/repo/wt/feat', onError)
|
||||
|
||||
expect(outcome).toBe('error')
|
||||
expect(errEl.textContent).toBe('boom')
|
||||
expect(errEl.querySelector('script')).toBeNull() // textContent, never innerHTML
|
||||
})
|
||||
|
||||
it('reports a safe error on network failure (never throws)', async () => {
|
||||
vi.spyOn(window, 'confirm').mockReturnValue(true)
|
||||
vi.stubGlobal('fetch', vi.fn().mockRejectedValue(new Error('offline')))
|
||||
const onError = vi.fn()
|
||||
const outcome = await confirmAndRemoveWorktree('/repo', '/repo/wt/feat', onError)
|
||||
expect(outcome).toBe('error')
|
||||
expect(onError).toHaveBeenCalled()
|
||||
})
|
||||
})
|
||||
|
||||
describe('confirmAndPruneWorktrees', () => {
|
||||
it('confirms, POSTs to the prune route, and returns "pruned" on success', async () => {
|
||||
vi.spyOn(window, 'confirm').mockReturnValue(true)
|
||||
const mockFetch = vi
|
||||
.fn()
|
||||
.mockResolvedValue({ ok: true, status: 200, json: async () => ({ ok: true, pruned: [] }) })
|
||||
vi.stubGlobal('fetch', mockFetch)
|
||||
|
||||
const outcome = await confirmAndPruneWorktrees('/repo', vi.fn())
|
||||
expect(outcome).toBe('pruned')
|
||||
expect(mockFetch).toHaveBeenCalledWith(
|
||||
'/projects/worktree/prune',
|
||||
expect.objectContaining({ method: 'POST', body: JSON.stringify({ path: '/repo' }) }),
|
||||
)
|
||||
})
|
||||
|
||||
it('does NOT fetch when the user cancels', async () => {
|
||||
vi.spyOn(window, 'confirm').mockReturnValue(false)
|
||||
const mockFetch = vi.fn()
|
||||
vi.stubGlobal('fetch', mockFetch)
|
||||
const outcome = await confirmAndPruneWorktrees('/repo', vi.fn())
|
||||
expect(outcome).toBe('cancelled')
|
||||
expect(mockFetch).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('reports a safe error via onError on failure', async () => {
|
||||
vi.spyOn(window, 'confirm').mockReturnValue(true)
|
||||
vi.stubGlobal('fetch', vi.fn().mockResolvedValue({
|
||||
ok: false, status: 500, json: async () => ({ ok: false, error: 'nope' }),
|
||||
}))
|
||||
const onError = vi.fn()
|
||||
const outcome = await confirmAndPruneWorktrees('/repo', onError)
|
||||
expect(outcome).toBe('error')
|
||||
expect(onError).toHaveBeenCalledWith('nope')
|
||||
})
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user