diff --git a/tests/touch/boss_appointment.spec.ts b/tests/touch/boss_appointment.spec.ts index a737418..9d0b14f 100644 --- a/tests/touch/boss_appointment.spec.ts +++ b/tests/touch/boss_appointment.spec.ts @@ -191,7 +191,7 @@ test.describe('预约状态', () => { const $employee = page.locator('.room_table .tr .name_th').filter({ hasText: employee.name }); // 顾客预约定位器 const $customerAppointment = page - .locator('.a_userInfo') + .locator('div.a_userInfo') .filter({ hasText: customer.phone }) .filter({ hasText: customer.username }); diff --git a/tests/touch/boss_cashier.spec.ts b/tests/touch/boss_cashier.spec.ts index 631c14c..be442be 100644 --- a/tests/touch/boss_cashier.spec.ts +++ b/tests/touch/boss_cashier.spec.ts @@ -276,26 +276,19 @@ test.describe('挂单', () => { }); test('已过期单据不能取单,只能删除', async ({ page }) => { - // 点击已过期 / 删除单据 + const $slidingMenu = page.locator('div.deleteList .m_sliding_menu'); await page.getByText('已过期 / 删除单据').click(); - // 等待过期删除水单页面出来 - await page.locator('.deleteList').locator('.item_box').first().waitFor(); - // 水单都没有取单 - const PendingOrder_1 = page.locator('.deleteList').locator('.item_box'); + await page.getByText('警告:已过期服务无法取单结算,请至收银台处理').waitFor(); + await $slidingMenu.locator('div.item_box').first().waitFor(); + await expect($slidingMenu.locator('div.item_box').first().getByRole('button', { name: /^取\s单$/ })).not.toBeVisible(); + + const $delete = $slidingMenu.locator('div.item_box').first().locator('.comment > div:nth-child(2) > .touchIcon'); + await $delete.click(); + await page.getByPlaceholder('请输入1-100个字符备注内容').click(); + await page.getByPlaceholder('请输入1-100个字符备注内容').fill('测试备注'); - await expect(PendingOrder_1.getByRole('button', { name: /^取\s单$/ })).not.toBeVisible(); - await page - .locator( - 'div:nth-child(3) > .scroller-body > .alloytouch-target > .list > div > .item > .comment > div:nth-child(2) > .touchIcon', - ) - .first() - .click(); - await expect(async () => { - await page.locator('label').filter({ hasText: '1' }).click(); - await page.locator('.ant-radio-checked').waitFor(); - }).toPass(); await page.getByRole('button', { name: /^保\s存$/ }).click(); - await expect(page.locator('div').filter({ hasText: '删除成功' }).nth(2)).toBeVisible(); + await expect(page.locator('.ant-message').filter({ hasText: '删除成功' }).nth(2)).toBeVisible(); }); }); @@ -390,22 +383,13 @@ test.describe('挂单', () => { test('已删除单据不能取单,也不能删除', async ({ page }) => { // 找到已过期/删除单据 - await page.locator('.cash_content > .main > .top').getByText('已过期').click(); - await expect(async () => { - // 点击已删除服务 - await page.getByText(' 已删除服务 ').click(); - await page.locator('.loading_container').waitFor({ state: 'hidden' }); - // 等待过期删除水单页面出来 - await page.locator('.deleteList').locator('.item_box').first().waitFor({ timeout: 2000 }); - // 判断有没有取单和删除 - const PendingOrder = page.locator('.deleteList').locator('.item_box'); - await expect(PendingOrder.getByRole('button', { name: /^取\s单$/ })).not.toBeVisible(); - await expect( - page.locator( - 'div:nth-child(3) > .scroller-body > .alloytouch-target > .list > div > .item > .comment > div:nth-child(2) > .touchIcon', - ), - ).not.toBeVisible(); - }).toPass(); + await page.getByText('已过期 / 删除单据').click(); + await expect(page.getByText('已删除服务', { exact: true })).toBeInViewport(); + await page.getByText('已删除服务', { exact: true }).click(); + await expect(page.getByText('警告:已过期服务无法取单结算,请至收银台处理')).not.toBeInViewport(); + const $slidingMenu = page.locator('div.deleteList .m_sliding_menu'); + await expect($slidingMenu.locator('div.item_box').first()).toBeVisible(); + await expect($slidingMenu.locator('div.comment > i.anticon').first()).not.toBeVisible(); }); test('微信/支付宝收款', async ({ page, homeNavigation, baseURL }) => { @@ -1247,8 +1231,6 @@ test.describe('收银-开单&结算', () => { await expect(page.locator('.membercard_box .bonuses').first()).toContainText('100'); }); - await page.reload(); - await test.step('使用卡金和赠金', async () => { //使用卡金和赠金 await page.reload(); @@ -1274,13 +1256,13 @@ test.describe('收银-开单&结算', () => { await page.getByText('卡金').nth(4).click(); await page.getByRole('button', { name: '增加收款' }).click(); // 输入金额 - await numberInput.setValue(100); + await numberInput.setCommonValue(100); await numberInput.confirmValue(); // 选择赠送金支付 await page.getByText('赠金').nth(2).click(); await page.getByRole('button', { name: '增加收款' }).click(); // 输入金额 - await numberInput.setValue(90); + await numberInput.setCommonValue(90); await numberInput.confirmValue(); // 结算 await page.getByRole('button', { name: /^结\s算$/ }).click();