mirror of
https://github.com/aiogram/aiogram.git
synced 2025-12-14 10:53:23 +00:00
3d63bf3b99
* Base implementation
* Small refactoring + added possibility to specify post-action on handlers
* Move scene properties to config object
* Revise aiogram/scenes with wizard-based design pattern
Modified files in aiogram/scenes to incorporate the Wizard design pattern. Files affected are _marker.py, _registry.py, _wizard.py and __init__.py. The changes introduced a SceneWizard Class and ScenesManager, both of which aid in controlling navigation between different scenes or states. This helps clarifying the codebase, streamline scene transitions and offer more control over the app flow.
* Added example
* Small optimizations
* Replace ValueError with SceneException in scenes. Added error safety in scene resolver.
* str
* Added possibility to reset context on scene entered and to handle callback query in any state
* Remove inline markup in example
* Small changes
* Docs + example
* Small refactoring
* Remove scene inclusion methods from router
The methods for including scenes as sub-routers have been removed from the router.py file. Instead, the SceneRegistry class is now set to register scenes by default upon initializing. This streamlines the scene management process by removing redundant routers and making registration automatic.
* Init tests
* Small fix in tests
* Add support for State instance in the scene
The aiogram FSM scene now allows the use of State instance as an argument, enabling more customization. Modified the 'as_handler' method to receive **kwargs arguments, allowing passing of attributes to the handler. An additional type check has been also added to ensure the 'scene' is either a subclass of Scene or a string.
* Fixed test
* Expand test coverage for test_fsm module
The commit enhances tests for the test_fsm module to improve code reliability. It includes additional unit tests for the ObserverDecorator and ActionContainer classes and introduces new tests for the SceneHandlerWrapper class. This ensures the correct functionality of the decorator methods, the action container execution, and the handler wrapper.
* Reformat code
* Fixed long line in the example
* Skip some tests on PyPy
* Change mock return_value
* Compatibility...
* Compatibility...
* Compatibility...
* Added base changes description
* Scenes Tests (#1369)
* ADD tests for `SceneRegistry`
* ADD tests for `ScenesManager`
* ADD Changelog
* Revert "ADD Changelog"
This reverts commit 6dd9301252.
* Remove `@pytest.mark.asyncio`, Reformat code
* Scenes Tests. Part 2 (#1371)
* ADD tests for `SceneWizard`
* ADD tests for `Scene`
* Refactor ObserverDecorator to use on.message syntax in test_scene.py
Cover `Scene::__init_subclass__::if isinstance(value, ObserverDecorator):`
* Refactor `HistoryManager` in `aiogram/fsm/scene.py`
Removed condition that checked if 'history' is empty before calling 'update_data' in 'Scene'.
* ADD tests for `HistoryManager`
* Small changes in the documentation
* Small changes in the documentation
* Small changes in the documentation
---------
Co-authored-by: Andrew <11490628+andrew000@users.noreply.github.com>
55 lines
1.9 KiB
Python
55 lines
1.9 KiB
Python
import functools
|
|
from typing import Any
|
|
from unittest.mock import AsyncMock, patch
|
|
|
|
import pytest
|
|
|
|
from aiogram.dispatcher.event.event import EventObserver
|
|
from aiogram.dispatcher.event.handler import HandlerObject
|
|
|
|
|
|
async def my_handler(value: str, index: int = 0) -> Any:
|
|
return value
|
|
|
|
|
|
class TestEventObserver:
|
|
@pytest.mark.parametrize("via_decorator", [True, False])
|
|
@pytest.mark.parametrize("count,handler", ([5, my_handler], [3, my_handler], [2, my_handler]))
|
|
def test_register_filters(self, via_decorator, count, handler):
|
|
observer = EventObserver()
|
|
|
|
for index in range(count):
|
|
wrapped_handler = functools.partial(handler, index=index)
|
|
if via_decorator:
|
|
register_result = observer()(wrapped_handler)
|
|
assert register_result == wrapped_handler
|
|
else:
|
|
register_result = observer.register(wrapped_handler)
|
|
assert register_result is None
|
|
|
|
registered_handler = observer.handlers[index]
|
|
|
|
assert len(observer.handlers) == index + 1
|
|
assert isinstance(registered_handler, HandlerObject)
|
|
assert registered_handler.callback == wrapped_handler
|
|
assert not registered_handler.filters
|
|
|
|
async def test_trigger(self):
|
|
observer = EventObserver()
|
|
|
|
observer.register(my_handler)
|
|
observer.register(lambda e: True)
|
|
observer.register(my_handler)
|
|
|
|
assert observer.handlers[0].awaitable
|
|
assert not observer.handlers[1].awaitable
|
|
assert observer.handlers[2].awaitable
|
|
|
|
with patch(
|
|
"aiogram.dispatcher.event.handler.CallableObject.call",
|
|
new_callable=AsyncMock,
|
|
) as mocked_my_handler:
|
|
results = await observer.trigger("test")
|
|
assert results is None
|
|
mocked_my_handler.assert_awaited_with("test")
|
|
assert mocked_my_handler.call_count == 3
|