fix(phase-5): v1.5 CR 消项 JD-PUB-01~07 服务端半边(蓝图 docs/ITERATION_PLAN.md Phase 5)——①JD-PUB-01 发布端点收有效用户会话+任务归属闸(AdminAuthSupport 身份源收口,outlet 分母随行,RequestSuppliedIdentityOutletTest +1);②JD-PUB-02 建单/原位重试补事务边界防半截状态;③JD-PUB-03 回传校验执行代次与许可批次(V213__jd_publish_item_permit 两列 nullable 扩展,Expand-and-Contract;旧代不写新代、重复回执幂等、未处理明细不产 SUCCESS);④JD-PUB-04 入队不再等于认领(激活与桌面推送顺序,兜底保留);⑤JD-PUB-05 未知提交不自动重发;⑥JD-PUB-06 旧代终态不触发新代收尾或弹窗(credential-fatal 旧代隔离+京麦登录失效识别);⑦JD-PUB-07 选品切分类丢弃迟到响应、全选只影响本页;新增 mount 测试 jd-publish-dispatch。判据:后端点名 11 类 88 例+整量 mvn -o test 5,716 例 0 失败 0 错误 19 skip BUILD SUCCESS(00:07,7:12min);用户端 vue-tsc rc0+node --test 31+vitest mount 8 全绿;full 闸门 overall=pass 四面绿(2026-11-18 23:59:16);真机 AC-1~AC-9 联验与发版未做,Phase 5 保持未勾
This commit is contained in:
@@ -0,0 +1,191 @@
|
||||
import { afterEach, beforeEach, expect, it, vi } from 'vitest'
|
||||
import { flushPromises, mount, type VueWrapper } from '@vue/test-utils'
|
||||
import JdPublishTab from '@/pages/jd/JdPublishTab.vue'
|
||||
import {
|
||||
__resetCredentialFatalAlertForTest,
|
||||
credentialFatalQueueLength,
|
||||
takeCredentialFatal,
|
||||
} from '@/shared/stores/credential-fatal-alert'
|
||||
|
||||
const api = vi.hoisted(() => ({
|
||||
create: vi.fn(), activate: vi.fn(), products: vi.fn(), groups: vi.fn(),
|
||||
history: vi.fn(), progress: vi.fn(), dashboard: vi.fn(), retry: vi.fn(), enqueue: vi.fn(), bridge: vi.fn(),
|
||||
}))
|
||||
|
||||
vi.mock('@/shared/api/types/modules/jd-collect', () => ({ fetchJdCollectGroups: api.groups }))
|
||||
vi.mock('@/shared/api/types/modules/jd-publish', () => ({
|
||||
createJdPublishTask: api.create,
|
||||
activateJdPublishTask: api.activate,
|
||||
fetchJdPublishDashboard: api.dashboard,
|
||||
fetchJdPublishHistory: api.history,
|
||||
fetchJdPublishProducts: api.products,
|
||||
fetchJdPublishTaskProgressBatch: api.progress,
|
||||
deleteJdPublishTask: vi.fn(),
|
||||
interruptJdPublishTask: vi.fn(),
|
||||
}))
|
||||
vi.mock('@/shared/utils/categorized-timers.ts', () => ({
|
||||
createCategorizedTimers: () => ({ setTimeout: () => 1, clearTimer: vi.fn(), clearScope: vi.fn() }),
|
||||
}))
|
||||
vi.mock('element-plus', async (importOriginal) => ({
|
||||
...await importOriginal<typeof import('element-plus')>(),
|
||||
ElMessage: { success: vi.fn(), error: vi.fn() },
|
||||
}))
|
||||
vi.mock('@/shared/api/task-retry', () => ({ retryClientTask: api.retry }))
|
||||
vi.mock('@/shared/bridges/pywebview', () => ({ getPywebviewApi: api.bridge }))
|
||||
|
||||
const queuePayload = { type: 'jd-product-publish-run', data: { taskId: 88, resumeAttempt: 0, serverOnly: true } }
|
||||
const loginError = '京麦未登录(登录态失效),请在客户端重新登录京麦后重试'
|
||||
|
||||
function row(taskStatus: string, resumeAttempt: number, errorMessage?: string) {
|
||||
return { taskId: 88, taskStatus, resumeAttempt, productTotal: 2, errorMessage }
|
||||
}
|
||||
|
||||
function batch(item: ReturnType<typeof row>) {
|
||||
return {
|
||||
items: [{ task: {
|
||||
id: item.taskId, status: item.taskStatus, resumeAttempt: item.resumeAttempt, errorMessage: item.errorMessage,
|
||||
}, items: [item] }],
|
||||
missingTaskIds: [],
|
||||
}
|
||||
}
|
||||
|
||||
let wrapper: VueWrapper | undefined
|
||||
|
||||
async function mountPage() {
|
||||
wrapper = mount(JdPublishTab, {
|
||||
global: {
|
||||
stubs: {
|
||||
NotificationBell: true, RouterLink: true, ElOption: true,
|
||||
ElSelect: { props: ['modelValue'], emits: ['update:modelValue', 'change'], template: '<div><slot /></div>' },
|
||||
ElPagination: { emits: ['current-change'], template: '<div />' }, ElInputNumber: true,
|
||||
ElDrawer: { props: ['modelValue'], template: '<div v-if="modelValue"><slot /></div>' },
|
||||
},
|
||||
directives: { loading: () => undefined },
|
||||
},
|
||||
})
|
||||
await flushPromises()
|
||||
return wrapper
|
||||
}
|
||||
|
||||
async function startPublish(page: VueWrapper) {
|
||||
await page.get<HTMLInputElement>('.product-check').setValue(true)
|
||||
await page.get('.collect-btn').trigger('click')
|
||||
await flushPromises()
|
||||
}
|
||||
|
||||
beforeEach(() => {
|
||||
for (const mock of Object.values(api)) mock.mockReset()
|
||||
api.groups.mockResolvedValue([{ id: 12, name: '共享类目' }])
|
||||
api.products.mockResolvedValue({ items: [{ id: 23, title: '示例商品' }], total: 1 })
|
||||
api.create.mockResolvedValue({ taskId: 88, queuePayload })
|
||||
api.activate.mockResolvedValue(null)
|
||||
api.dashboard.mockResolvedValue({ pendingTaskCount: 0, processedTaskCount: 0, successTaskCount: 0, failedTaskCount: 0 })
|
||||
api.history.mockResolvedValue({ items: [] })
|
||||
api.progress.mockResolvedValue(batch(row('PENDING', 0)))
|
||||
api.bridge.mockReturnValue({ enqueue_json: api.enqueue })
|
||||
api.enqueue.mockResolvedValue({ success: true })
|
||||
api.retry.mockResolvedValue(null)
|
||||
vi.spyOn(console, 'error').mockImplementation(() => undefined)
|
||||
})
|
||||
|
||||
afterEach(() => {
|
||||
wrapper?.unmount()
|
||||
wrapper = undefined
|
||||
__resetCredentialFatalAlertForTest()
|
||||
localStorage.clear()
|
||||
vi.restoreAllMocks()
|
||||
})
|
||||
|
||||
it('建单只原样投递服务端载荷,网页不激活任务', async () => {
|
||||
const page = await mountPage()
|
||||
await startPublish(page)
|
||||
expect(api.create).toHaveBeenCalledOnce()
|
||||
expect(api.enqueue).toHaveBeenCalledOnce()
|
||||
expect(api.enqueue.mock.calls[0][0]).toBe(queuePayload)
|
||||
expect(api.activate).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it.each(['没有桥', '队列拒绝', '桥异常', '没有服务端载荷'])('%s时保留待认领,不拼载荷也不误报建单失败', async (failure) => {
|
||||
if (failure === '没有桥') api.bridge.mockReturnValue(undefined)
|
||||
if (failure === '队列拒绝') api.enqueue.mockResolvedValue({ success: false, error: 'queue rejected' })
|
||||
if (failure === '桥异常') api.enqueue.mockRejectedValue(new Error('bridge unavailable'))
|
||||
if (failure === '没有服务端载荷') api.create.mockResolvedValue({ taskId: 88 })
|
||||
const page = await mountPage()
|
||||
await startPublish(page)
|
||||
expect(api.activate).not.toHaveBeenCalled()
|
||||
if (failure === '没有桥' || failure === '没有服务端载荷') expect(api.enqueue).not.toHaveBeenCalled()
|
||||
expect(page.get('.feedback').text()).toContain('任务已创建')
|
||||
expect(page.get('.feedback').text()).toContain('客户端')
|
||||
expect(page.get('.status').text()).toContain('等待本机客户端领取')
|
||||
expect(page.text()).not.toContain('queue rejected')
|
||||
})
|
||||
|
||||
it('切换分类后迟到的旧商品列表不能再参与勾选', async () => {
|
||||
api.groups.mockResolvedValue([{ id: 12, name: '原分类' }, { id: 13, name: '新分类' }])
|
||||
let resolveOld!: (data: { items: { id: number, title: string }[], total: number }) => void
|
||||
api.products.mockImplementationOnce(() => new Promise((resolve) => { resolveOld = resolve }))
|
||||
api.products.mockResolvedValueOnce({ items: [{ id: 24, title: '新分类商品' }], total: 1 })
|
||||
const page = await mountPage()
|
||||
const select = page.getComponent('.shop-cat-select')
|
||||
select.vm.$emit('update:modelValue', 13)
|
||||
select.vm.$emit('change', 13)
|
||||
await flushPromises()
|
||||
resolveOld({ items: [{ id: 23, title: '旧分类商品' }], total: 1 })
|
||||
await flushPromises()
|
||||
expect(page.get('.product-title').text()).toBe('新分类商品')
|
||||
await startPublish(page)
|
||||
expect(api.create).toHaveBeenCalledExactlyOnceWith(13, [24], { mode: 'none' })
|
||||
})
|
||||
|
||||
it('全选和取消只影响本页,其他页勾选保留', async () => {
|
||||
api.products.mockResolvedValueOnce({ items: [{ id: 23, title: '第一页商品' }], total: 13 })
|
||||
api.products.mockResolvedValueOnce({ items: [{ id: 24, title: '第二页商品' }], total: 13 })
|
||||
const page = await mountPage()
|
||||
await page.get('.product-select-page').setValue(true)
|
||||
page.getComponent('.product-pager').vm.$emit('current-change', 2)
|
||||
await flushPromises()
|
||||
await page.get('.product-select-page').setValue(true)
|
||||
expect(page.get('.collect-btn').text()).toContain('2 个商品')
|
||||
await page.get('.product-select-page').setValue(false)
|
||||
await page.get('.collect-btn').trigger('click')
|
||||
await flushPromises()
|
||||
expect(api.create).toHaveBeenCalledExactlyOnceWith(12, [23], { mode: 'none' })
|
||||
})
|
||||
|
||||
it('原位重试只由兜底认领,迟到的旧代终态不能停掉轮询或弹窗', async () => {
|
||||
api.history.mockResolvedValue({ items: [row('FAILED', 3, loginError)] })
|
||||
api.progress.mockResolvedValue(batch(row('FAILED', 3, loginError)))
|
||||
const page = await mountPage()
|
||||
await page.get('.history-btn').trigger('click')
|
||||
await page.get('.btn-retry').trigger('click')
|
||||
await flushPromises()
|
||||
expect(api.retry).toHaveBeenCalledExactlyOnceWith(88)
|
||||
expect(api.activate).not.toHaveBeenCalled()
|
||||
expect(api.enqueue).not.toHaveBeenCalled()
|
||||
expect(credentialFatalQueueLength()).toBe(0)
|
||||
expect(page.find('.btn-retry').exists()).toBe(false)
|
||||
expect(localStorage.getItem('jd-publish:tasks:0')).toBe('[88]')
|
||||
|
||||
api.history.mockResolvedValue({ items: [row('RUNNING', 4)] })
|
||||
api.progress.mockResolvedValue(batch(row('RUNNING', 4)))
|
||||
await page.get('.panel-refresh').trigger('click')
|
||||
await flushPromises()
|
||||
await flushPromises()
|
||||
expect(page.get('.status').text()).toBe('正在发布到京麦…')
|
||||
expect(page.text()).not.toContain(loginError)
|
||||
|
||||
// 新代已进入 RUNNING,此时再晚到一条旧代终态也不能结算。
|
||||
api.progress.mockResolvedValue(batch(row('FAILED', 3, loginError)))
|
||||
await page.get('.panel-refresh').trigger('click')
|
||||
await flushPromises()
|
||||
expect(credentialFatalQueueLength()).toBe(0)
|
||||
expect(localStorage.getItem('jd-publish:tasks:0')).toBe('[88]')
|
||||
|
||||
api.progress.mockResolvedValue(batch(row('FAILED', 4, loginError)))
|
||||
await page.get('.panel-refresh').trigger('click')
|
||||
await flushPromises()
|
||||
await flushPromises()
|
||||
expect(credentialFatalQueueLength()).toBe(1)
|
||||
expect(takeCredentialFatal()?.notice.body).toContain('请在客户端重新登录京麦')
|
||||
expect(localStorage.getItem('jd-publish:tasks:0')).toBeNull()
|
||||
})
|
||||
Reference in New Issue
Block a user