Merge pull request #356 from Vladyslav49/develop

remove duplicate mock_manager fixture

tests/widgets/conftest.py

@@ -0,0 +1,22 @@
+from unittest.mock import MagicMock, Mock
+
+import pytest
+from aiogram.fsm.state import State
+
+from aiogram_dialog import DialogManager
+from aiogram_dialog.api.entities import Context
+
+
+@pytest.fixture()
+def mock_manager() -> DialogManager:
+    manager = MagicMock()
+    context = Context(
+        dialog_data={},
+        start_data={},
+        widget_data={},
+        state=State(),
+        _stack_id="_stack_id",
+        _intent_id="_intent_id",
+    )
+    manager.current_context = Mock(side_effect=lambda: context)
+    return manager

tests/widgets/kbd/test_base.py

@@ -1,33 +1,13 @@
-from unittest.mock import Mock
-
 import pytest
 from aiogram import F
-from aiogram.fsm.state import State
 from aiogram.types import KeyboardButton
 
 from aiogram_dialog import DialogManager
-from aiogram_dialog.api.entities import Context
 from aiogram_dialog.api.internal import RawKeyboard
 from aiogram_dialog.widgets.common import WhenCondition
 from aiogram_dialog.widgets.kbd import Keyboard
 
 
-@pytest.fixture()
-def mock_manager() -> DialogManager:
-    manager = Mock()
-    context = Context(
-        dialog_data={},
-        start_data={},
-        widget_data={},
-        state=State(),
-        _stack_id="_stack_id",
-        _intent_id="_intent_id",
-    )
-    manager.current_context = Mock(side_effect=lambda: context)
-
-    return manager
-
-
 class Button(Keyboard):
     def __init__(self, id: str, when: WhenCondition = None):
         super().__init__(when=when, id=id)

tests/widgets/kbd/test_calendar.py

@@ -1,29 +1,8 @@
-from unittest.mock import Mock
-
 import pytest
-from aiogram.fsm.state import State
 
-from aiogram_dialog import DialogManager
-from aiogram_dialog.api.entities import Context
 from aiogram_dialog.widgets.kbd import Calendar, CalendarScope
 
 
-@pytest.fixture()
-def mock_manager() -> DialogManager:
-    manager = Mock()
-    context = Context(
-        dialog_data={},
-        start_data={},
-        widget_data={},
-        state=State(),
-        _stack_id="_stack_id",
-        _intent_id="_intent_id",
-    )
-    manager.current_context = Mock(side_effect=lambda: context)
-
-    return manager
-
-
 @pytest.mark.asyncio
 async def test_render_calendar(mock_manager):
     calendar = Calendar(id="calendar")

tests/widgets/kbd/test_checkbox.py

@@ -1,31 +1,12 @@
-from unittest.mock import AsyncMock, Mock
+from unittest.mock import AsyncMock
 
 import pytest
-from aiogram.fsm.state import State
 from aiogram.types import TelegramObject
 
-from aiogram_dialog import DialogManager
-from aiogram_dialog.api.entities import Context
 from aiogram_dialog.widgets.kbd import Checkbox
 from aiogram_dialog.widgets.text import Const
 
 
-@pytest.fixture()
-def mock_manager() -> DialogManager:
-    manager = Mock()
-    context = Context(
-        dialog_data={},
-        start_data={},
-        widget_data={},
-        state=State(),
-        _stack_id="_stack_id",
-        _intent_id="_intent_id",
-    )
-    manager.current_context = Mock(side_effect=lambda: context)
-
-    return manager
-
-
 @pytest.mark.asyncio
 async def test_check_checkbox(mock_manager) -> None:
     checkbox = Checkbox(

tests/widgets/kbd/test_column.py

@@ -1,30 +1,9 @@
-from unittest.mock import Mock
-
 import pytest
-from aiogram.fsm.state import State
 
-from aiogram_dialog import DialogManager
-from aiogram_dialog.api.entities import Context
 from aiogram_dialog.widgets.kbd import Button, Column
 from aiogram_dialog.widgets.text import Const
 
 
-@pytest.fixture()
-def mock_manager() -> DialogManager:
-    manager = Mock()
-    context = Context(
-        dialog_data={},
-        start_data={},
-        widget_data={},
-        state=State(),
-        _stack_id="_stack_id",
-        _intent_id="_intent_id",
-    )
-    manager.current_context = Mock(side_effect=lambda: context)
-
-    return manager
-
-
 @pytest.mark.asyncio
 async def test_render_column(mock_manager) -> None:
     column = Column(

tests/widgets/kbd/test_counter.py

@@ -1,29 +1,10 @@
-from unittest.mock import AsyncMock, Mock
+from unittest.mock import AsyncMock
 
 import pytest
-from aiogram.fsm.state import State
 
-from aiogram_dialog import DialogManager
-from aiogram_dialog.api.entities import Context
 from aiogram_dialog.widgets.kbd import Counter
 
 
-@pytest.fixture()
-def mock_manager() -> DialogManager:
-    manager = Mock()
-    context = Context(
-        dialog_data={},
-        start_data={},
-        widget_data={},
-        state=State(),
-        _stack_id="_stack_id",
-        _intent_id="_intent_id",
-    )
-    manager.current_context = Mock(side_effect=lambda: context)
-
-    return manager
-
-
 @pytest.mark.asyncio
 async def test_set_value_counter(mock_manager) -> None:
     counter = Counter(id="counter")

tests/widgets/kbd/test_group.py

@@ -1,4 +1,4 @@
-from unittest.mock import AsyncMock, Mock
+from unittest.mock import AsyncMock
 
 import pytest
 from aiogram import Dispatcher
@@ -9,29 +9,12 @@
 from aiogram_dialog import (
     Dialog, DialogManager, setup_dialogs, StartMode, Window,
 )
-from aiogram_dialog.api.entities import Context
 from aiogram_dialog.test_tools import BotClient, MockMessageManager
 from aiogram_dialog.test_tools.keyboard import InlineButtonTextLocator
 from aiogram_dialog.widgets.kbd import Button, Group
 from aiogram_dialog.widgets.text import Const
 
 
-@pytest.fixture()
-def mock_manager() -> DialogManager:
-    manager = Mock()
-    context = Context(
-        dialog_data={},
-        start_data={},
-        widget_data={},
-        state=State(),
-        _stack_id="_stack_id",
-        _intent_id="_intent_id",
-    )
-    manager.current_context = Mock(side_effect=lambda: context)
-
-    return manager
-
-
 @pytest.mark.asyncio
 async def test_render_group(mock_manager) -> None:
     group = Group(

tests/widgets/kbd/test_multiselect.py

@@ -1,32 +1,13 @@
 import operator
-from unittest.mock import AsyncMock, Mock
+from unittest.mock import AsyncMock
 
 import pytest
-from aiogram.fsm.state import State
 from aiogram.types import TelegramObject
 
-from aiogram_dialog import DialogManager
-from aiogram_dialog.api.entities import Context
 from aiogram_dialog.widgets.kbd import Multiselect
 from aiogram_dialog.widgets.text import Format
 
 
-@pytest.fixture()
-def mock_manager() -> DialogManager:
-    manager = Mock()
-    context = Context(
-        dialog_data={},
-        start_data={},
-        widget_data={},
-        state=State(),
-        _stack_id="_stack_id",
-        _intent_id="_intent_id",
-    )
-    manager.current_context = Mock(side_effect=lambda: context)
-
-    return manager
-
-
 @pytest.mark.asyncio
 async def test_check_multiselect(mock_manager) -> None:
     multiselect = Multiselect(

tests/widgets/kbd/test_radio.py

@@ -1,32 +1,13 @@
 import operator
-from unittest.mock import AsyncMock, Mock
+from unittest.mock import AsyncMock
 
 import pytest
-from aiogram.fsm.state import State
 from aiogram.types import TelegramObject
 
-from aiogram_dialog import DialogManager
-from aiogram_dialog.api.entities import Context
 from aiogram_dialog.widgets.kbd import Radio
 from aiogram_dialog.widgets.text import Format
 
 
-@pytest.fixture()
-def mock_manager() -> DialogManager:
-    manager = Mock()
-    context = Context(
-        dialog_data={},
-        start_data={},
-        widget_data={},
-        state=State(),
-        _stack_id="_stack_id",
-        _intent_id="_intent_id",
-    )
-    manager.current_context = Mock(side_effect=lambda: context)
-
-    return manager
-
-
 @pytest.mark.asyncio
 async def test_check_radio(mock_manager) -> None:
     radio = Radio(

tests/widgets/kbd/test_row.py

@@ -1,30 +1,9 @@
-from unittest.mock import Mock
-
 import pytest
-from aiogram.fsm.state import State
 
-from aiogram_dialog import DialogManager
-from aiogram_dialog.api.entities import Context
 from aiogram_dialog.widgets.kbd import Button, Row
 from aiogram_dialog.widgets.text import Const
 
 
-@pytest.fixture()
-def mock_manager() -> DialogManager:
-    manager = Mock()
-    context = Context(
-        dialog_data={},
-        start_data={},
-        widget_data={},
-        state=State(),
-        _stack_id="_stack_id",
-        _intent_id="_intent_id",
-    )
-    manager.current_context = Mock(side_effect=lambda: context)
-
-    return manager
-
-
 @pytest.mark.asyncio
 async def test_render_row(mock_manager) -> None:
     row = Row(

tests/widgets/kbd/test_select.py

@@ -1,31 +1,11 @@
 import operator
-from unittest.mock import Mock
 
 import pytest
-from aiogram.fsm.state import State
 
-from aiogram_dialog import DialogManager
-from aiogram_dialog.api.entities import Context
 from aiogram_dialog.widgets.kbd import Select
 from aiogram_dialog.widgets.text import Format
 
 
-@pytest.fixture()
-def mock_manager() -> DialogManager:
-    manager = Mock()
-    context = Context(
-        dialog_data={},
-        start_data={},
-        widget_data={},
-        state=State(),
-        _stack_id="_stack_id",
-        _intent_id="_intent_id",
-    )
-    manager.current_context = Mock(side_effect=lambda: context)
-
-    return manager
-
-
 @pytest.mark.asyncio
 async def test_render_select(mock_manager) -> None:
     select = Select(

tests/widgets/kbd/test_toggle.py

@@ -1,32 +1,12 @@
 import operator
-from unittest.mock import Mock
 
 import pytest
-from aiogram.fsm.state import State
 from aiogram.types import TelegramObject
 
-from aiogram_dialog import DialogManager
-from aiogram_dialog.api.entities import Context
 from aiogram_dialog.widgets.kbd import Toggle
 from aiogram_dialog.widgets.text import Format
 
 
-@pytest.fixture()
-def mock_manager() -> DialogManager:
-    manager = Mock()
-    context = Context(
-        dialog_data={},
-        start_data={},
-        widget_data={},
-        state=State(),
-        _stack_id="_stack_id",
-        _intent_id="_intent_id",
-    )
-    manager.current_context = Mock(side_effect=lambda: context)
-
-    return manager
-
-
 @pytest.mark.asyncio
 async def test_render_toggle(mock_manager) -> None:
     toggle = Toggle(