({
useParams: jest.fn(),
}));
-describe.skip('Order View page, initial load', () => {
+describe('Страница просмотра заказа', () => {
beforeAll(() => server.listen());
afterEach(() => server.resetHandlers());
afterAll(() => server.close());
- test('shows order details loading', () => {
+ test('отображает индикатор загрузки деталей заказа', () => {
(useParams as jest.Mock).mockReturnValue({ orderId: 'id1' });
const { container } = render(
@@ -33,7 +33,7 @@ describe.skip('Order View page, initial load', () => {
expect(container).toMatchSnapshot();
});
- test('shows order details', async () => {
+ test('отображает детали заказа после успешной загрузки', async () => {
(useParams as jest.Mock).mockReturnValue({ orderId: 'id1' });
const { container } = render(
@@ -52,7 +52,7 @@ describe.skip('Order View page, initial load', () => {
expect(container).toMatchSnapshot();
});
- test('shows order error', async () => {
+ test('отображает ошибку при некорректном ID заказа', async () => {
(useParams as jest.Mock).mockReturnValue({ orderId: null });
const { container } = render(
--
2.45.2
From f2db3774c943314afa4f30b53e4f9c3717754bed Mon Sep 17 00:00:00 2001
From: Primakov Alexandr Alexandrovich
Date: Thu, 20 Feb 2025 14:10:46 +0300
Subject: [PATCH 11/17] other 2
---
src/pages/__tests__/ordersEmpty.test.tsx | 6 +---
src/pages/__tests__/ordersError.test.tsx | 38 ++++++++++++++++++++++--
2 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/src/pages/__tests__/ordersEmpty.test.tsx b/src/pages/__tests__/ordersEmpty.test.tsx
index 115fc20..3c65469 100644
--- a/src/pages/__tests__/ordersEmpty.test.tsx
+++ b/src/pages/__tests__/ordersEmpty.test.tsx
@@ -40,16 +40,12 @@ jest.mock('@brojs/cli', () => {
};
});
-describe.skip('order page', () => {
+describe('order page', () => {
beforeAll(() => server.listen());
afterEach(() => server.resetHandlers());
afterAll(() => server.close());
it('получение пустого списка', async () => {
- server.events.on('request:start', ({ request }) => {
- console.log('Outgoing:', request.method, request.url);
- });
-
render(
diff --git a/src/pages/__tests__/ordersError.test.tsx b/src/pages/__tests__/ordersError.test.tsx
index 4e18b32..ab71a50 100644
--- a/src/pages/__tests__/ordersError.test.tsx
+++ b/src/pages/__tests__/ordersError.test.tsx
@@ -21,9 +21,43 @@ import Page from '../arm';
import { PageSpinner } from '../../components';
const server = setupServer(
- http.get('/api/arm/orders', () => {
+ http.post('/api/arm/orders', () => {
return HttpResponse.json({}, { status: 500 });
}),
+ http.get('/api/arm/masters', () => {
+ return HttpResponse.json({
+ success: true,
+ body: [
+ {
+ id: '4545423234',
+ name: 'Иван Иванов',
+ phone: '+7 900 123 45 67',
+ },
+ {
+ name: 'Олег Макаров',
+ phone: '79001234567',
+ id: '23423442',
+ },
+ {
+ id: '345354234',
+ name: 'Иван Галкин',
+ schedule: [
+ {
+ id: 'order1',
+ startWashTime: '2024-11-24T10:30:00.000Z',
+ endWashTime: '2024-11-24T16:30:00.000Z',
+ },
+ {
+ id: 'order2',
+ startWashTime: '2024-11-24T11:30:00.000Z',
+ endWashTime: '2024-11-24T17:30:00.000Z',
+ },
+ ],
+ phone: '+7 900 123 45 67',
+ },
+ ],
+ });
+ }),
);
jest.mock('@brojs/cli', () => {
@@ -33,7 +67,7 @@ jest.mock('@brojs/cli', () => {
};
});
-describe.skip('order page', () => {
+describe('order page', () => {
beforeAll(() => server.listen());
afterEach(() => server.resetHandlers());
afterAll(() => server.close());
--
2.45.2
From 7fe62e7d6e16c55b471018761719cc32216b1d48 Mon Sep 17 00:00:00 2001
From: Primakov Alexandr Alexandrovich
Date: Thu, 20 Feb 2025 14:15:25 +0300
Subject: [PATCH 12/17] run last one
---
src/pages/__tests__/order-create.test.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pages/__tests__/order-create.test.tsx b/src/pages/__tests__/order-create.test.tsx
index 14a68a6..df2dc9d 100644
--- a/src/pages/__tests__/order-create.test.tsx
+++ b/src/pages/__tests__/order-create.test.tsx
@@ -4,7 +4,7 @@ import React from 'react';
import { AppContext } from '../../../__mocks__/app-context-mock';
import Page from '../order-create';
-describe.skip('Create Order page', () => {
+describe('Create Order page', () => {
test('renders page structure', () => {
const { container } = render(
--
2.45.2
From 9e024af568470baa39c2dbe875e56603684e5cfd Mon Sep 17 00:00:00 2001
From: RustamRu
Date: Sun, 23 Feb 2025 11:58:56 +0300
Subject: [PATCH 13/17] fix: getOrder test (#88)
---
src/__data__/service/utils.ts | 1 +
.../__snapshots__/order-view.test.tsx.snap | 53 ++++++++++++++++++-
.../__snapshots__/ordersList.test.tsx.snap | 2 +-
src/pages/order-view/index.tsx | 5 +-
4 files changed, 56 insertions(+), 5 deletions(-)
diff --git a/src/__data__/service/utils.ts b/src/__data__/service/utils.ts
index f7c296b..f55bb9c 100644
--- a/src/__data__/service/utils.ts
+++ b/src/__data__/service/utils.ts
@@ -13,6 +13,7 @@ export const extractErrorMessageFromResponse = ({
}: FetchBaseQueryError) => {
if (
typeof data === 'object' &&
+ data !== null &&
'error' in data &&
typeof data.error === 'string'
) {
diff --git a/src/pages/__tests__/__snapshots__/order-view.test.tsx.snap b/src/pages/__tests__/__snapshots__/order-view.test.tsx.snap
index fabd24b..72a1240 100644
--- a/src/pages/__tests__/__snapshots__/order-view.test.tsx.snap
+++ b/src/pages/__tests__/__snapshots__/order-view.test.tsx.snap
@@ -16,7 +16,6 @@ exports[`Страница просмотра заказа отображает
Заказ №{{number}}
+ (
+ Sunday, January 19, 2025 5:04 PM
+ )
С вами свяжется оператор насчет оплаты по указанному номеру телефона
+