fix(test): 测试间状态串台与 macOS 临时目录路径导致的用例失败
两处既有测试基建问题(在慢 runner 的 CI 上表现为 free-window 用例 间歇性失败,阻塞 PR 合并): - free-window/sidebar-crash/bottom-auto-terminal 三个 spec 共用 session id 's1':store 会按 200ms 防抖把每会话状态持久化到 localStorage['dsh-sidebar:v1:s1'],前一个用例的迟写(drop 点 400,300 → 浮窗 left=205)被下一用例 setSession 恢复,新浮窗断言(期望 317) 被 querySelector 拿到的旧窗口炸掉——用例间隔是否超过 200ms 决定成 败,本地快时常过、CI 慢必挂。修复:挂载 helper 缺省生成唯一 session id(持久化往返用例显式传固定 id),afterEach 在 unstub 之后 清 localStorage 兜底 - git/git-worktree 两个用例在 macOS 上必挂:tmpdir() 返回 /var 符号 链接而 git 报告解析后的 /private/var 前缀,路径比较与 resolveWorktree 的恒等匹配失配(CI 的 Linux 路径规范所以一直绿)。 修复:期望值与传入 git API 的路径统一 realpathSync 规范化 本地全量 vitest 963 通过 0 失败(此前 free-window 间歇 0~2 失败 + git 2 个环境性失败);free-window 单文件连跑 8 次稳定。
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
import { describe, expect, it } from 'vitest'
|
||||
import { spawnSync } from 'node:child_process'
|
||||
import { mkdtempSync, rmSync, writeFileSync } from 'node:fs'
|
||||
import { mkdtempSync, realpathSync, rmSync, writeFileSync } from 'node:fs'
|
||||
import { tmpdir } from 'node:os'
|
||||
import { join, resolve } from 'node:path'
|
||||
import { parseWorktreeList, resolveWorktree, status, worktrees } from '../src/git.ts'
|
||||
@@ -67,13 +67,16 @@ describe('linked Git worktrees', () => {
|
||||
git(main, ['commit', '-q', '-m', 'base'])
|
||||
git(main, ['worktree', 'add', '-q', '-b', 'agent', agent])
|
||||
writeFileSync(join(agent, 'tracked.txt'), 'changed by agent\n')
|
||||
// macOS tmpdir() keeps the /var symlink while git reports the resolved
|
||||
// /private/var prefix — canonicalize every path handed to git APIs.
|
||||
const agentPath = realpathSync(agent)
|
||||
|
||||
const listed = await worktrees(main)
|
||||
expect(listed).toHaveLength(2)
|
||||
expect(listed.find(entry => entry.current)).toMatchObject({ branch: 'main', changes: 0 })
|
||||
expect(listed.find(entry => !entry.current)).toMatchObject({ branch: 'agent', changes: 1 })
|
||||
expect(resolve(await resolveWorktree(main, agent))).toBe(resolve(agent))
|
||||
expect((await status(await resolveWorktree(main, agent))).entries).toEqual([
|
||||
expect(resolve(await resolveWorktree(main, agentPath))).toBe(resolve(agentPath))
|
||||
expect((await status(await resolveWorktree(main, agentPath))).entries).toEqual([
|
||||
{ path: 'tracked.txt', xy: ' M' },
|
||||
])
|
||||
await expect(resolveWorktree(main, root)).rejects.toThrow('unknown linked worktree')
|
||||
@@ -84,9 +87,9 @@ describe('linked Git worktrees', () => {
|
||||
rmSync(agent, { recursive: true, force: true })
|
||||
const remaining = await worktrees(main)
|
||||
expect(remaining).toHaveLength(1)
|
||||
expect(resolve(remaining[0]!.path)).toBe(resolve(main))
|
||||
expect(resolve(remaining[0]!.path)).toBe(resolve(realpathSync(main)))
|
||||
expect(remaining[0]!.current).toBe(true)
|
||||
await expect(resolveWorktree(main, agent)).rejects.toThrow('unknown linked worktree')
|
||||
await expect(resolveWorktree(main, agentPath)).rejects.toThrow('unknown linked worktree')
|
||||
} finally {
|
||||
try { git(main, ['worktree', 'remove', '--force', agent]) } catch { /* fixture may not be fully initialized */ }
|
||||
rmSync(root, { recursive: true, force: true })
|
||||
|
||||
Reference in New Issue
Block a user