add .pre-commit-config.yaml Поправил проблемы
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
import asyncio
|
||||
from typing import AsyncGenerator, Dict, Generator
|
||||
from typing import AsyncGenerator, Generator
|
||||
|
||||
import pytest
|
||||
import pytest_asyncio
|
||||
@@ -20,7 +20,7 @@ async_session_maker = async_sessionmaker(
|
||||
)
|
||||
|
||||
|
||||
@pytest.fixture(scope="session", autouse=True)
|
||||
@pytest.fixture(scope='session', autouse=True)
|
||||
def event_loop():
|
||||
try:
|
||||
loop = asyncio.get_event_loop()
|
||||
@@ -30,7 +30,7 @@ def event_loop():
|
||||
loop.close()
|
||||
|
||||
|
||||
@pytest_asyncio.fixture(scope="session", autouse=True)
|
||||
@pytest_asyncio.fixture(scope='session', autouse=True)
|
||||
async def db_init(event_loop):
|
||||
async with async_engine.begin() as conn:
|
||||
await conn.run_sync(Base.metadata.drop_all)
|
||||
@@ -45,7 +45,7 @@ async def get_test_session() -> AsyncGenerator[AsyncSession, None]:
|
||||
yield session
|
||||
|
||||
|
||||
@pytest.fixture(scope="session")
|
||||
@pytest.fixture(scope='session')
|
||||
def app(event_loop) -> Generator[FastAPI, None, None]:
|
||||
app: FastAPI = create_app()
|
||||
app.dependency_overrides[get_async_session] = get_test_session
|
||||
@@ -56,11 +56,11 @@ def app(event_loop) -> Generator[FastAPI, None, None]:
|
||||
async def client(app) -> AsyncGenerator[AsyncClient, None]:
|
||||
async with AsyncClient(
|
||||
app=app,
|
||||
base_url="http://localhost:8000/api/v1/menus",
|
||||
base_url='http://localhost:8000/api/v1/menus',
|
||||
) as async_client:
|
||||
yield async_client
|
||||
|
||||
|
||||
@pytest.fixture(scope="session")
|
||||
def session_data() -> Dict:
|
||||
@pytest.fixture(scope='session')
|
||||
def session_data() -> dict:
|
||||
return {}
|
||||
|
@@ -1,31 +1,29 @@
|
||||
from typing import Tuple
|
||||
|
||||
from httpx import AsyncClient, Response
|
||||
|
||||
|
||||
class Repository:
|
||||
class Menu:
|
||||
@staticmethod
|
||||
async def read_all(ac: AsyncClient) -> Tuple[int, dict]:
|
||||
async def read_all(ac: AsyncClient) -> tuple[int, dict]:
|
||||
"""чтение всех меню"""
|
||||
|
||||
response: Response = await ac.get("/")
|
||||
response: Response = await ac.get('/')
|
||||
return response.status_code, response.json()
|
||||
|
||||
@staticmethod
|
||||
async def get(ac: AsyncClient, data: dict) -> Tuple[int, dict]:
|
||||
async def get(ac: AsyncClient, data: dict) -> tuple[int, dict]:
|
||||
"""Получение меню по id"""
|
||||
response: Response = await ac.get(f"/{data.get('id')}")
|
||||
return response.status_code, response.json()
|
||||
|
||||
@staticmethod
|
||||
async def write(ac: AsyncClient, data: dict) -> Tuple[int, dict]:
|
||||
async def write(ac: AsyncClient, data: dict) -> tuple[int, dict]:
|
||||
"""создания меню"""
|
||||
response: Response = await ac.post("/", json=data)
|
||||
response: Response = await ac.post('/', json=data)
|
||||
return response.status_code, response.json()
|
||||
|
||||
@staticmethod
|
||||
async def update(ac: AsyncClient, data: dict) -> Tuple[int, dict]:
|
||||
async def update(ac: AsyncClient, data: dict) -> tuple[int, dict]:
|
||||
"""Обновление меню по id"""
|
||||
response: Response = await ac.patch(
|
||||
f"/{data.get('id')}",
|
||||
@@ -41,7 +39,7 @@ class Repository:
|
||||
|
||||
class Submenu:
|
||||
@staticmethod
|
||||
async def read_all(ac: AsyncClient, menu: dict) -> Tuple[int, dict]:
|
||||
async def read_all(ac: AsyncClient, menu: dict) -> tuple[int, dict]:
|
||||
"""чтение всех меню"""
|
||||
response: Response = await ac.get(f"/{menu.get('id')}/submenus/")
|
||||
return response.status_code, response.json()
|
||||
@@ -51,7 +49,7 @@ class Repository:
|
||||
ac: AsyncClient,
|
||||
menu: dict,
|
||||
submenu: dict,
|
||||
) -> Tuple[int, dict]:
|
||||
) -> tuple[int, dict]:
|
||||
"""Получение меню по id"""
|
||||
response: Response = await ac.get(
|
||||
f"/{menu.get('id')}/submenus/{submenu.get('id')}",
|
||||
@@ -63,7 +61,7 @@ class Repository:
|
||||
ac: AsyncClient,
|
||||
menu: dict,
|
||||
submenu: dict,
|
||||
) -> Tuple[int, dict]:
|
||||
) -> tuple[int, dict]:
|
||||
"""создания меню"""
|
||||
response: Response = await ac.post(
|
||||
f"/{menu.get('id')}/submenus/",
|
||||
@@ -74,7 +72,7 @@ class Repository:
|
||||
@staticmethod
|
||||
async def update(
|
||||
ac: AsyncClient, menu: dict, submenu: dict
|
||||
) -> Tuple[int, dict]:
|
||||
) -> tuple[int, dict]:
|
||||
"""Обновление меню по id"""
|
||||
response: Response = await ac.patch(
|
||||
f"/{menu.get('id')}/submenus/{submenu.get('id')}",
|
||||
@@ -94,7 +92,7 @@ class Repository:
|
||||
@staticmethod
|
||||
async def read_all(
|
||||
ac: AsyncClient, menu: dict, submenu: dict
|
||||
) -> Tuple[int, dict]:
|
||||
) -> tuple[int, dict]:
|
||||
"""чтение всех блюд"""
|
||||
response: Response = await ac.get(
|
||||
f"/{menu.get('id')}/submenus/{submenu.get('id')}/dishes/",
|
||||
@@ -104,7 +102,7 @@ class Repository:
|
||||
@staticmethod
|
||||
async def get(
|
||||
ac: AsyncClient, menu: dict, submenu: dict, dish: dict
|
||||
) -> Tuple[int, dict]:
|
||||
) -> tuple[int, dict]:
|
||||
"""Получение блюда по id"""
|
||||
response: Response = await ac.get(
|
||||
f"/{menu.get('id')}/submenus/{submenu.get('id')}"
|
||||
@@ -115,7 +113,7 @@ class Repository:
|
||||
@staticmethod
|
||||
async def write(
|
||||
ac: AsyncClient, menu: dict, submenu: dict, dish: dict
|
||||
) -> Tuple[int, dict]:
|
||||
) -> tuple[int, dict]:
|
||||
"""создания блюда"""
|
||||
response: Response = await ac.post(
|
||||
f"/{menu.get('id')}/submenus/{submenu.get('id')}/dishes/",
|
||||
@@ -126,7 +124,7 @@ class Repository:
|
||||
@staticmethod
|
||||
async def update(
|
||||
ac: AsyncClient, menu: dict, submenu: dict, dish: dict
|
||||
) -> Tuple[int, dict]:
|
||||
) -> tuple[int, dict]:
|
||||
"""Обновление блюда по id"""
|
||||
response: Response = await ac.patch(
|
||||
f"/{menu.get('id')}/submenus/{submenu.get('id')}"
|
||||
|
@@ -15,52 +15,52 @@ async def test_menu_crud_empty(client: AsyncClient) -> None:
|
||||
@pytest.mark.asyncio
|
||||
async def test_menu_crud_add(client: AsyncClient) -> None:
|
||||
"""Тестирование функций меню"""
|
||||
data = {"title": "Menu", "description": None}
|
||||
data = {'title': 'Menu', 'description': None}
|
||||
code, rspn = await Repo.Menu.write(client, data)
|
||||
assert code == 201
|
||||
assert rspn["title"] == "Menu"
|
||||
assert rspn["description"] is None
|
||||
assert rspn['title'] == 'Menu'
|
||||
assert rspn['description'] is None
|
||||
await Repo.Menu.delete(client, rspn)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_menu_crud_get(client: AsyncClient) -> None:
|
||||
"""Тестирование функций меню"""
|
||||
data = {"title": "Menu", "description": None}
|
||||
data = {'title': 'Menu', 'description': None}
|
||||
code, rspn = await Repo.Menu.write(client, data)
|
||||
code, menu = await Repo.Menu.get(client, {"id": rspn.get("id")})
|
||||
code, menu = await Repo.Menu.get(client, {'id': rspn.get('id')})
|
||||
assert code == 200
|
||||
assert menu["title"] == rspn["title"]
|
||||
assert menu['title'] == rspn['title']
|
||||
await Repo.Menu.delete(client, menu)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_menu_crud_update(client: AsyncClient) -> None:
|
||||
"""Тестирование функций меню"""
|
||||
data = {"title": "Menu", "description": None}
|
||||
data = {'title': 'Menu', 'description': None}
|
||||
code, rspn = await Repo.Menu.write(client, data)
|
||||
|
||||
upd_data = {
|
||||
"id": rspn.get("id"),
|
||||
"title": "upd Menu",
|
||||
"description": "",
|
||||
'id': rspn.get('id'),
|
||||
'title': 'upd Menu',
|
||||
'description': '',
|
||||
}
|
||||
code, upd_rspn = await Repo.Menu.update(client, upd_data)
|
||||
assert code == 200
|
||||
assert upd_rspn["title"] == "upd Menu"
|
||||
assert upd_rspn['title'] == 'upd Menu'
|
||||
await Repo.Menu.delete(client, upd_rspn)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_menu_crud_delete(client: AsyncClient) -> None:
|
||||
"""Тестирование функций меню"""
|
||||
data = {"title": "Menu", "description": None}
|
||||
data = {'title': 'Menu', 'description': None}
|
||||
code, rspn = await Repo.Menu.write(client, data)
|
||||
|
||||
code = await Repo.Menu.delete(client, rspn)
|
||||
assert code == 200
|
||||
|
||||
code, rspn = await Repo.Menu.get(client, {"id": rspn.get("id")})
|
||||
code, rspn = await Repo.Menu.get(client, {'id': rspn.get('id')})
|
||||
assert code == 404
|
||||
|
||||
|
||||
@@ -71,7 +71,7 @@ async def test_menu_crud_get_all(client: AsyncClient) -> None:
|
||||
assert code == 200
|
||||
assert rspn == []
|
||||
|
||||
data = {"title": "Menu", "description": None}
|
||||
data = {'title': 'Menu', 'description': None}
|
||||
code, rspn = await Repo.Menu.write(client, data)
|
||||
|
||||
code, upd_rspn = await Repo.Menu.read_all(client)
|
||||
@@ -83,7 +83,7 @@ async def test_menu_crud_get_all(client: AsyncClient) -> None:
|
||||
@pytest.mark.asyncio
|
||||
async def test_submenus_get_all(client) -> None:
|
||||
# Создаем меню и проверяем ответ
|
||||
menu = {"title": "Menu", "description": "main menu"}
|
||||
menu = {'title': 'Menu', 'description': 'main menu'}
|
||||
code, rspn = await Repo.Menu.write(client, menu)
|
||||
assert code == 201
|
||||
menu.update(rspn)
|
||||
@@ -95,9 +95,9 @@ async def test_submenus_get_all(client) -> None:
|
||||
|
||||
# Создаем и проверяем подменю
|
||||
submenu = {
|
||||
"title": "Submenu",
|
||||
"description": "submenu",
|
||||
"parent_menu": menu["id"],
|
||||
'title': 'Submenu',
|
||||
'description': 'submenu',
|
||||
'parent_menu': menu['id'],
|
||||
}
|
||||
code, rspn = await Repo.Submenu.write(client, menu, submenu)
|
||||
submenu.update(rspn)
|
||||
@@ -115,15 +115,15 @@ async def test_submenus_get_all(client) -> None:
|
||||
@pytest.mark.asyncio
|
||||
async def test_submenus_add(client) -> None:
|
||||
# Создаем меню и проверяем ответ
|
||||
menu = {"title": "Menu", "description": "main menu"}
|
||||
menu = {'title': 'Menu', 'description': 'main menu'}
|
||||
code, rspn = await Repo.Menu.write(client, menu)
|
||||
menu.update(rspn)
|
||||
|
||||
# Создаем и проверяем подменю
|
||||
submenu = {
|
||||
"title": "Submenu",
|
||||
"description": "submenu",
|
||||
"parent_menu": menu["id"],
|
||||
'title': 'Submenu',
|
||||
'description': 'submenu',
|
||||
'parent_menu': menu['id'],
|
||||
}
|
||||
code, rspn = await Repo.Submenu.write(client, menu, submenu)
|
||||
assert code == 201
|
||||
@@ -137,24 +137,24 @@ async def test_submenus_add(client) -> None:
|
||||
@pytest.mark.asyncio
|
||||
async def test_submenus_update(client) -> None:
|
||||
# Создаем меню и проверяем ответ
|
||||
menu = {"title": "Menu", "description": "main menu"}
|
||||
menu = {'title': 'Menu', 'description': 'main menu'}
|
||||
code, rspn = await Repo.Menu.write(client, menu)
|
||||
menu.update(rspn)
|
||||
|
||||
# Создаем и проверяем подменю
|
||||
submenu = {
|
||||
"title": "Submenu",
|
||||
"description": "submenu",
|
||||
"parent_menu": menu["id"],
|
||||
'title': 'Submenu',
|
||||
'description': 'submenu',
|
||||
'parent_menu': menu['id'],
|
||||
}
|
||||
code, rspn = await Repo.Submenu.write(client, menu, submenu)
|
||||
submenu.update(rspn)
|
||||
|
||||
# Обновляем подменю и проверяем
|
||||
submenu["title"] = "updated_submenu"
|
||||
submenu['title'] = 'updated_submenu'
|
||||
code, rspn = await Repo.Submenu.update(client, menu, submenu)
|
||||
assert code == 200
|
||||
assert submenu["title"] == rspn["title"]
|
||||
assert submenu['title'] == rspn['title']
|
||||
submenu.update(rspn)
|
||||
|
||||
# удаляем сопутствующее
|
||||
@@ -165,15 +165,15 @@ async def test_submenus_update(client) -> None:
|
||||
@pytest.mark.asyncio
|
||||
async def test_submenus_delete(client) -> None:
|
||||
# Создаем меню и проверяем ответ
|
||||
menu = {"title": "Menu", "description": "main menu"}
|
||||
menu = {'title': 'Menu', 'description': 'main menu'}
|
||||
code, rspn = await Repo.Menu.write(client, menu)
|
||||
menu.update(rspn)
|
||||
|
||||
# Создаем и проверяем подменю
|
||||
submenu = {
|
||||
"title": "Submenu",
|
||||
"description": "submenu",
|
||||
"parent_menu": menu["id"],
|
||||
'title': 'Submenu',
|
||||
'description': 'submenu',
|
||||
'parent_menu': menu['id'],
|
||||
}
|
||||
code, rspn = await Repo.Submenu.write(client, menu, submenu)
|
||||
submenu.update(rspn)
|
||||
@@ -194,17 +194,17 @@ async def test_submenus_delete(client) -> None:
|
||||
async def test_dishes_get_all(client: AsyncClient) -> None:
|
||||
# Создаем меню и проверяем ответ
|
||||
menu = {
|
||||
"title": "Menu",
|
||||
"description": "main menu",
|
||||
'title': 'Menu',
|
||||
'description': 'main menu',
|
||||
}
|
||||
code, rspn = await Repo.Menu.write(client, menu)
|
||||
menu.update(rspn)
|
||||
|
||||
# Создаем и проверяем подменю
|
||||
submenu = {
|
||||
"title": "Submenu",
|
||||
"description": "submenu",
|
||||
"parent_menu": menu["id"],
|
||||
'title': 'Submenu',
|
||||
'description': 'submenu',
|
||||
'parent_menu': menu['id'],
|
||||
}
|
||||
code, rspn = await Repo.Submenu.write(client, menu, submenu)
|
||||
submenu.update(rspn)
|
||||
@@ -216,10 +216,10 @@ async def test_dishes_get_all(client: AsyncClient) -> None:
|
||||
|
||||
# Добавляем блюдо
|
||||
dish = {
|
||||
"title": "dish",
|
||||
"description": "some dish",
|
||||
"price": "12.5",
|
||||
"parent_submenu": submenu["id"],
|
||||
'title': 'dish',
|
||||
'description': 'some dish',
|
||||
'price': '12.5',
|
||||
'parent_submenu': submenu['id'],
|
||||
}
|
||||
code, rspn = await Repo.Dish.write(client, menu, submenu, dish)
|
||||
assert code == 201
|
||||
@@ -239,27 +239,27 @@ async def test_dishes_get_all(client: AsyncClient) -> None:
|
||||
async def test_dishes_add(client: AsyncClient) -> None:
|
||||
# Создаем меню и проверяем ответ
|
||||
menu = {
|
||||
"title": "Menu",
|
||||
"description": "main menu",
|
||||
'title': 'Menu',
|
||||
'description': 'main menu',
|
||||
}
|
||||
code, rspn = await Repo.Menu.write(client, menu)
|
||||
menu.update(rspn)
|
||||
|
||||
# Создаем и проверяем подменю
|
||||
submenu = {
|
||||
"title": "Submenu",
|
||||
"description": "submenu",
|
||||
"parent_menu": menu["id"],
|
||||
'title': 'Submenu',
|
||||
'description': 'submenu',
|
||||
'parent_menu': menu['id'],
|
||||
}
|
||||
code, rspn = await Repo.Submenu.write(client, menu, submenu)
|
||||
submenu.update(rspn)
|
||||
|
||||
# Добавляем блюдо
|
||||
dish = {
|
||||
"title": "dish",
|
||||
"description": "some dish",
|
||||
"price": "12.5",
|
||||
"parent_submenu": submenu["id"],
|
||||
'title': 'dish',
|
||||
'description': 'some dish',
|
||||
'price': '12.5',
|
||||
'parent_submenu': submenu['id'],
|
||||
}
|
||||
code, rspn = await Repo.Dish.write(client, menu, submenu, dish)
|
||||
assert code == 201
|
||||
@@ -268,7 +268,7 @@ async def test_dishes_add(client: AsyncClient) -> None:
|
||||
# Получаем блюдо
|
||||
code, rspn = await Repo.Dish.get(client, menu, submenu, dish)
|
||||
assert code == 200
|
||||
assert rspn["title"] == dish["title"]
|
||||
assert rspn['title'] == dish['title']
|
||||
|
||||
# удаляем сопутствующее
|
||||
await Repo.Dish.delete(client, menu, submenu, dish)
|
||||
@@ -280,36 +280,36 @@ async def test_dishes_add(client: AsyncClient) -> None:
|
||||
async def test_dishes_update(client: AsyncClient) -> None:
|
||||
# Создаем меню и проверяем ответ
|
||||
menu = {
|
||||
"title": "Menu",
|
||||
"description": "main menu",
|
||||
'title': 'Menu',
|
||||
'description': 'main menu',
|
||||
}
|
||||
code, rspn = await Repo.Menu.write(client, menu)
|
||||
menu.update(rspn)
|
||||
|
||||
# Создаем и проверяем подменю
|
||||
submenu = {
|
||||
"title": "Submenu",
|
||||
"description": "submenu",
|
||||
"parent_menu": menu["id"],
|
||||
'title': 'Submenu',
|
||||
'description': 'submenu',
|
||||
'parent_menu': menu['id'],
|
||||
}
|
||||
code, rspn = await Repo.Submenu.write(client, menu, submenu)
|
||||
submenu.update(rspn)
|
||||
|
||||
# Добавляем блюдо
|
||||
dish = {
|
||||
"title": "dish",
|
||||
"description": "some dish",
|
||||
"price": "12.5",
|
||||
"parent_submenu": submenu["id"],
|
||||
'title': 'dish',
|
||||
'description': 'some dish',
|
||||
'price': '12.5',
|
||||
'parent_submenu': submenu['id'],
|
||||
}
|
||||
code, rspn = await Repo.Dish.write(client, menu, submenu, dish)
|
||||
dish.update(rspn)
|
||||
|
||||
# Обновляем блюдо и проверяем
|
||||
dish["title"] = "updated_dish"
|
||||
dish['title'] = 'updated_dish'
|
||||
code, rspn = await Repo.Dish.update(client, menu, submenu, dish)
|
||||
assert code == 200
|
||||
assert dish["title"] == rspn["title"]
|
||||
assert dish['title'] == rspn['title']
|
||||
dish.update(rspn)
|
||||
|
||||
# удаляем сопутствующее
|
||||
@@ -322,27 +322,27 @@ async def test_dishes_update(client: AsyncClient) -> None:
|
||||
async def test_dishes_delete(client: AsyncClient) -> None:
|
||||
# Создаем меню и проверяем ответ
|
||||
menu = {
|
||||
"title": "Menu",
|
||||
"description": "main menu",
|
||||
'title': 'Menu',
|
||||
'description': 'main menu',
|
||||
}
|
||||
code, rspn = await Repo.Menu.write(client, menu)
|
||||
menu.update(rspn)
|
||||
|
||||
# Создаем и проверяем подменю
|
||||
submenu = {
|
||||
"title": "Submenu",
|
||||
"description": "submenu",
|
||||
"parent_menu": menu["id"],
|
||||
'title': 'Submenu',
|
||||
'description': 'submenu',
|
||||
'parent_menu': menu['id'],
|
||||
}
|
||||
code, rspn = await Repo.Submenu.write(client, menu, submenu)
|
||||
submenu.update(rspn)
|
||||
|
||||
# Добавляем блюдо
|
||||
dish = {
|
||||
"title": "dish",
|
||||
"description": "some dish",
|
||||
"price": "12.5",
|
||||
"parent_submenu": submenu["id"],
|
||||
'title': 'dish',
|
||||
'description': 'some dish',
|
||||
'price': '12.5',
|
||||
'parent_submenu': submenu['id'],
|
||||
}
|
||||
code, rspn = await Repo.Dish.write(client, menu, submenu, dish)
|
||||
dish.update(rspn)
|
||||
|
@@ -1,5 +1,3 @@
|
||||
from typing import Dict
|
||||
|
||||
import pytest
|
||||
from httpx import AsyncClient
|
||||
|
||||
@@ -7,160 +5,160 @@ from .repository import Repository as Repo
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_01(client: AsyncClient, session_data: Dict):
|
||||
async def test_01(client: AsyncClient, session_data: dict):
|
||||
"""Проверяет создание меню"""
|
||||
menu = {"title": "Menu", "description": "some_menu_desc"}
|
||||
menu = {'title': 'Menu', 'description': 'some_menu_desc'}
|
||||
code, rspn = await Repo.Menu.write(client, menu)
|
||||
|
||||
assert code == 201
|
||||
code, rspn = await Repo.Menu.get(client, rspn)
|
||||
session_data["target_menu_id"] = rspn.get("id")
|
||||
session_data["target_menu_title"] = rspn.get("title")
|
||||
session_data["target_menu_description"] = rspn.get("description")
|
||||
session_data['target_menu_id'] = rspn.get('id')
|
||||
session_data['target_menu_title'] = rspn.get('title')
|
||||
session_data['target_menu_description'] = rspn.get('description')
|
||||
|
||||
assert code == 200
|
||||
assert "id" in rspn
|
||||
assert "title" in rspn
|
||||
assert "description" in rspn
|
||||
assert "submenus_count" in rspn
|
||||
assert "dishes_count" in rspn
|
||||
assert rspn["title"] == menu.get("title")
|
||||
assert rspn.get("description") == menu.get("description")
|
||||
assert 'id' in rspn
|
||||
assert 'title' in rspn
|
||||
assert 'description' in rspn
|
||||
assert 'submenus_count' in rspn
|
||||
assert 'dishes_count' in rspn
|
||||
assert rspn['title'] == menu.get('title')
|
||||
assert rspn.get('description') == menu.get('description')
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_02(client: AsyncClient, session_data: Dict):
|
||||
submenu = {"title": "Submenu", "description": "submenu_descr"}
|
||||
async def test_02(client: AsyncClient, session_data: dict):
|
||||
submenu = {'title': 'Submenu', 'description': 'submenu_descr'}
|
||||
menu = {
|
||||
"id": session_data.get("target_menu_id"),
|
||||
"title": session_data.get("target_menu_title"),
|
||||
"description": session_data.get("target_menu_description"),
|
||||
'id': session_data.get('target_menu_id'),
|
||||
'title': session_data.get('target_menu_title'),
|
||||
'description': session_data.get('target_menu_description'),
|
||||
}
|
||||
|
||||
code, rspn = await Repo.Submenu.write(client, menu, submenu)
|
||||
|
||||
assert code == 201
|
||||
assert "id" in rspn
|
||||
assert "title" in rspn
|
||||
assert "description" in rspn
|
||||
assert "dishes_count" in rspn
|
||||
assert rspn["title"] == submenu.get("title")
|
||||
assert rspn.get("description") == submenu.get("description")
|
||||
assert 'id' in rspn
|
||||
assert 'title' in rspn
|
||||
assert 'description' in rspn
|
||||
assert 'dishes_count' in rspn
|
||||
assert rspn['title'] == submenu.get('title')
|
||||
assert rspn.get('description') == submenu.get('description')
|
||||
|
||||
session_data["target_submenu_id"] = rspn.get("id")
|
||||
session_data["target_submenu_title"] = rspn.get("title")
|
||||
session_data["target_submenu_description"] = rspn.get("description")
|
||||
session_data['target_submenu_id'] = rspn.get('id')
|
||||
session_data['target_submenu_title'] = rspn.get('title')
|
||||
session_data['target_submenu_description'] = rspn.get('description')
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_03_dish1(client: AsyncClient, session_data: Dict):
|
||||
async def test_03_dish1(client: AsyncClient, session_data: dict):
|
||||
menu = {
|
||||
"id": session_data.get("target_menu_id"),
|
||||
"title": session_data.get("target_menu_title"),
|
||||
"description": session_data.get("target_menu_description"),
|
||||
'id': session_data.get('target_menu_id'),
|
||||
'title': session_data.get('target_menu_title'),
|
||||
'description': session_data.get('target_menu_description'),
|
||||
}
|
||||
submenu = {
|
||||
"id": session_data.get("target_submenu_id"),
|
||||
"title": session_data.get("target_submenu_title"),
|
||||
"description": session_data.get("target_submenu_description"),
|
||||
'id': session_data.get('target_submenu_id'),
|
||||
'title': session_data.get('target_submenu_title'),
|
||||
'description': session_data.get('target_submenu_description'),
|
||||
}
|
||||
dish = {"title": "dish_1", "description": "dish 1 descr", "price": "12.5"}
|
||||
dish = {'title': 'dish_1', 'description': 'dish 1 descr', 'price': '12.5'}
|
||||
code, rspn = await Repo.Dish.write(client, menu, submenu, dish)
|
||||
|
||||
assert code == 201
|
||||
assert "id" in rspn
|
||||
assert "title" in rspn
|
||||
assert "description" in rspn
|
||||
assert "price" in rspn
|
||||
assert rspn["title"] == dish.get("title")
|
||||
assert rspn.get("description") == dish.get("description")
|
||||
assert rspn.get("price") == dish.get("price")
|
||||
assert 'id' in rspn
|
||||
assert 'title' in rspn
|
||||
assert 'description' in rspn
|
||||
assert 'price' in rspn
|
||||
assert rspn['title'] == dish.get('title')
|
||||
assert rspn.get('description') == dish.get('description')
|
||||
assert rspn.get('price') == dish.get('price')
|
||||
|
||||
session_data["target_dish_id"] = rspn.get("id")
|
||||
session_data["target_dish_title"] = rspn.get("title")
|
||||
session_data["target_dish_description"] = rspn.get("description")
|
||||
session_data["target_dish_price"] = rspn.get("price")
|
||||
session_data['target_dish_id'] = rspn.get('id')
|
||||
session_data['target_dish_title'] = rspn.get('title')
|
||||
session_data['target_dish_description'] = rspn.get('description')
|
||||
session_data['target_dish_price'] = rspn.get('price')
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_04_dish2(client: AsyncClient, session_data: Dict):
|
||||
async def test_04_dish2(client: AsyncClient, session_data: dict):
|
||||
menu = {
|
||||
"id": session_data.get("target_menu_id"),
|
||||
"title": session_data.get("target_menu_title"),
|
||||
"description": session_data.get("target_menu_description"),
|
||||
'id': session_data.get('target_menu_id'),
|
||||
'title': session_data.get('target_menu_title'),
|
||||
'description': session_data.get('target_menu_description'),
|
||||
}
|
||||
submenu = {
|
||||
"id": session_data.get("target_submenu_id"),
|
||||
"title": session_data.get("target_submenu_title"),
|
||||
"description": session_data.get("target_submenu_description"),
|
||||
'id': session_data.get('target_submenu_id'),
|
||||
'title': session_data.get('target_submenu_title'),
|
||||
'description': session_data.get('target_submenu_description'),
|
||||
}
|
||||
dish = {"title": "dish_2", "description": "dish 2 descr", "price": "13.5"}
|
||||
dish = {'title': 'dish_2', 'description': 'dish 2 descr', 'price': '13.5'}
|
||||
code, rspn = await Repo.Dish.write(client, menu, submenu, dish)
|
||||
|
||||
assert code == 201
|
||||
assert "id" in rspn
|
||||
assert "title" in rspn
|
||||
assert "description" in rspn
|
||||
assert "price" in rspn
|
||||
assert rspn["title"] == dish.get("title")
|
||||
assert rspn.get("description") == dish.get("description")
|
||||
assert rspn.get("price") == dish.get("price")
|
||||
assert 'id' in rspn
|
||||
assert 'title' in rspn
|
||||
assert 'description' in rspn
|
||||
assert 'price' in rspn
|
||||
assert rspn['title'] == dish.get('title')
|
||||
assert rspn.get('description') == dish.get('description')
|
||||
assert rspn.get('price') == dish.get('price')
|
||||
|
||||
session_data["target_dish1_id"] = rspn.get("id")
|
||||
session_data["target_dish1_title"] = rspn.get("title")
|
||||
session_data["target_dish1_description"] = rspn.get("description")
|
||||
session_data["target_dish1_price"] = rspn.get("price")
|
||||
session_data['target_dish1_id'] = rspn.get('id')
|
||||
session_data['target_dish1_title'] = rspn.get('title')
|
||||
session_data['target_dish1_description'] = rspn.get('description')
|
||||
session_data['target_dish1_price'] = rspn.get('price')
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_05_check_menu(client: AsyncClient, session_data: Dict):
|
||||
async def test_05_check_menu(client: AsyncClient, session_data: dict):
|
||||
menu = {
|
||||
"id": session_data.get("target_menu_id"),
|
||||
"title": session_data.get("target_menu_title"),
|
||||
"description": session_data.get("target_menu_description"),
|
||||
'id': session_data.get('target_menu_id'),
|
||||
'title': session_data.get('target_menu_title'),
|
||||
'description': session_data.get('target_menu_description'),
|
||||
}
|
||||
code, rspn = await Repo.Menu.get(client, menu)
|
||||
|
||||
assert code == 200
|
||||
assert "id" in rspn
|
||||
assert "title" in rspn
|
||||
assert "description" in rspn
|
||||
assert rspn.get("submenus_count") == 1
|
||||
assert rspn.get("dishes_count") == 2
|
||||
assert 'id' in rspn
|
||||
assert 'title' in rspn
|
||||
assert 'description' in rspn
|
||||
assert rspn.get('submenus_count') == 1
|
||||
assert rspn.get('dishes_count') == 2
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_06_check_submenu(client: AsyncClient, session_data: Dict):
|
||||
async def test_06_check_submenu(client: AsyncClient, session_data: dict):
|
||||
menu = {
|
||||
"id": session_data.get("target_menu_id"),
|
||||
"title": session_data.get("target_menu_title"),
|
||||
"description": session_data.get("target_menu_description"),
|
||||
'id': session_data.get('target_menu_id'),
|
||||
'title': session_data.get('target_menu_title'),
|
||||
'description': session_data.get('target_menu_description'),
|
||||
}
|
||||
submenu = {
|
||||
"id": session_data.get("target_submenu_id"),
|
||||
"title": session_data.get("target_submenu_title"),
|
||||
"description": session_data.get("target_submenu_description"),
|
||||
'id': session_data.get('target_submenu_id'),
|
||||
'title': session_data.get('target_submenu_title'),
|
||||
'description': session_data.get('target_submenu_description'),
|
||||
}
|
||||
code, rspn = await Repo.Submenu.get(client, menu, submenu)
|
||||
|
||||
assert code == 200
|
||||
assert "id" in rspn
|
||||
assert "title" in rspn
|
||||
assert "description" in rspn
|
||||
assert rspn.get("dishes_count") == 2
|
||||
assert 'id' in rspn
|
||||
assert 'title' in rspn
|
||||
assert 'description' in rspn
|
||||
assert rspn.get('dishes_count') == 2
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_07_del_submenu(client: AsyncClient, session_data: Dict):
|
||||
async def test_07_del_submenu(client: AsyncClient, session_data: dict):
|
||||
menu = {
|
||||
"id": session_data.get("target_menu_id"),
|
||||
"title": session_data.get("target_menu_title"),
|
||||
"description": session_data.get("target_menu_description"),
|
||||
'id': session_data.get('target_menu_id'),
|
||||
'title': session_data.get('target_menu_title'),
|
||||
'description': session_data.get('target_menu_description'),
|
||||
}
|
||||
submenu = {
|
||||
"id": session_data.get("target_submenu_id"),
|
||||
"title": session_data.get("target_submenu_title"),
|
||||
"description": session_data.get("target_submenu_description"),
|
||||
'id': session_data.get('target_submenu_id'),
|
||||
'title': session_data.get('target_submenu_title'),
|
||||
'description': session_data.get('target_submenu_description'),
|
||||
}
|
||||
code = await Repo.Submenu.delete(client, menu, submenu)
|
||||
|
||||
@@ -168,11 +166,11 @@ async def test_07_del_submenu(client: AsyncClient, session_data: Dict):
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_07_check_submenus(client: AsyncClient, session_data: Dict):
|
||||
async def test_07_check_submenus(client: AsyncClient, session_data: dict):
|
||||
menu = {
|
||||
"id": session_data.get("target_menu_id"),
|
||||
"title": session_data.get("target_menu_title"),
|
||||
"description": session_data.get("target_menu_description"),
|
||||
'id': session_data.get('target_menu_id'),
|
||||
'title': session_data.get('target_menu_title'),
|
||||
'description': session_data.get('target_menu_description'),
|
||||
}
|
||||
code, rspn = await Repo.Submenu.read_all(client, menu)
|
||||
|
||||
@@ -181,16 +179,16 @@ async def test_07_check_submenus(client: AsyncClient, session_data: Dict):
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_08_check_dishes(client: AsyncClient, session_data: Dict):
|
||||
async def test_08_check_dishes(client: AsyncClient, session_data: dict):
|
||||
menu = {
|
||||
"id": session_data.get("target_menu_id"),
|
||||
"title": session_data.get("target_menu_title"),
|
||||
"description": session_data.get("target_menu_description"),
|
||||
'id': session_data.get('target_menu_id'),
|
||||
'title': session_data.get('target_menu_title'),
|
||||
'description': session_data.get('target_menu_description'),
|
||||
}
|
||||
submenu = {
|
||||
"id": session_data.get("target_submenu_id"),
|
||||
"title": session_data.get("target_submenu_title"),
|
||||
"description": session_data.get("target_submenu_description"),
|
||||
'id': session_data.get('target_submenu_id'),
|
||||
'title': session_data.get('target_submenu_title'),
|
||||
'description': session_data.get('target_submenu_description'),
|
||||
}
|
||||
code, rspn = await Repo.Dish.read_all(client, menu, submenu)
|
||||
|
||||
@@ -199,28 +197,28 @@ async def test_08_check_dishes(client: AsyncClient, session_data: Dict):
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_09_check_menu(client: AsyncClient, session_data: Dict):
|
||||
async def test_09_check_menu(client: AsyncClient, session_data: dict):
|
||||
menu = {
|
||||
"id": session_data.get("target_menu_id"),
|
||||
"title": session_data.get("target_menu_title"),
|
||||
"description": session_data.get("target_menu_description"),
|
||||
'id': session_data.get('target_menu_id'),
|
||||
'title': session_data.get('target_menu_title'),
|
||||
'description': session_data.get('target_menu_description'),
|
||||
}
|
||||
code, rspn = await Repo.Menu.get(client, menu)
|
||||
|
||||
assert code == 200
|
||||
assert "id" in rspn
|
||||
assert "title" in rspn
|
||||
assert "description" in rspn
|
||||
assert rspn.get("submenus_count") == 0
|
||||
assert rspn.get("dishes_count") == 0
|
||||
assert 'id' in rspn
|
||||
assert 'title' in rspn
|
||||
assert 'description' in rspn
|
||||
assert rspn.get('submenus_count') == 0
|
||||
assert rspn.get('dishes_count') == 0
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_10_del_menu(client: AsyncClient, session_data: Dict):
|
||||
async def test_10_del_menu(client: AsyncClient, session_data: dict):
|
||||
menu = {
|
||||
"id": session_data.get("target_menu_id"),
|
||||
"title": session_data.get("target_menu_title"),
|
||||
"description": session_data.get("target_menu_description"),
|
||||
'id': session_data.get('target_menu_id'),
|
||||
'title': session_data.get('target_menu_title'),
|
||||
'description': session_data.get('target_menu_description'),
|
||||
}
|
||||
code = await Repo.Menu.delete(client, menu)
|
||||
|
||||
@@ -228,7 +226,7 @@ async def test_10_del_menu(client: AsyncClient, session_data: Dict):
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_11_check_menus(client: AsyncClient, session_data: Dict):
|
||||
async def test_11_check_menus(client: AsyncClient, session_data: dict):
|
||||
code, rspn = await Repo.Menu.read_all(client)
|
||||
|
||||
assert code == 200
|
||||
|
Reference in New Issue
Block a user