RomanNum3ral
/
gstack
mirror of https://github.com/garrytan/gstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test(land): cover enqueue-and-return default + shared onboarding (D4-D6) 

Asserts the queue default is enqueue-and-return with a --watch opt-in,
land-and-deploy forces --watch, the teacher-mode explainer is present, the
shared {{MERGE_QUEUE_SETUP}} onboarding resolves in BOTH /land and /setup-deploy,
and bin/gstack-merge exposes confirm-enqueue.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Garry Tan 2026-06-01 08:34:14 -07:00
parent 9e49d4f812
commit 5f903c5d91
No known key found for this signature in database
GPG Key ID: C1F69E85C74EFE1D
1 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
test/gen-skill-docs.test.ts
View File

@ -1505,6 +1505,52 @@ describe('/land skill composition', () => {
});
});
// --- /land enqueue-and-return + onboarding (D4/D5/D6) ---
describe('/land enqueue-and-return + merge-queue onboarding', () => {
const landMd = fs.readFileSync(path.join(ROOT, 'land', 'SKILL.md'), 'utf-8');
const setupMd = fs.readFileSync(path.join(ROOT, 'setup-deploy', 'SKILL.md'), 'utf-8');
const ladMd = fs.readFileSync(path.join(ROOT, 'land-and-deploy', 'SKILL.md'), 'utf-8');
test('D4: enqueue-and-return is the default for queue regimes, with a --watch opt-in', () => {
expect(landMd).toContain('confirm-enqueue');
expect(landMd).toContain('enqueue-and-return');
expect(landMd).toContain('--watch');
// The default must NOT block on the queue; --watch is the blocking path.
expect(landMd).toMatch(/Default for a merge queue is enqueue-and-return/i);
});
test('D4: land-and-deploy forces /land into --watch (it needs the completed merge)', () => {
expect(ladMd).toContain('--watch');
expect(ladMd).toMatch(/as if invoked with .*--watch|--watch branch/);
});
test('D5: the skill explains what a merge queue is and what it will do', () => {
expect(landMd).toMatch(/what a merge queue is|how this lands/i);
expect(landMd).toMatch(/walk away/i);
expect(landMd).toContain('optimistic');
});
test('D6: the shared {{MERGE_QUEUE_SETUP}} onboarding resolves in BOTH /land and /setup-deploy', () => {
// No literal placeholder left anywhere.
expect(landMd).not.toContain('{{MERGE_QUEUE_SETUP}}');
expect(setupMd).not.toContain('{{MERGE_QUEUE_SETUP}}');
// The authoritative onboarding text appears in both (single source, two includes).
expect(landMd).toContain('Set up a merge queue with trunk.io');
expect(setupMd).toContain('Set up a merge queue with trunk.io');
// It hand-holds the load-bearing trunk steps.
expect(landMd).toContain('Trunk GitHub App');
expect(landMd).toContain('app.trunk.io');
expect(landMd).toMatch(/trunk-merge\/\*/);
});
test('bin/gstack-merge exposes the confirm-enqueue subcommand', () => {
const bin = fs.readFileSync(path.join(ROOT, 'bin', 'gstack-merge'), 'utf-8');
expect(bin).toContain("case 'confirm-enqueue':");
expect(bin).toContain('last-enqueue.json');
});
});
// --- {{CHANGELOG_WORKFLOW}} resolver tests ---
describe('CHANGELOG_WORKFLOW resolver', () => {