From 7459177bb47d03bab415add981996459ffbd2c61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Sat, 31 Oct 2026 04:47:31 +0800 Subject: [PATCH] =?UTF-8?q?test(phase-5.1):=20=E5=88=86=E7=89=87/=E6=95=99?= =?UTF-8?q?=E7=A8=8B=E6=8E=A5=E7=BA=BF=E7=9A=84=E6=B5=8B=E8=AF=95=E7=BC=9D?= =?UTF-8?q?=E4=B8=8E=E6=A3=98=E8=BD=AE=E5=8F=B0=E8=B4=A6=E9=9A=8F=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E5=AF=B9=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - upload.ts 保持 axios 实例 http.post(与打包产物一致),两处用例改对撞同一把缝 - 教程确认用例接受可选 file_key,并新增该参数的存在断言 - 静默 catch 台账登记 localStorage 两处,blocks 抬到 307 并逐支说明 --- .../tests/align-tutorial.test.ts | 3 ++- .../tests/catch-silence-ratchet.test.ts | 18 ++++++++++++++++-- .../tests/java-modules-reexport.test.ts | 2 +- frontend-vue/tests/modules-image-video.test.ts | 7 ++++--- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/admin-frontend-vue/tests/align-tutorial.test.ts b/admin-frontend-vue/tests/align-tutorial.test.ts index a9c1aaf9c..b8d43df60 100644 --- a/admin-frontend-vue/tests/align-tutorial.test.ts +++ b/admin-frontend-vue/tests/align-tutorial.test.ts @@ -45,7 +45,8 @@ test('align_tutorial_api_contract', () => { assert.match(api, /\$\{TUTORIAL_UPLOAD_ENDPOINT\}\/confirm/, '确认端点') assert.match(api, /\$\{TUTORIAL_UPLOAD_ENDPOINT\}\/delete/, '删除端点') assert.match(api, /params: \{ file_name: fileName, version \}/, '预签名回传文件名与版本号') - assert.match(api, /params: \{ object_key: objectKey, file_name: fileName, version \}/, '确认回传对象 key、文件名与版本号') + assert.match(api, /params: Record = \{ object_key: objectKey, file_name: fileName, version \}/, '确认回传对象 key、文件名与版本号') + assert.match(api, /if \(fileKey\) params\.file_key = fileKey/, '分片拼装件的 file_key 必须随确认一起回传') assert.match(api, /withCredentials: false/, '直传实例不挂会话拦截器') }) diff --git a/frontend-vue/tests/catch-silence-ratchet.test.ts b/frontend-vue/tests/catch-silence-ratchet.test.ts index 6104585a1..c9c67cf73 100644 --- a/frontend-vue/tests/catch-silence-ratchet.test.ts +++ b/frontend-vue/tests/catch-silence-ratchet.test.ts @@ -41,7 +41,13 @@ const BASELINE = { // ② activate 被服务端拒绝(任务已被兜底拉取/Linux 领走)时 ElMessage.warning 并中止入队, // 防同一任务执行两次。 // silent 一格没涨:两支都有用户可见出口,只进 blocks。 - blocks: 303, + // 307 = 303 + 4(2026-10-31 v1.2 Phase 5.1 分片会话跨刷新续用,全部在 upload.ts): + // ① 读本地会话:JSON.parse/localStorage 抛错时按「无会话」处理; + // ② 写会话:隐私模式/配额满时放弃持久化,本次上传照常; + // ③ 清会话:清不掉只会让下次多问一次 status; + // ④ 已有会话探测失败:清状态重新 init(服务端回收后不重建会永久卡死)。 + // 四支都不吞用户可见错误:失败只影响「跨刷新续传」这个可选优化,上传本身仍会抛给调用方。 + blocks: 307, // 2026-10-30(ops Phase 6/可读棘轮):ApiSecretSettingsPanel.vue 1113→775 行,面板里那处 // 静默 catch(余额查询失败只 console.warn、界面留空)随 loadBalance 整块搬进 // useProxyPlan.ts。不是新增静默:面板 1→0、新文件记 1,silent 总数与 blocks 都一格没动, @@ -63,7 +69,10 @@ const BASELINE = { // 那句空 catch 换成可见状态 + 首拉重试,静默 2→1(台账跟着改); // ② 基线此前停在 83,而改动前实扫是 82——上一轮减下去没缩台账,本轮一并拉平到实扫值。 // blocks 一格没动:本轮没有新增 try/catch,只是给既有 catch 补了出口。 - silent: 81, + // 82 = 81 + 1 净增(2026-10-31 v1.2 Phase 5.1 分片会话续用):upload.ts 的 localStorage 写/清两处 + // 为登记项(perFile 已记 2),另有一处分片状态探测失败改走 catch 后重建会话;同批把一处 + // 分片重试 catch 改成无 catch 的直调,净 +1。三处的用户可见结果都不受影响。 + silent: 82, /** 逐文件台账:只钉总数与文件数两个标量的棘轮,会被「A 加一条 + B 减一条」整段绕过。 */ perFile: { 'src/pages/brand/components/BrandCollectDataTab.vue': 4, @@ -85,6 +94,11 @@ const BASELINE = { 'src/router/index.ts': 3, 'src/shared/api/http.ts': 1, 'src/shared/api/task-progress-polling.ts': 1, + // 2026-10-31 v1.2 Phase 5.1:分片会话跨刷新续用的 localStorage 读/写/清三处兜底。 + // 隐私模式/配额满时 setItem/removeItem 会真抛,兜法是「本次上传照常、跨刷新续传降级」—— + // 用户可见结果不受影响,也不该为一个可选优化打断上传。读分支自带 return 空串(扫描器不计静默), + // 写/清两支为空块,登记为 2 处;blocks 未涨过 303。 + 'src/shared/api/upload.ts': 2, 'src/shared/api/types/modules/permission.ts': 1, 'src/shared/auth/account-expiry.ts': 1, 'src/shared/auth/ensure-auth.ts': 1, diff --git a/frontend-vue/tests/java-modules-reexport.test.ts b/frontend-vue/tests/java-modules-reexport.test.ts index 85c3f126a..65ab9ddf5 100644 --- a/frontend-vue/tests/java-modules-reexport.test.ts +++ b/frontend-vue/tests/java-modules-reexport.test.ts @@ -49,7 +49,7 @@ test('test_reexport_upload_helpers', async (t) => { location: { origin: 'http://localhost' }, } const calls: { url?: string; method?: string; data?: unknown }[] = [] - t.mock.method(http, 'post', ((url: string, data?: unknown, config?: unknown) => { + t.mock.method(http, 'post', ((url: string, data?: unknown) => { calls.push({ url, method: 'POST', data }) return Promise.resolve({ data: { success: true, message: 'ok', data: { fileKey: 'f1', originalFilename: 'a.xlsx', localPath: '/tmp/a.xlsx', size: 1 } } }) }) as never) diff --git a/frontend-vue/tests/modules-image-video.test.ts b/frontend-vue/tests/modules-image-video.test.ts index 447f5b8b8..ae97635ec 100644 --- a/frontend-vue/tests/modules-image-video.test.ts +++ b/frontend-vue/tests/modules-image-video.test.ts @@ -123,10 +123,11 @@ test('test_image_video_voice', async (t) => { test('test_image_video_upload_media', async (t) => { setupWindow() const calls: { url?: string; method?: string; data?: unknown }[] = [] - mockRequest(t, (config) => { - calls.push(config) + // upload.ts 走 axios 实例的 http.post(与 axios 响应体一起交由 bodyOf 解包),这里对撞同一把缝。 + t.mock.method(http, 'post', ((url: string, data?: unknown) => { + calls.push({ url, method: 'POST', data }) return okResponse({ url: 'https://oss/x', objectKey: 'k1', originalFilename: 'a.png', mediaType: 'image' }) - }) + }) as never) const file = new File(['x'], 'a.png', { type: 'image/png' }) const result = await uploadImageVideoMedia(file) assert.equal(calls[0].url, '/newApi/api/files/upload')