feat(M13): auto-PR via gh CLI after successful push (auto_pr=true)
New src/git/pr.ts helper wraps 'gh pr create'; returns { url } or { error }.
maybeCreateAutoPr() in update-job-status checks product.auto_pr, builds title
from story.code + task.title, writes pr_url to DB. Non-fatal: gh failure logs
a warning and leaves DONE status intact. Also syncs schema: auto_pr on Product,
pr_url on ClaudeJob.
This commit is contained in:
parent
dadcbc48d6
commit
1015264558
5 changed files with 252 additions and 0 deletions
69
__tests__/git/pr.test.ts
Normal file
69
__tests__/git/pr.test.ts
Normal file
|
|
@ -0,0 +1,69 @@
|
|||
import { describe, it, expect, vi, beforeEach } from 'vitest'
|
||||
|
||||
const { mockExecFile } = vi.hoisted(() => ({ mockExecFile: vi.fn() }))
|
||||
|
||||
vi.mock('node:child_process', () => ({ execFile: mockExecFile }))
|
||||
vi.mock('node:util', () => ({
|
||||
promisify:
|
||||
(fn: (...args: unknown[]) => void) =>
|
||||
(...args: unknown[]) =>
|
||||
new Promise((resolve, reject) =>
|
||||
fn(...args, (err: Error | null, result: unknown) => (err ? reject(err) : resolve(result))),
|
||||
),
|
||||
}))
|
||||
|
||||
import { createPullRequest } from '../../src/git/pr.js'
|
||||
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
})
|
||||
|
||||
describe('createPullRequest', () => {
|
||||
it('returns PR URL when gh succeeds', async () => {
|
||||
mockExecFile.mockImplementation(
|
||||
(_cmd: string, _args: string[], _opts: unknown, cb: (err: null, res: { stdout: string; stderr: string }) => void) =>
|
||||
cb(null, { stdout: 'Creating pull request...\nhttps://github.com/org/repo/pull/42\n', stderr: '' }),
|
||||
)
|
||||
|
||||
const result = await createPullRequest({
|
||||
worktreePath: '/worktrees/job-abc',
|
||||
branchName: 'feat/job-abc',
|
||||
title: 'SCRUM-1: Add feature',
|
||||
body: 'Summary\n\n---\n\n*Auto-generated*',
|
||||
})
|
||||
|
||||
expect(result).toEqual({ url: 'https://github.com/org/repo/pull/42' })
|
||||
})
|
||||
|
||||
it('returns error when gh is not installed (ENOENT)', async () => {
|
||||
mockExecFile.mockImplementation(
|
||||
(_cmd: string, _args: string[], _opts: unknown, cb: (err: Error) => void) =>
|
||||
cb(Object.assign(new Error('spawn gh ENOENT'), { code: 'ENOENT' })),
|
||||
)
|
||||
|
||||
const result = await createPullRequest({
|
||||
worktreePath: '/worktrees/job-abc',
|
||||
branchName: 'feat/job-abc',
|
||||
title: 'My PR',
|
||||
body: 'Body',
|
||||
})
|
||||
|
||||
expect(result).toMatchObject({ error: expect.stringContaining('gh CLI not found') })
|
||||
})
|
||||
|
||||
it('returns error on generic gh failure', async () => {
|
||||
mockExecFile.mockImplementation(
|
||||
(_cmd: string, _args: string[], _opts: unknown, cb: (err: Error) => void) =>
|
||||
cb(new Error('authentication required')),
|
||||
)
|
||||
|
||||
const result = await createPullRequest({
|
||||
worktreePath: '/worktrees/job-abc',
|
||||
branchName: 'feat/job-abc',
|
||||
title: 'My PR',
|
||||
body: 'Body',
|
||||
})
|
||||
|
||||
expect(result).toMatchObject({ error: expect.stringContaining('gh pr create failed') })
|
||||
})
|
||||
})
|
||||
85
__tests__/update-job-status-auto-pr.test.ts
Normal file
85
__tests__/update-job-status-auto-pr.test.ts
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
import { describe, it, expect, vi, beforeEach } from 'vitest'
|
||||
|
||||
vi.mock('../src/prisma.js', () => ({
|
||||
prisma: {
|
||||
product: { findUnique: vi.fn() },
|
||||
task: { findUnique: vi.fn() },
|
||||
},
|
||||
}))
|
||||
|
||||
vi.mock('../src/git/pr.js', () => ({
|
||||
createPullRequest: vi.fn(),
|
||||
}))
|
||||
|
||||
import { prisma } from '../src/prisma.js'
|
||||
import { createPullRequest } from '../src/git/pr.js'
|
||||
import { maybeCreateAutoPr } from '../src/tools/update-job-status.js'
|
||||
|
||||
const mockPrisma = prisma as unknown as {
|
||||
product: { findUnique: ReturnType<typeof vi.fn> }
|
||||
task: { findUnique: ReturnType<typeof vi.fn> }
|
||||
}
|
||||
const mockCreatePr = createPullRequest as ReturnType<typeof vi.fn>
|
||||
|
||||
const BASE_OPTS = {
|
||||
jobId: 'job-abc',
|
||||
productId: 'prod-1',
|
||||
taskId: 'task-1',
|
||||
worktreePath: '/wt/job-abc',
|
||||
branchName: 'feat/job-abc',
|
||||
summary: 'Implemented the feature',
|
||||
}
|
||||
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
mockPrisma.product.findUnique.mockResolvedValue({ auto_pr: true })
|
||||
mockPrisma.task.findUnique.mockResolvedValue({
|
||||
title: 'Add feature',
|
||||
story: { code: 'SCRUM-42' },
|
||||
})
|
||||
mockCreatePr.mockResolvedValue({ url: 'https://github.com/org/repo/pull/99' })
|
||||
})
|
||||
|
||||
describe('maybeCreateAutoPr', () => {
|
||||
it('returns PR URL when auto_pr=true and gh succeeds', async () => {
|
||||
const url = await maybeCreateAutoPr(BASE_OPTS)
|
||||
expect(url).toBe('https://github.com/org/repo/pull/99')
|
||||
expect(mockCreatePr).toHaveBeenCalledWith({
|
||||
worktreePath: BASE_OPTS.worktreePath,
|
||||
branchName: BASE_OPTS.branchName,
|
||||
title: 'SCRUM-42: Add feature',
|
||||
body: expect.stringContaining(BASE_OPTS.summary),
|
||||
})
|
||||
})
|
||||
|
||||
it('returns null when auto_pr=false', async () => {
|
||||
mockPrisma.product.findUnique.mockResolvedValue({ auto_pr: false })
|
||||
const url = await maybeCreateAutoPr(BASE_OPTS)
|
||||
expect(url).toBeNull()
|
||||
expect(mockCreatePr).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('uses task title without code prefix when story has no code', async () => {
|
||||
mockPrisma.task.findUnique.mockResolvedValue({
|
||||
title: 'Add feature',
|
||||
story: { code: null },
|
||||
})
|
||||
await maybeCreateAutoPr(BASE_OPTS)
|
||||
expect(mockCreatePr).toHaveBeenCalledWith(
|
||||
expect.objectContaining({ title: 'Add feature' }),
|
||||
)
|
||||
})
|
||||
|
||||
it('returns null and does not throw when gh fails', async () => {
|
||||
mockCreatePr.mockResolvedValue({ error: 'gh CLI not found' })
|
||||
const url = await maybeCreateAutoPr(BASE_OPTS)
|
||||
expect(url).toBeNull()
|
||||
})
|
||||
|
||||
it('returns null when product not found', async () => {
|
||||
mockPrisma.product.findUnique.mockResolvedValue(null)
|
||||
const url = await maybeCreateAutoPr(BASE_OPTS)
|
||||
expect(url).toBeNull()
|
||||
expect(mockCreatePr).not.toHaveBeenCalled()
|
||||
})
|
||||
})
|
||||
Loading…
Add table
Add a link
Reference in a new issue