From 7914078484de5f9f4c1597a69b6b41f093b90923 Mon Sep 17 00:00:00 2001 From: nrslib <38722970+nrslib@users.noreply.github.com> Date: Sun, 15 Feb 2026 06:08:53 +0900 Subject: [PATCH] fix(e2e): align tests with tasks.yaml-based list design - watch/task-status-persistence: expect completed status instead of deletion - list-non-interactive: create tasks.yaml records for completed task lookup --- e2e/specs/list-non-interactive.e2e.ts | 30 +++++++++++++++++++++++- e2e/specs/task-status-persistence.e2e.ts | 3 ++- e2e/specs/watch.e2e.ts | 3 ++- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/e2e/specs/list-non-interactive.e2e.ts b/e2e/specs/list-non-interactive.e2e.ts index c7b9be8..bb1b227 100644 --- a/e2e/specs/list-non-interactive.e2e.ts +++ b/e2e/specs/list-non-interactive.e2e.ts @@ -1,11 +1,31 @@ import { describe, it, expect, beforeEach, afterEach } from 'vitest'; import { execFileSync } from 'node:child_process'; -import { writeFileSync } from 'node:fs'; +import { mkdirSync, writeFileSync } from 'node:fs'; import { join } from 'node:path'; import { createIsolatedEnv, type IsolatedEnv } from '../helpers/isolated-env'; import { createTestRepo, type TestRepo } from '../helpers/test-repo'; import { runTakt } from '../helpers/takt-runner'; +function writeCompletedTask(repoPath: string, name: string, branch: string): void { + const taktDir = join(repoPath, '.takt'); + mkdirSync(taktDir, { recursive: true }); + const now = new Date().toISOString(); + writeFileSync( + join(taktDir, 'tasks.yaml'), + [ + 'tasks:', + ` - name: ${name}`, + ' status: completed', + ` content: "E2E test task for ${name}"`, + ` branch: "${branch}"`, + ` created_at: "${now}"`, + ` started_at: "${now}"`, + ` completed_at: "${now}"`, + ].join('\n'), + 'utf-8', + ); +} + // E2E更新時は docs/testing/e2e.md も更新すること describe('E2E: List tasks non-interactive (takt list)', () => { let isolatedEnv: IsolatedEnv; @@ -38,6 +58,8 @@ describe('E2E: List tasks non-interactive (takt list)', () => { execFileSync('git', ['commit', '-m', 'takt: list diff e2e'], { cwd: testRepo.path, stdio: 'pipe' }); execFileSync('git', ['checkout', testRepo.branch], { cwd: testRepo.path, stdio: 'pipe' }); + writeCompletedTask(testRepo.path, 'e2e-list-diff', branchName); + const result = runTakt({ args: ['list', '--non-interactive', '--action', 'diff', '--branch', branchName], cwd: testRepo.path, @@ -58,6 +80,8 @@ describe('E2E: List tasks non-interactive (takt list)', () => { execFileSync('git', ['commit', '-m', 'takt: list try e2e'], { cwd: testRepo.path, stdio: 'pipe' }); execFileSync('git', ['checkout', testRepo.branch], { cwd: testRepo.path, stdio: 'pipe' }); + writeCompletedTask(testRepo.path, 'e2e-list-try', branchName); + const result = runTakt({ args: ['list', '--non-interactive', '--action', 'try', '--branch', branchName], cwd: testRepo.path, @@ -84,6 +108,8 @@ describe('E2E: List tasks non-interactive (takt list)', () => { execFileSync('git', ['commit', '-m', 'takt: list merge e2e'], { cwd: testRepo.path, stdio: 'pipe' }); execFileSync('git', ['checkout', testRepo.branch], { cwd: testRepo.path, stdio: 'pipe' }); + writeCompletedTask(testRepo.path, 'e2e-list-merge', branchName); + const result = runTakt({ args: ['list', '--non-interactive', '--action', 'merge', '--branch', branchName], cwd: testRepo.path, @@ -110,6 +136,8 @@ describe('E2E: List tasks non-interactive (takt list)', () => { execFileSync('git', ['commit', '-m', 'takt: list e2e'], { cwd: testRepo.path, stdio: 'pipe' }); execFileSync('git', ['checkout', testRepo.branch], { cwd: testRepo.path, stdio: 'pipe' }); + writeCompletedTask(testRepo.path, 'e2e-list-test', branchName); + const result = runTakt({ args: ['list', '--non-interactive', '--action', 'delete', '--branch', branchName, '--yes'], cwd: testRepo.path, diff --git a/e2e/specs/task-status-persistence.e2e.ts b/e2e/specs/task-status-persistence.e2e.ts index 632b905..6ceeb2e 100644 --- a/e2e/specs/task-status-persistence.e2e.ts +++ b/e2e/specs/task-status-persistence.e2e.ts @@ -69,7 +69,8 @@ describe('E2E: Task status persistence in tasks.yaml (mock)', () => { const tasksContent = readFileSync(join(repo.path, '.takt', 'tasks.yaml'), 'utf-8'); const tasks = parseYaml(tasksContent) as { tasks: Array> }; expect(Array.isArray(tasks.tasks)).toBe(true); - expect(tasks.tasks.length).toBe(0); + expect(tasks.tasks.length).toBe(1); + expect(tasks.tasks[0]?.status).toBe('completed'); }, 240_000); it('should persist failed status and failure details on failure', () => { diff --git a/e2e/specs/watch.e2e.ts b/e2e/specs/watch.e2e.ts index f16318c..fb3084c 100644 --- a/e2e/specs/watch.e2e.ts +++ b/e2e/specs/watch.e2e.ts @@ -96,6 +96,7 @@ describe('E2E: Watch tasks (takt watch)', () => { const tasksRaw = readFileSync(tasksFile, 'utf-8'); const parsed = parseYaml(tasksRaw) as { tasks?: Array<{ name?: string; status?: string }> }; const watchTask = parsed.tasks?.find((task) => task.name === 'watch-task'); - expect(watchTask).toBeUndefined(); + expect(watchTask).toBeDefined(); + expect(watchTask!.status).toBe('completed'); }, 240_000); });