From ba375aee124710145d848060d2b100d9de72c261 Mon Sep 17 00:00:00 2001 From: Kirill Date: Thu, 28 May 2026 21:29:30 +0500 Subject: [PATCH] =?UTF-8?q?=D1=8B=D0=B2=D0=B0=D1=8B=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order-detail/ui/__tests__/OrderDetailContent.test.tsx | 3 --- .../admin-orders/ui/__tests__/AdminOrdersPage.test.tsx | 7 ++++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/client/src/features/order-detail/ui/__tests__/OrderDetailContent.test.tsx b/client/src/features/order-detail/ui/__tests__/OrderDetailContent.test.tsx index b47f2a4..9887403 100644 --- a/client/src/features/order-detail/ui/__tests__/OrderDetailContent.test.tsx +++ b/client/src/features/order-detail/ui/__tests__/OrderDetailContent.test.tsx @@ -1,7 +1,6 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query' import { render, screen, waitFor } from '@testing-library/react' import userEvent from '@testing-library/user-event' -import { useUnit } from 'effector-react' import { MemoryRouter } from 'react-router-dom' import { beforeEach, describe, expect, it, vi } from 'vitest' import { setAdminOrderStatus } from '@/entities/order/api/admin-order-api' @@ -31,7 +30,6 @@ vi.mock('@/shared/ui/RichTextMessageEditor.lazy', () => ({ })) const setAdminOrderStatusMock = vi.mocked(setAdminOrderStatus) -const useUnitMock = vi.mocked(useUnit) function createDetail(overrides?: Partial): AdminOrderDetailResponse['item'] { return { @@ -100,7 +98,6 @@ function renderComponent(detail: AdminOrderDetailResponse['item'], orderId = 'or describe('OrderDetailContent quick status transitions', () => { beforeEach(() => { vi.clearAllMocks() - useUnitMock.mockReturnValue(null) setAdminOrderStatusMock.mockResolvedValue(undefined) }) diff --git a/client/src/pages/admin-orders/ui/__tests__/AdminOrdersPage.test.tsx b/client/src/pages/admin-orders/ui/__tests__/AdminOrdersPage.test.tsx index 697b2d4..19e5913 100644 --- a/client/src/pages/admin-orders/ui/__tests__/AdminOrdersPage.test.tsx +++ b/client/src/pages/admin-orders/ui/__tests__/AdminOrdersPage.test.tsx @@ -28,13 +28,14 @@ function renderPage() { ) } -type AdminOrderListItemWithApproval = AdminOrderListItem & { deliveryFeeLocked?: boolean } +type AdminOrderListItemWithApproval = AdminOrderListItem function createOrder(overrides?: Partial): AdminOrderListItemWithApproval { return { id: 'order-12345678', status: 'PENDING_PAYMENT', deliveryType: 'delivery' as const, + deliveryFeeLocked: true, deliveryCarrier: null, paymentMethod: 'online' as const, totalCents: 10000, @@ -100,11 +101,11 @@ describe('AdminOrdersPage', () => { expect(screen.queryByText('Цена не подтверждена')).not.toBeInTheDocument() }) - it('не показывает бейдж при отсутствии deliveryFeeLocked', async () => { + it('не показывает бейдж при deliveryFeeLocked=true', async () => { mockOrdersResponse( createOrder({ id: 'order-11223344', - deliveryFeeLocked: undefined, + deliveryFeeLocked: true, }), )