Fix/issue170

requirements.dev.txt

@@ -6,3 +6,4 @@ pytest
 pytest-cov
 pytest-mock
 testcontainers[postgres]
+aioresponses

tests/conftest.py

@@ -6,6 +6,7 @@
 
 import pytest
 from _pytest.monkeypatch import MonkeyPatch
+from aioresponses import aioresponses
 from alembic import command
 from alembic.config import Config as AlembicConfig
 from fastapi.testclient import TestClient
@@ -43,6 +44,13 @@ def session_mp():
     mp.undo()
 
 
+@pytest.fixture(autouse=True)
+def aiohttp_mp():
+    """Фикстура для перехвата любых aiohttp запросов aiohttp.ClientSession()"""
+    with aioresponses() as aiohttp_mock:
+        yield aiohttp_mock
+
+
 @pytest.fixture(scope='session')
 def get_settings_mock(session_mp):
     """Переопределение get_settings в rating_api/settings.py и перезагрузка base.app."""
@@ -92,16 +100,37 @@ def dbsession(db_container):
 
 
 @pytest.fixture
-def client(mocker):
-    user_mock = mocker.patch('auth_lib.fastapi.UnionAuth.__call__')
-    user_mock.return_value = {
+def authlib_user():
+    """
+    Данные о пользователе, возвращаемые сервисом auth.
+    """
+    return {
         "session_scopes": [{"id": 0, "name": "string", "comment": "string"}],
         "user_scopes": [{"id": 0, "name": "string", "comment": "string"}],
         "indirect_groups": [{"id": 0, "name": "string", "parent_id": 0}],
         "groups": [{"id": 0, "name": "string", "parent_id": 0}],
         "id": 0,
         "email": "string",
+        "userdata": [
+            {"category": "Личная информация", "param": "Полное имя", "value": "Тестовый Тест"},
+        ],
     }
+
+
+@pytest.fixture()
+def authlib_mock(mocker):
+    auth_mock = mocker.patch("auth_lib.fastapi.UnionAuth.__call__")
+    return auth_mock
+
+
+@pytest.fixture()
+def user_mock(authlib_mock, authlib_user):
+    authlib_mock.return_value = authlib_user
+    return authlib_mock
+
+
+@pytest.fixture
+def client(mocker, user_mock):
     client = TestClient(app)
     return client
 
@@ -218,7 +247,6 @@ def lecturers(dbsession):
         dbsession.add(lecturer)
     dbsession.commit()
     yield lecturers
-
     for lecturer in lecturers:
         for row in lecturer.comments:
             dbsession.delete(row)
@@ -227,6 +255,7 @@ def lecturers(dbsession):
         )
         for row in lecturer_user_comments:
             dbsession.delete(row)
+            dbsession.flush()
         dbsession.delete(lecturer)
     dbsession.commit()