From 2b3dd6cc4afa75a95172b589a6d60635774c1855 Mon Sep 17 00:00:00 2001 From: Alex Root Junior Date: Mon, 18 Nov 2019 21:14:19 +0200 Subject: [PATCH 1/6] Try to use Makefile in Pipeline --- .github/workflows/docs.yml | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 2b9341bf..03d9ac08 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -20,33 +20,28 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install poetry - poetry install + make install mkdir -p reports/tests - name: Lint code run: | - poetry run flake8 --format=html --htmldir=reports/flake8 aiogram test - poetry run mypy aiogram tests --html-report reports/typechecking + make flake8-report + make mypy-report - name: Run tests run: | - poetry run pytest --cov=aiogram --cov-config .coveragerc --html=reports/tests/index.html tests/ - poetry run coverage html -d reports/coverage + make test-coverage - name: Build docs run: | - poetry run mkdocs build + make docs + make docs-copy-reports - name: Build package run: | poetry build - mkdir -p site/simple/aiogram - mv dist/* site/simple/aiogram - - - name: Move coverage report - run: | - mv reports site + mkdir -p site/simple + mv dist site/simple/aiogram - name: FTP-Deploy-2038 uses: SamKirkland/FTP-Deploy-Action@2.0.0 From 17edffdc62558f80ed29044f0f10f839da40438f Mon Sep 17 00:00:00 2001 From: Alex Root Junior Date: Mon, 18 Nov 2019 21:17:42 +0200 Subject: [PATCH 2/6] Fix pipeline install step --- .github/workflows/docs.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 03d9ac08..53117cca 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -19,9 +19,9 @@ jobs: - name: Install dependencies run: | - python -m pip install --upgrade pip - make install - mkdir -p reports/tests + python -m pip install --upgrade pip poetry + poetry install + mkdir -p reports - name: Lint code run: | From 567584b741a62c04d7d574e11c43a804ffb08056 Mon Sep 17 00:00:00 2001 From: Alex Root Junior Date: Mon, 18 Nov 2019 22:22:46 +0200 Subject: [PATCH 3/6] Auto-generate tests for methods --- .../test_methods/test_add_sticker_to_set.py | 30 +++++++++++++ .../test_answer_callback_query.py | 26 +++++++++++ .../test_methods/test_answer_inline_query.py | 30 +++++++++++++ .../test_answer_pre_checkout_query.py | 30 +++++++++++++ .../test_answer_shipping_query.py | 30 +++++++++++++ .../test_create_new_sticker_set.py | 30 +++++++++++++ .../test_methods/test_delete_chat_photo.py | 26 +++++++++++ .../test_delete_chat_sticker_set.py | 26 +++++++++++ .../test_methods/test_delete_message.py | 30 +++++++++++++ .../test_delete_sticker_from_set.py | 26 +++++++++++ .../test_methods/test_delete_webhook.py | 26 +++++++++++ .../test_methods/test_edit_message_caption.py | 26 +++++++++++ .../test_edit_message_live_location.py | 30 +++++++++++++ .../test_methods/test_edit_message_media.py | 26 +++++++++++ .../test_edit_message_reply_markup.py | 26 +++++++++++ .../test_methods/test_edit_message_text.py | 26 +++++++++++ .../test_export_chat_invite_link.py | 26 +++++++++++ .../test_methods/test_forward_message.py | 30 +++++++++++++ tests/test_api/test_methods/test_get_chat.py | 26 +++++++++++ .../test_get_chat_administrators.py | 26 +++++++++++ .../test_methods/test_get_chat_member.py | 30 +++++++++++++ .../test_get_chat_members_count.py | 26 +++++++++++ tests/test_api/test_methods/test_get_file.py | 26 +++++++++++ .../test_methods/test_get_game_high_scores.py | 26 +++++++++++ .../test_methods/test_get_sticker_set.py | 26 +++++++++++ .../test_api/test_methods/test_get_updates.py | 26 +++++++++++ .../test_get_user_profile_photos.py | 26 +++++++++++ .../test_methods/test_get_webhook_info.py | 26 +++++++++++ .../test_methods/test_kick_chat_member.py | 30 +++++++++++++ .../test_api/test_methods/test_leave_chat.py | 26 +++++++++++ .../test_methods/test_pin_chat_message.py | 30 +++++++++++++ .../test_methods/test_promote_chat_member.py | 30 +++++++++++++ .../test_methods/test_restrict_chat_member.py | 30 +++++++++++++ .../test_methods/test_send_animation.py | 30 +++++++++++++ .../test_api/test_methods/test_send_audio.py | 30 +++++++++++++ .../test_methods/test_send_chat_action.py | 30 +++++++++++++ .../test_methods/test_send_contact.py | 30 +++++++++++++ .../test_methods/test_send_document.py | 30 +++++++++++++ tests/test_api/test_methods/test_send_game.py | 30 +++++++++++++ .../test_methods/test_send_invoice.py | 44 +++++++++++++++++++ .../test_methods/test_send_location.py | 30 +++++++++++++ .../test_methods/test_send_media_group.py | 30 +++++++++++++ .../test_methods/test_send_message.py | 30 +++++++++++++ .../test_api/test_methods/test_send_photo.py | 30 +++++++++++++ tests/test_api/test_methods/test_send_poll.py | 30 +++++++++++++ .../test_methods/test_send_sticker.py | 30 +++++++++++++ .../test_api/test_methods/test_send_venue.py | 30 +++++++++++++ .../test_api/test_methods/test_send_video.py | 30 +++++++++++++ .../test_methods/test_send_video_note.py | 30 +++++++++++++ .../test_api/test_methods/test_send_voice.py | 30 +++++++++++++ .../test_methods/test_set_chat_description.py | 26 +++++++++++ .../test_methods/test_set_chat_permissions.py | 30 +++++++++++++ .../test_methods/test_set_chat_photo.py | 30 +++++++++++++ .../test_methods/test_set_chat_sticker_set.py | 30 +++++++++++++ .../test_methods/test_set_chat_title.py | 30 +++++++++++++ .../test_methods/test_set_game_score.py | 30 +++++++++++++ .../test_set_passport_data_errors.py | 30 +++++++++++++ .../test_set_sticker_position_in_set.py | 30 +++++++++++++ .../test_api/test_methods/test_set_webhook.py | 26 +++++++++++ .../test_stop_message_live_location.py | 26 +++++++++++ tests/test_api/test_methods/test_stop_poll.py | 30 +++++++++++++ .../test_methods/test_unban_chat_member.py | 30 +++++++++++++ .../test_methods/test_unpin_chat_message.py | 26 +++++++++++ .../test_methods/test_upload_sticker_file.py | 30 +++++++++++++ 64 files changed, 1838 insertions(+) create mode 100644 tests/test_api/test_methods/test_add_sticker_to_set.py create mode 100644 tests/test_api/test_methods/test_answer_callback_query.py create mode 100644 tests/test_api/test_methods/test_answer_inline_query.py create mode 100644 tests/test_api/test_methods/test_answer_pre_checkout_query.py create mode 100644 tests/test_api/test_methods/test_answer_shipping_query.py create mode 100644 tests/test_api/test_methods/test_create_new_sticker_set.py create mode 100644 tests/test_api/test_methods/test_delete_chat_photo.py create mode 100644 tests/test_api/test_methods/test_delete_chat_sticker_set.py create mode 100644 tests/test_api/test_methods/test_delete_message.py create mode 100644 tests/test_api/test_methods/test_delete_sticker_from_set.py create mode 100644 tests/test_api/test_methods/test_delete_webhook.py create mode 100644 tests/test_api/test_methods/test_edit_message_caption.py create mode 100644 tests/test_api/test_methods/test_edit_message_live_location.py create mode 100644 tests/test_api/test_methods/test_edit_message_media.py create mode 100644 tests/test_api/test_methods/test_edit_message_reply_markup.py create mode 100644 tests/test_api/test_methods/test_edit_message_text.py create mode 100644 tests/test_api/test_methods/test_export_chat_invite_link.py create mode 100644 tests/test_api/test_methods/test_forward_message.py create mode 100644 tests/test_api/test_methods/test_get_chat.py create mode 100644 tests/test_api/test_methods/test_get_chat_administrators.py create mode 100644 tests/test_api/test_methods/test_get_chat_member.py create mode 100644 tests/test_api/test_methods/test_get_chat_members_count.py create mode 100644 tests/test_api/test_methods/test_get_file.py create mode 100644 tests/test_api/test_methods/test_get_game_high_scores.py create mode 100644 tests/test_api/test_methods/test_get_sticker_set.py create mode 100644 tests/test_api/test_methods/test_get_updates.py create mode 100644 tests/test_api/test_methods/test_get_user_profile_photos.py create mode 100644 tests/test_api/test_methods/test_get_webhook_info.py create mode 100644 tests/test_api/test_methods/test_kick_chat_member.py create mode 100644 tests/test_api/test_methods/test_leave_chat.py create mode 100644 tests/test_api/test_methods/test_pin_chat_message.py create mode 100644 tests/test_api/test_methods/test_promote_chat_member.py create mode 100644 tests/test_api/test_methods/test_restrict_chat_member.py create mode 100644 tests/test_api/test_methods/test_send_animation.py create mode 100644 tests/test_api/test_methods/test_send_audio.py create mode 100644 tests/test_api/test_methods/test_send_chat_action.py create mode 100644 tests/test_api/test_methods/test_send_contact.py create mode 100644 tests/test_api/test_methods/test_send_document.py create mode 100644 tests/test_api/test_methods/test_send_game.py create mode 100644 tests/test_api/test_methods/test_send_invoice.py create mode 100644 tests/test_api/test_methods/test_send_location.py create mode 100644 tests/test_api/test_methods/test_send_media_group.py create mode 100644 tests/test_api/test_methods/test_send_message.py create mode 100644 tests/test_api/test_methods/test_send_photo.py create mode 100644 tests/test_api/test_methods/test_send_poll.py create mode 100644 tests/test_api/test_methods/test_send_sticker.py create mode 100644 tests/test_api/test_methods/test_send_venue.py create mode 100644 tests/test_api/test_methods/test_send_video.py create mode 100644 tests/test_api/test_methods/test_send_video_note.py create mode 100644 tests/test_api/test_methods/test_send_voice.py create mode 100644 tests/test_api/test_methods/test_set_chat_description.py create mode 100644 tests/test_api/test_methods/test_set_chat_permissions.py create mode 100644 tests/test_api/test_methods/test_set_chat_photo.py create mode 100644 tests/test_api/test_methods/test_set_chat_sticker_set.py create mode 100644 tests/test_api/test_methods/test_set_chat_title.py create mode 100644 tests/test_api/test_methods/test_set_game_score.py create mode 100644 tests/test_api/test_methods/test_set_passport_data_errors.py create mode 100644 tests/test_api/test_methods/test_set_sticker_position_in_set.py create mode 100644 tests/test_api/test_methods/test_set_webhook.py create mode 100644 tests/test_api/test_methods/test_stop_message_live_location.py create mode 100644 tests/test_api/test_methods/test_stop_poll.py create mode 100644 tests/test_api/test_methods/test_unban_chat_member.py create mode 100644 tests/test_api/test_methods/test_unpin_chat_message.py create mode 100644 tests/test_api/test_methods/test_upload_sticker_file.py diff --git a/tests/test_api/test_methods/test_add_sticker_to_set.py b/tests/test_api/test_methods/test_add_sticker_to_set.py new file mode 100644 index 00000000..0bc5217d --- /dev/null +++ b/tests/test_api/test_methods/test_add_sticker_to_set.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import AddStickerToSet, Request +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestAddStickerToSet: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(AddStickerToSet, ok=True, result=None) + + response: bool = await AddStickerToSet( + user_id=..., name=..., png_sticker=..., emojis=..., + ) + request: Request = bot.get_request() + assert request.method == "addStickerToSet" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(AddStickerToSet, ok=True, result=None) + + response: bool = await bot.add_sticker_to_set( + user_id=..., name=..., png_sticker=..., emojis=..., + ) + request: Request = bot.get_request() + assert request.method == "addStickerToSet" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_answer_callback_query.py b/tests/test_api/test_methods/test_answer_callback_query.py new file mode 100644 index 00000000..c8d537f4 --- /dev/null +++ b/tests/test_api/test_methods/test_answer_callback_query.py @@ -0,0 +1,26 @@ +import pytest +from aiogram.api.methods import AnswerCallbackQuery, Request +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestAnswerCallbackQuery: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(AnswerCallbackQuery, ok=True, result=None) + + response: bool = await AnswerCallbackQuery(callback_query_id=...,) + request: Request = bot.get_request() + assert request.method == "answerCallbackQuery" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(AnswerCallbackQuery, ok=True, result=None) + + response: bool = await bot.answer_callback_query(callback_query_id=...,) + request: Request = bot.get_request() + assert request.method == "answerCallbackQuery" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_answer_inline_query.py b/tests/test_api/test_methods/test_answer_inline_query.py new file mode 100644 index 00000000..1dc92bf1 --- /dev/null +++ b/tests/test_api/test_methods/test_answer_inline_query.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import AnswerInlineQuery, Request +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestAnswerInlineQuery: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(AnswerInlineQuery, ok=True, result=None) + + response: bool = await AnswerInlineQuery( + inline_query_id=..., results=..., + ) + request: Request = bot.get_request() + assert request.method == "answerInlineQuery" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(AnswerInlineQuery, ok=True, result=None) + + response: bool = await bot.answer_inline_query( + inline_query_id=..., results=..., + ) + request: Request = bot.get_request() + assert request.method == "answerInlineQuery" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_answer_pre_checkout_query.py b/tests/test_api/test_methods/test_answer_pre_checkout_query.py new file mode 100644 index 00000000..e4276399 --- /dev/null +++ b/tests/test_api/test_methods/test_answer_pre_checkout_query.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import AnswerPreCheckoutQuery, Request +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestAnswerPreCheckoutQuery: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(AnswerPreCheckoutQuery, ok=True, result=None) + + response: bool = await AnswerPreCheckoutQuery( + pre_checkout_query_id=..., ok=..., + ) + request: Request = bot.get_request() + assert request.method == "answerPreCheckoutQuery" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(AnswerPreCheckoutQuery, ok=True, result=None) + + response: bool = await bot.answer_pre_checkout_query( + pre_checkout_query_id=..., ok=..., + ) + request: Request = bot.get_request() + assert request.method == "answerPreCheckoutQuery" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_answer_shipping_query.py b/tests/test_api/test_methods/test_answer_shipping_query.py new file mode 100644 index 00000000..d57349f2 --- /dev/null +++ b/tests/test_api/test_methods/test_answer_shipping_query.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import AnswerShippingQuery, Request +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestAnswerShippingQuery: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(AnswerShippingQuery, ok=True, result=None) + + response: bool = await AnswerShippingQuery( + shipping_query_id=..., ok=..., + ) + request: Request = bot.get_request() + assert request.method == "answerShippingQuery" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(AnswerShippingQuery, ok=True, result=None) + + response: bool = await bot.answer_shipping_query( + shipping_query_id=..., ok=..., + ) + request: Request = bot.get_request() + assert request.method == "answerShippingQuery" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_create_new_sticker_set.py b/tests/test_api/test_methods/test_create_new_sticker_set.py new file mode 100644 index 00000000..561f3d2d --- /dev/null +++ b/tests/test_api/test_methods/test_create_new_sticker_set.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import CreateNewStickerSet, Request +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestCreateNewStickerSet: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(CreateNewStickerSet, ok=True, result=None) + + response: bool = await CreateNewStickerSet( + user_id=..., name=..., title=..., png_sticker=..., emojis=..., + ) + request: Request = bot.get_request() + assert request.method == "createNewStickerSet" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(CreateNewStickerSet, ok=True, result=None) + + response: bool = await bot.create_new_sticker_set( + user_id=..., name=..., title=..., png_sticker=..., emojis=..., + ) + request: Request = bot.get_request() + assert request.method == "createNewStickerSet" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_delete_chat_photo.py b/tests/test_api/test_methods/test_delete_chat_photo.py new file mode 100644 index 00000000..ea473aed --- /dev/null +++ b/tests/test_api/test_methods/test_delete_chat_photo.py @@ -0,0 +1,26 @@ +import pytest +from aiogram.api.methods import DeleteChatPhoto, Request +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestDeleteChatPhoto: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(DeleteChatPhoto, ok=True, result=None) + + response: bool = await DeleteChatPhoto(chat_id=...,) + request: Request = bot.get_request() + assert request.method == "deleteChatPhoto" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(DeleteChatPhoto, ok=True, result=None) + + response: bool = await bot.delete_chat_photo(chat_id=...,) + request: Request = bot.get_request() + assert request.method == "deleteChatPhoto" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_delete_chat_sticker_set.py b/tests/test_api/test_methods/test_delete_chat_sticker_set.py new file mode 100644 index 00000000..f2d4edad --- /dev/null +++ b/tests/test_api/test_methods/test_delete_chat_sticker_set.py @@ -0,0 +1,26 @@ +import pytest +from aiogram.api.methods import DeleteChatStickerSet, Request +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestDeleteChatStickerSet: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(DeleteChatStickerSet, ok=True, result=None) + + response: bool = await DeleteChatStickerSet(chat_id=...,) + request: Request = bot.get_request() + assert request.method == "deleteChatStickerSet" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(DeleteChatStickerSet, ok=True, result=None) + + response: bool = await bot.delete_chat_sticker_set(chat_id=...,) + request: Request = bot.get_request() + assert request.method == "deleteChatStickerSet" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_delete_message.py b/tests/test_api/test_methods/test_delete_message.py new file mode 100644 index 00000000..be12ea13 --- /dev/null +++ b/tests/test_api/test_methods/test_delete_message.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import DeleteMessage, Request +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestDeleteMessage: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(DeleteMessage, ok=True, result=None) + + response: bool = await DeleteMessage( + chat_id=..., message_id=..., + ) + request: Request = bot.get_request() + assert request.method == "deleteMessage" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(DeleteMessage, ok=True, result=None) + + response: bool = await bot.delete_message( + chat_id=..., message_id=..., + ) + request: Request = bot.get_request() + assert request.method == "deleteMessage" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_delete_sticker_from_set.py b/tests/test_api/test_methods/test_delete_sticker_from_set.py new file mode 100644 index 00000000..d3e0866e --- /dev/null +++ b/tests/test_api/test_methods/test_delete_sticker_from_set.py @@ -0,0 +1,26 @@ +import pytest +from aiogram.api.methods import DeleteStickerFromSet, Request +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestDeleteStickerFromSet: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(DeleteStickerFromSet, ok=True, result=None) + + response: bool = await DeleteStickerFromSet(sticker=...,) + request: Request = bot.get_request() + assert request.method == "deleteStickerFromSet" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(DeleteStickerFromSet, ok=True, result=None) + + response: bool = await bot.delete_sticker_from_set(sticker=...,) + request: Request = bot.get_request() + assert request.method == "deleteStickerFromSet" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_delete_webhook.py b/tests/test_api/test_methods/test_delete_webhook.py new file mode 100644 index 00000000..b431288d --- /dev/null +++ b/tests/test_api/test_methods/test_delete_webhook.py @@ -0,0 +1,26 @@ +import pytest +from aiogram.api.methods import DeleteWebhook, Request +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestDeleteWebhook: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(DeleteWebhook, ok=True, result=None) + + response: bool = await DeleteWebhook() + request: Request = bot.get_request() + assert request.method == "deleteWebhook" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(DeleteWebhook, ok=True, result=None) + + response: bool = await bot.delete_webhook() + request: Request = bot.get_request() + assert request.method == "deleteWebhook" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_edit_message_caption.py b/tests/test_api/test_methods/test_edit_message_caption.py new file mode 100644 index 00000000..42db4ac8 --- /dev/null +++ b/tests/test_api/test_methods/test_edit_message_caption.py @@ -0,0 +1,26 @@ +import pytest +from aiogram.api.methods import EditMessageCaption, Request +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestEditMessageCaption: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(EditMessageCaption, ok=True, result=None) + + response: Union[Message, bool] = await EditMessageCaption() + request: Request = bot.get_request() + assert request.method == "editMessageCaption" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(EditMessageCaption, ok=True, result=None) + + response: Union[Message, bool] = await bot.edit_message_caption() + request: Request = bot.get_request() + assert request.method == "editMessageCaption" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_edit_message_live_location.py b/tests/test_api/test_methods/test_edit_message_live_location.py new file mode 100644 index 00000000..07b61a9d --- /dev/null +++ b/tests/test_api/test_methods/test_edit_message_live_location.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import EditMessageLiveLocation, Request +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestEditMessageLiveLocation: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(EditMessageLiveLocation, ok=True, result=None) + + response: Union[Message, bool] = await EditMessageLiveLocation( + latitude=..., longitude=..., + ) + request: Request = bot.get_request() + assert request.method == "editMessageLiveLocation" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(EditMessageLiveLocation, ok=True, result=None) + + response: Union[Message, bool] = await bot.edit_message_live_location( + latitude=..., longitude=..., + ) + request: Request = bot.get_request() + assert request.method == "editMessageLiveLocation" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_edit_message_media.py b/tests/test_api/test_methods/test_edit_message_media.py new file mode 100644 index 00000000..a7f3a23b --- /dev/null +++ b/tests/test_api/test_methods/test_edit_message_media.py @@ -0,0 +1,26 @@ +import pytest +from aiogram.api.methods import EditMessageMedia, Request +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestEditMessageMedia: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(EditMessageMedia, ok=True, result=None) + + response: Union[Message, bool] = await EditMessageMedia(media=...,) + request: Request = bot.get_request() + assert request.method == "editMessageMedia" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(EditMessageMedia, ok=True, result=None) + + response: Union[Message, bool] = await bot.edit_message_media(media=...,) + request: Request = bot.get_request() + assert request.method == "editMessageMedia" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_edit_message_reply_markup.py b/tests/test_api/test_methods/test_edit_message_reply_markup.py new file mode 100644 index 00000000..df4c6a48 --- /dev/null +++ b/tests/test_api/test_methods/test_edit_message_reply_markup.py @@ -0,0 +1,26 @@ +import pytest +from aiogram.api.methods import EditMessageReplyMarkup, Request +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestEditMessageReplyMarkup: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(EditMessageReplyMarkup, ok=True, result=None) + + response: Union[Message, bool] = await EditMessageReplyMarkup() + request: Request = bot.get_request() + assert request.method == "editMessageReplyMarkup" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(EditMessageReplyMarkup, ok=True, result=None) + + response: Union[Message, bool] = await bot.edit_message_reply_markup() + request: Request = bot.get_request() + assert request.method == "editMessageReplyMarkup" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_edit_message_text.py b/tests/test_api/test_methods/test_edit_message_text.py new file mode 100644 index 00000000..a5db3dc6 --- /dev/null +++ b/tests/test_api/test_methods/test_edit_message_text.py @@ -0,0 +1,26 @@ +import pytest +from aiogram.api.methods import EditMessageText, Request +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestEditMessageText: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(EditMessageText, ok=True, result=None) + + response: Union[Message, bool] = await EditMessageText(text=...,) + request: Request = bot.get_request() + assert request.method == "editMessageText" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(EditMessageText, ok=True, result=None) + + response: Union[Message, bool] = await bot.edit_message_text(text=...,) + request: Request = bot.get_request() + assert request.method == "editMessageText" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_export_chat_invite_link.py b/tests/test_api/test_methods/test_export_chat_invite_link.py new file mode 100644 index 00000000..82d72fd9 --- /dev/null +++ b/tests/test_api/test_methods/test_export_chat_invite_link.py @@ -0,0 +1,26 @@ +import pytest +from aiogram.api.methods import ExportChatInviteLink, Request +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestExportChatInviteLink: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(ExportChatInviteLink, ok=True, result=None) + + response: str = await ExportChatInviteLink(chat_id=...,) + request: Request = bot.get_request() + assert request.method == "exportChatInviteLink" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(ExportChatInviteLink, ok=True, result=None) + + response: str = await bot.export_chat_invite_link(chat_id=...,) + request: Request = bot.get_request() + assert request.method == "exportChatInviteLink" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_forward_message.py b/tests/test_api/test_methods/test_forward_message.py new file mode 100644 index 00000000..58dc6d1f --- /dev/null +++ b/tests/test_api/test_methods/test_forward_message.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import ForwardMessage, Request +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestForwardMessage: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(ForwardMessage, ok=True, result=None) + + response: Message = await ForwardMessage( + chat_id=..., from_chat_id=..., message_id=..., + ) + request: Request = bot.get_request() + assert request.method == "forwardMessage" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(ForwardMessage, ok=True, result=None) + + response: Message = await bot.forward_message( + chat_id=..., from_chat_id=..., message_id=..., + ) + request: Request = bot.get_request() + assert request.method == "forwardMessage" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_get_chat.py b/tests/test_api/test_methods/test_get_chat.py new file mode 100644 index 00000000..3ed7cbe0 --- /dev/null +++ b/tests/test_api/test_methods/test_get_chat.py @@ -0,0 +1,26 @@ +import pytest +from aiogram.api.methods import GetChat, Request +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestGetChat: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(GetChat, ok=True, result=None) + + response: Chat = await GetChat(chat_id=...,) + request: Request = bot.get_request() + assert request.method == "getChat" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(GetChat, ok=True, result=None) + + response: Chat = await bot.get_chat(chat_id=...,) + request: Request = bot.get_request() + assert request.method == "getChat" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_get_chat_administrators.py b/tests/test_api/test_methods/test_get_chat_administrators.py new file mode 100644 index 00000000..8cdba9a4 --- /dev/null +++ b/tests/test_api/test_methods/test_get_chat_administrators.py @@ -0,0 +1,26 @@ +import pytest +from aiogram.api.methods import GetChatAdministrators, Request +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestGetChatAdministrators: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(GetChatAdministrators, ok=True, result=None) + + response: List[ChatMember] = await GetChatAdministrators(chat_id=...,) + request: Request = bot.get_request() + assert request.method == "getChatAdministrators" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(GetChatAdministrators, ok=True, result=None) + + response: List[ChatMember] = await bot.get_chat_administrators(chat_id=...,) + request: Request = bot.get_request() + assert request.method == "getChatAdministrators" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_get_chat_member.py b/tests/test_api/test_methods/test_get_chat_member.py new file mode 100644 index 00000000..5ac97f8e --- /dev/null +++ b/tests/test_api/test_methods/test_get_chat_member.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import GetChatMember, Request +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestGetChatMember: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(GetChatMember, ok=True, result=None) + + response: ChatMember = await GetChatMember( + chat_id=..., user_id=..., + ) + request: Request = bot.get_request() + assert request.method == "getChatMember" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(GetChatMember, ok=True, result=None) + + response: ChatMember = await bot.get_chat_member( + chat_id=..., user_id=..., + ) + request: Request = bot.get_request() + assert request.method == "getChatMember" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_get_chat_members_count.py b/tests/test_api/test_methods/test_get_chat_members_count.py new file mode 100644 index 00000000..6fa7e0a0 --- /dev/null +++ b/tests/test_api/test_methods/test_get_chat_members_count.py @@ -0,0 +1,26 @@ +import pytest +from aiogram.api.methods import GetChatMembersCount, Request +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestGetChatMembersCount: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(GetChatMembersCount, ok=True, result=None) + + response: int = await GetChatMembersCount(chat_id=...,) + request: Request = bot.get_request() + assert request.method == "getChatMembersCount" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(GetChatMembersCount, ok=True, result=None) + + response: int = await bot.get_chat_members_count(chat_id=...,) + request: Request = bot.get_request() + assert request.method == "getChatMembersCount" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_get_file.py b/tests/test_api/test_methods/test_get_file.py new file mode 100644 index 00000000..057284f4 --- /dev/null +++ b/tests/test_api/test_methods/test_get_file.py @@ -0,0 +1,26 @@ +import pytest +from aiogram.api.methods import GetFile, Request +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestGetFile: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(GetFile, ok=True, result=None) + + response: File = await GetFile(file_id=...,) + request: Request = bot.get_request() + assert request.method == "getFile" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(GetFile, ok=True, result=None) + + response: File = await bot.get_file(file_id=...,) + request: Request = bot.get_request() + assert request.method == "getFile" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_get_game_high_scores.py b/tests/test_api/test_methods/test_get_game_high_scores.py new file mode 100644 index 00000000..60c7108e --- /dev/null +++ b/tests/test_api/test_methods/test_get_game_high_scores.py @@ -0,0 +1,26 @@ +import pytest +from aiogram.api.methods import GetGameHighScores, Request +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestGetGameHighScores: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(GetGameHighScores, ok=True, result=None) + + response: List[GameHighScore] = await GetGameHighScores(user_id=...,) + request: Request = bot.get_request() + assert request.method == "getGameHighScores" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(GetGameHighScores, ok=True, result=None) + + response: List[GameHighScore] = await bot.get_game_high_scores(user_id=...,) + request: Request = bot.get_request() + assert request.method == "getGameHighScores" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_get_sticker_set.py b/tests/test_api/test_methods/test_get_sticker_set.py new file mode 100644 index 00000000..5a23a400 --- /dev/null +++ b/tests/test_api/test_methods/test_get_sticker_set.py @@ -0,0 +1,26 @@ +import pytest +from aiogram.api.methods import GetStickerSet, Request +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestGetStickerSet: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(GetStickerSet, ok=True, result=None) + + response: StickerSet = await GetStickerSet(name=...,) + request: Request = bot.get_request() + assert request.method == "getStickerSet" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(GetStickerSet, ok=True, result=None) + + response: StickerSet = await bot.get_sticker_set(name=...,) + request: Request = bot.get_request() + assert request.method == "getStickerSet" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_get_updates.py b/tests/test_api/test_methods/test_get_updates.py new file mode 100644 index 00000000..5bbefdad --- /dev/null +++ b/tests/test_api/test_methods/test_get_updates.py @@ -0,0 +1,26 @@ +import pytest +from aiogram.api.methods import GetUpdates, Request +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestGetUpdates: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(GetUpdates, ok=True, result=None) + + response: List[Update] = await GetUpdates() + request: Request = bot.get_request() + assert request.method == "getUpdates" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(GetUpdates, ok=True, result=None) + + response: List[Update] = await bot.get_updates() + request: Request = bot.get_request() + assert request.method == "getUpdates" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_get_user_profile_photos.py b/tests/test_api/test_methods/test_get_user_profile_photos.py new file mode 100644 index 00000000..aa710631 --- /dev/null +++ b/tests/test_api/test_methods/test_get_user_profile_photos.py @@ -0,0 +1,26 @@ +import pytest +from aiogram.api.methods import GetUserProfilePhotos, Request +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestGetUserProfilePhotos: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(GetUserProfilePhotos, ok=True, result=None) + + response: UserProfilePhotos = await GetUserProfilePhotos(user_id=...,) + request: Request = bot.get_request() + assert request.method == "getUserProfilePhotos" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(GetUserProfilePhotos, ok=True, result=None) + + response: UserProfilePhotos = await bot.get_user_profile_photos(user_id=...,) + request: Request = bot.get_request() + assert request.method == "getUserProfilePhotos" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_get_webhook_info.py b/tests/test_api/test_methods/test_get_webhook_info.py new file mode 100644 index 00000000..b6b23af5 --- /dev/null +++ b/tests/test_api/test_methods/test_get_webhook_info.py @@ -0,0 +1,26 @@ +import pytest +from aiogram.api.methods import GetWebhookInfo, Request +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestGetWebhookInfo: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(GetWebhookInfo, ok=True, result=None) + + response: WebhookInfo = await GetWebhookInfo() + request: Request = bot.get_request() + assert request.method == "getWebhookInfo" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(GetWebhookInfo, ok=True, result=None) + + response: WebhookInfo = await bot.get_webhook_info() + request: Request = bot.get_request() + assert request.method == "getWebhookInfo" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_kick_chat_member.py b/tests/test_api/test_methods/test_kick_chat_member.py new file mode 100644 index 00000000..45c61e3d --- /dev/null +++ b/tests/test_api/test_methods/test_kick_chat_member.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import KickChatMember, Request +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestKickChatMember: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(KickChatMember, ok=True, result=None) + + response: bool = await KickChatMember( + chat_id=..., user_id=..., + ) + request: Request = bot.get_request() + assert request.method == "kickChatMember" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(KickChatMember, ok=True, result=None) + + response: bool = await bot.kick_chat_member( + chat_id=..., user_id=..., + ) + request: Request = bot.get_request() + assert request.method == "kickChatMember" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_leave_chat.py b/tests/test_api/test_methods/test_leave_chat.py new file mode 100644 index 00000000..f791b154 --- /dev/null +++ b/tests/test_api/test_methods/test_leave_chat.py @@ -0,0 +1,26 @@ +import pytest +from aiogram.api.methods import LeaveChat, Request +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestLeaveChat: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(LeaveChat, ok=True, result=None) + + response: bool = await LeaveChat(chat_id=...,) + request: Request = bot.get_request() + assert request.method == "leaveChat" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(LeaveChat, ok=True, result=None) + + response: bool = await bot.leave_chat(chat_id=...,) + request: Request = bot.get_request() + assert request.method == "leaveChat" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_pin_chat_message.py b/tests/test_api/test_methods/test_pin_chat_message.py new file mode 100644 index 00000000..a6cfb1ac --- /dev/null +++ b/tests/test_api/test_methods/test_pin_chat_message.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import PinChatMessage, Request +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestPinChatMessage: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(PinChatMessage, ok=True, result=None) + + response: bool = await PinChatMessage( + chat_id=..., message_id=..., + ) + request: Request = bot.get_request() + assert request.method == "pinChatMessage" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(PinChatMessage, ok=True, result=None) + + response: bool = await bot.pin_chat_message( + chat_id=..., message_id=..., + ) + request: Request = bot.get_request() + assert request.method == "pinChatMessage" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_promote_chat_member.py b/tests/test_api/test_methods/test_promote_chat_member.py new file mode 100644 index 00000000..eed01f39 --- /dev/null +++ b/tests/test_api/test_methods/test_promote_chat_member.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import PromoteChatMember, Request +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestPromoteChatMember: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(PromoteChatMember, ok=True, result=None) + + response: bool = await PromoteChatMember( + chat_id=..., user_id=..., + ) + request: Request = bot.get_request() + assert request.method == "promoteChatMember" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(PromoteChatMember, ok=True, result=None) + + response: bool = await bot.promote_chat_member( + chat_id=..., user_id=..., + ) + request: Request = bot.get_request() + assert request.method == "promoteChatMember" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_restrict_chat_member.py b/tests/test_api/test_methods/test_restrict_chat_member.py new file mode 100644 index 00000000..f5779dbd --- /dev/null +++ b/tests/test_api/test_methods/test_restrict_chat_member.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import Request, RestrictChatMember +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestRestrictChatMember: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(RestrictChatMember, ok=True, result=None) + + response: bool = await RestrictChatMember( + chat_id=..., user_id=..., permissions=..., + ) + request: Request = bot.get_request() + assert request.method == "restrictChatMember" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(RestrictChatMember, ok=True, result=None) + + response: bool = await bot.restrict_chat_member( + chat_id=..., user_id=..., permissions=..., + ) + request: Request = bot.get_request() + assert request.method == "restrictChatMember" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_send_animation.py b/tests/test_api/test_methods/test_send_animation.py new file mode 100644 index 00000000..478f2a22 --- /dev/null +++ b/tests/test_api/test_methods/test_send_animation.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import Request, SendAnimation +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestSendAnimation: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SendAnimation, ok=True, result=None) + + response: Message = await SendAnimation( + chat_id=..., animation=..., + ) + request: Request = bot.get_request() + assert request.method == "sendAnimation" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SendAnimation, ok=True, result=None) + + response: Message = await bot.send_animation( + chat_id=..., animation=..., + ) + request: Request = bot.get_request() + assert request.method == "sendAnimation" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_send_audio.py b/tests/test_api/test_methods/test_send_audio.py new file mode 100644 index 00000000..c5a4d789 --- /dev/null +++ b/tests/test_api/test_methods/test_send_audio.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import Request, SendAudio +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestSendAudio: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SendAudio, ok=True, result=None) + + response: Message = await SendAudio( + chat_id=..., audio=..., + ) + request: Request = bot.get_request() + assert request.method == "sendAudio" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SendAudio, ok=True, result=None) + + response: Message = await bot.send_audio( + chat_id=..., audio=..., + ) + request: Request = bot.get_request() + assert request.method == "sendAudio" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_send_chat_action.py b/tests/test_api/test_methods/test_send_chat_action.py new file mode 100644 index 00000000..aaa64539 --- /dev/null +++ b/tests/test_api/test_methods/test_send_chat_action.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import Request, SendChatAction +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestSendChatAction: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SendChatAction, ok=True, result=None) + + response: bool = await SendChatAction( + chat_id=..., action=..., + ) + request: Request = bot.get_request() + assert request.method == "sendChatAction" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SendChatAction, ok=True, result=None) + + response: bool = await bot.send_chat_action( + chat_id=..., action=..., + ) + request: Request = bot.get_request() + assert request.method == "sendChatAction" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_send_contact.py b/tests/test_api/test_methods/test_send_contact.py new file mode 100644 index 00000000..22a056cb --- /dev/null +++ b/tests/test_api/test_methods/test_send_contact.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import Request, SendContact +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestSendContact: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SendContact, ok=True, result=None) + + response: Message = await SendContact( + chat_id=..., phone_number=..., first_name=..., + ) + request: Request = bot.get_request() + assert request.method == "sendContact" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SendContact, ok=True, result=None) + + response: Message = await bot.send_contact( + chat_id=..., phone_number=..., first_name=..., + ) + request: Request = bot.get_request() + assert request.method == "sendContact" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_send_document.py b/tests/test_api/test_methods/test_send_document.py new file mode 100644 index 00000000..69fbd458 --- /dev/null +++ b/tests/test_api/test_methods/test_send_document.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import Request, SendDocument +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestSendDocument: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SendDocument, ok=True, result=None) + + response: Message = await SendDocument( + chat_id=..., document=..., + ) + request: Request = bot.get_request() + assert request.method == "sendDocument" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SendDocument, ok=True, result=None) + + response: Message = await bot.send_document( + chat_id=..., document=..., + ) + request: Request = bot.get_request() + assert request.method == "sendDocument" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_send_game.py b/tests/test_api/test_methods/test_send_game.py new file mode 100644 index 00000000..7726becc --- /dev/null +++ b/tests/test_api/test_methods/test_send_game.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import Request, SendGame +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestSendGame: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SendGame, ok=True, result=None) + + response: Message = await SendGame( + chat_id=..., game_short_name=..., + ) + request: Request = bot.get_request() + assert request.method == "sendGame" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SendGame, ok=True, result=None) + + response: Message = await bot.send_game( + chat_id=..., game_short_name=..., + ) + request: Request = bot.get_request() + assert request.method == "sendGame" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_send_invoice.py b/tests/test_api/test_methods/test_send_invoice.py new file mode 100644 index 00000000..93f94cdb --- /dev/null +++ b/tests/test_api/test_methods/test_send_invoice.py @@ -0,0 +1,44 @@ +import pytest +from aiogram.api.methods import Request, SendInvoice +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestSendInvoice: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SendInvoice, ok=True, result=None) + + response: Message = await SendInvoice( + chat_id=..., + title=..., + description=..., + payload=..., + provider_token=..., + start_parameter=..., + currency=..., + prices=..., + ) + request: Request = bot.get_request() + assert request.method == "sendInvoice" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SendInvoice, ok=True, result=None) + + response: Message = await bot.send_invoice( + chat_id=..., + title=..., + description=..., + payload=..., + provider_token=..., + start_parameter=..., + currency=..., + prices=..., + ) + request: Request = bot.get_request() + assert request.method == "sendInvoice" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_send_location.py b/tests/test_api/test_methods/test_send_location.py new file mode 100644 index 00000000..7caf659b --- /dev/null +++ b/tests/test_api/test_methods/test_send_location.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import Request, SendLocation +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestSendLocation: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SendLocation, ok=True, result=None) + + response: Message = await SendLocation( + chat_id=..., latitude=..., longitude=..., + ) + request: Request = bot.get_request() + assert request.method == "sendLocation" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SendLocation, ok=True, result=None) + + response: Message = await bot.send_location( + chat_id=..., latitude=..., longitude=..., + ) + request: Request = bot.get_request() + assert request.method == "sendLocation" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_send_media_group.py b/tests/test_api/test_methods/test_send_media_group.py new file mode 100644 index 00000000..bfec3864 --- /dev/null +++ b/tests/test_api/test_methods/test_send_media_group.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import Request, SendMediaGroup +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestSendMediaGroup: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SendMediaGroup, ok=True, result=None) + + response: List[Message] = await SendMediaGroup( + chat_id=..., media=..., + ) + request: Request = bot.get_request() + assert request.method == "sendMediaGroup" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SendMediaGroup, ok=True, result=None) + + response: List[Message] = await bot.send_media_group( + chat_id=..., media=..., + ) + request: Request = bot.get_request() + assert request.method == "sendMediaGroup" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_send_message.py b/tests/test_api/test_methods/test_send_message.py new file mode 100644 index 00000000..68492ff0 --- /dev/null +++ b/tests/test_api/test_methods/test_send_message.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import Request, SendMessage +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestSendMessage: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SendMessage, ok=True, result=None) + + response: Message = await SendMessage( + chat_id=..., text=..., + ) + request: Request = bot.get_request() + assert request.method == "sendMessage" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SendMessage, ok=True, result=None) + + response: Message = await bot.send_message( + chat_id=..., text=..., + ) + request: Request = bot.get_request() + assert request.method == "sendMessage" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_send_photo.py b/tests/test_api/test_methods/test_send_photo.py new file mode 100644 index 00000000..d62af71a --- /dev/null +++ b/tests/test_api/test_methods/test_send_photo.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import Request, SendPhoto +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestSendPhoto: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SendPhoto, ok=True, result=None) + + response: Message = await SendPhoto( + chat_id=..., photo=..., + ) + request: Request = bot.get_request() + assert request.method == "sendPhoto" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SendPhoto, ok=True, result=None) + + response: Message = await bot.send_photo( + chat_id=..., photo=..., + ) + request: Request = bot.get_request() + assert request.method == "sendPhoto" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_send_poll.py b/tests/test_api/test_methods/test_send_poll.py new file mode 100644 index 00000000..bdcded0e --- /dev/null +++ b/tests/test_api/test_methods/test_send_poll.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import Request, SendPoll +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestSendPoll: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SendPoll, ok=True, result=None) + + response: Message = await SendPoll( + chat_id=..., question=..., options=..., + ) + request: Request = bot.get_request() + assert request.method == "sendPoll" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SendPoll, ok=True, result=None) + + response: Message = await bot.send_poll( + chat_id=..., question=..., options=..., + ) + request: Request = bot.get_request() + assert request.method == "sendPoll" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_send_sticker.py b/tests/test_api/test_methods/test_send_sticker.py new file mode 100644 index 00000000..e5d68b4f --- /dev/null +++ b/tests/test_api/test_methods/test_send_sticker.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import Request, SendSticker +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestSendSticker: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SendSticker, ok=True, result=None) + + response: Message = await SendSticker( + chat_id=..., sticker=..., + ) + request: Request = bot.get_request() + assert request.method == "sendSticker" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SendSticker, ok=True, result=None) + + response: Message = await bot.send_sticker( + chat_id=..., sticker=..., + ) + request: Request = bot.get_request() + assert request.method == "sendSticker" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_send_venue.py b/tests/test_api/test_methods/test_send_venue.py new file mode 100644 index 00000000..18f56024 --- /dev/null +++ b/tests/test_api/test_methods/test_send_venue.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import Request, SendVenue +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestSendVenue: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SendVenue, ok=True, result=None) + + response: Message = await SendVenue( + chat_id=..., latitude=..., longitude=..., title=..., address=..., + ) + request: Request = bot.get_request() + assert request.method == "sendVenue" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SendVenue, ok=True, result=None) + + response: Message = await bot.send_venue( + chat_id=..., latitude=..., longitude=..., title=..., address=..., + ) + request: Request = bot.get_request() + assert request.method == "sendVenue" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_send_video.py b/tests/test_api/test_methods/test_send_video.py new file mode 100644 index 00000000..cfcacfd4 --- /dev/null +++ b/tests/test_api/test_methods/test_send_video.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import Request, SendVideo +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestSendVideo: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SendVideo, ok=True, result=None) + + response: Message = await SendVideo( + chat_id=..., video=..., + ) + request: Request = bot.get_request() + assert request.method == "sendVideo" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SendVideo, ok=True, result=None) + + response: Message = await bot.send_video( + chat_id=..., video=..., + ) + request: Request = bot.get_request() + assert request.method == "sendVideo" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_send_video_note.py b/tests/test_api/test_methods/test_send_video_note.py new file mode 100644 index 00000000..4d19d62a --- /dev/null +++ b/tests/test_api/test_methods/test_send_video_note.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import Request, SendVideoNote +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestSendVideoNote: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SendVideoNote, ok=True, result=None) + + response: Message = await SendVideoNote( + chat_id=..., video_note=..., + ) + request: Request = bot.get_request() + assert request.method == "sendVideoNote" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SendVideoNote, ok=True, result=None) + + response: Message = await bot.send_video_note( + chat_id=..., video_note=..., + ) + request: Request = bot.get_request() + assert request.method == "sendVideoNote" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_send_voice.py b/tests/test_api/test_methods/test_send_voice.py new file mode 100644 index 00000000..6ee4fd2b --- /dev/null +++ b/tests/test_api/test_methods/test_send_voice.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import Request, SendVoice +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestSendVoice: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SendVoice, ok=True, result=None) + + response: Message = await SendVoice( + chat_id=..., voice=..., + ) + request: Request = bot.get_request() + assert request.method == "sendVoice" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SendVoice, ok=True, result=None) + + response: Message = await bot.send_voice( + chat_id=..., voice=..., + ) + request: Request = bot.get_request() + assert request.method == "sendVoice" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_set_chat_description.py b/tests/test_api/test_methods/test_set_chat_description.py new file mode 100644 index 00000000..c889995c --- /dev/null +++ b/tests/test_api/test_methods/test_set_chat_description.py @@ -0,0 +1,26 @@ +import pytest +from aiogram.api.methods import Request, SetChatDescription +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestSetChatDescription: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SetChatDescription, ok=True, result=None) + + response: bool = await SetChatDescription(chat_id=...,) + request: Request = bot.get_request() + assert request.method == "setChatDescription" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SetChatDescription, ok=True, result=None) + + response: bool = await bot.set_chat_description(chat_id=...,) + request: Request = bot.get_request() + assert request.method == "setChatDescription" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_set_chat_permissions.py b/tests/test_api/test_methods/test_set_chat_permissions.py new file mode 100644 index 00000000..4d1692f8 --- /dev/null +++ b/tests/test_api/test_methods/test_set_chat_permissions.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import Request, SetChatPermissions +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestSetChatPermissions: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SetChatPermissions, ok=True, result=None) + + response: bool = await SetChatPermissions( + chat_id=..., permissions=..., + ) + request: Request = bot.get_request() + assert request.method == "setChatPermissions" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SetChatPermissions, ok=True, result=None) + + response: bool = await bot.set_chat_permissions( + chat_id=..., permissions=..., + ) + request: Request = bot.get_request() + assert request.method == "setChatPermissions" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_set_chat_photo.py b/tests/test_api/test_methods/test_set_chat_photo.py new file mode 100644 index 00000000..52ec7646 --- /dev/null +++ b/tests/test_api/test_methods/test_set_chat_photo.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import Request, SetChatPhoto +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestSetChatPhoto: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SetChatPhoto, ok=True, result=None) + + response: bool = await SetChatPhoto( + chat_id=..., photo=..., + ) + request: Request = bot.get_request() + assert request.method == "setChatPhoto" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SetChatPhoto, ok=True, result=None) + + response: bool = await bot.set_chat_photo( + chat_id=..., photo=..., + ) + request: Request = bot.get_request() + assert request.method == "setChatPhoto" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_set_chat_sticker_set.py b/tests/test_api/test_methods/test_set_chat_sticker_set.py new file mode 100644 index 00000000..ab73950d --- /dev/null +++ b/tests/test_api/test_methods/test_set_chat_sticker_set.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import Request, SetChatStickerSet +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestSetChatStickerSet: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SetChatStickerSet, ok=True, result=None) + + response: bool = await SetChatStickerSet( + chat_id=..., sticker_set_name=..., + ) + request: Request = bot.get_request() + assert request.method == "setChatStickerSet" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SetChatStickerSet, ok=True, result=None) + + response: bool = await bot.set_chat_sticker_set( + chat_id=..., sticker_set_name=..., + ) + request: Request = bot.get_request() + assert request.method == "setChatStickerSet" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_set_chat_title.py b/tests/test_api/test_methods/test_set_chat_title.py new file mode 100644 index 00000000..58e3e9ca --- /dev/null +++ b/tests/test_api/test_methods/test_set_chat_title.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import Request, SetChatTitle +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestSetChatTitle: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SetChatTitle, ok=True, result=None) + + response: bool = await SetChatTitle( + chat_id=..., title=..., + ) + request: Request = bot.get_request() + assert request.method == "setChatTitle" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SetChatTitle, ok=True, result=None) + + response: bool = await bot.set_chat_title( + chat_id=..., title=..., + ) + request: Request = bot.get_request() + assert request.method == "setChatTitle" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_set_game_score.py b/tests/test_api/test_methods/test_set_game_score.py new file mode 100644 index 00000000..631eaf06 --- /dev/null +++ b/tests/test_api/test_methods/test_set_game_score.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import Request, SetGameScore +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestSetGameScore: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SetGameScore, ok=True, result=None) + + response: Union[Message, bool] = await SetGameScore( + user_id=..., score=..., + ) + request: Request = bot.get_request() + assert request.method == "setGameScore" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SetGameScore, ok=True, result=None) + + response: Union[Message, bool] = await bot.set_game_score( + user_id=..., score=..., + ) + request: Request = bot.get_request() + assert request.method == "setGameScore" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_set_passport_data_errors.py b/tests/test_api/test_methods/test_set_passport_data_errors.py new file mode 100644 index 00000000..7e479c1f --- /dev/null +++ b/tests/test_api/test_methods/test_set_passport_data_errors.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import Request, SetPassportDataErrors +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestSetPassportDataErrors: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SetPassportDataErrors, ok=True, result=None) + + response: bool = await SetPassportDataErrors( + user_id=..., errors=..., + ) + request: Request = bot.get_request() + assert request.method == "setPassportDataErrors" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SetPassportDataErrors, ok=True, result=None) + + response: bool = await bot.set_passport_data_errors( + user_id=..., errors=..., + ) + request: Request = bot.get_request() + assert request.method == "setPassportDataErrors" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_set_sticker_position_in_set.py b/tests/test_api/test_methods/test_set_sticker_position_in_set.py new file mode 100644 index 00000000..bf589b74 --- /dev/null +++ b/tests/test_api/test_methods/test_set_sticker_position_in_set.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import Request, SetStickerPositionInSet +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestSetStickerPositionInSet: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SetStickerPositionInSet, ok=True, result=None) + + response: bool = await SetStickerPositionInSet( + sticker=..., position=..., + ) + request: Request = bot.get_request() + assert request.method == "setStickerPositionInSet" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SetStickerPositionInSet, ok=True, result=None) + + response: bool = await bot.set_sticker_position_in_set( + sticker=..., position=..., + ) + request: Request = bot.get_request() + assert request.method == "setStickerPositionInSet" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_set_webhook.py b/tests/test_api/test_methods/test_set_webhook.py new file mode 100644 index 00000000..e42743e0 --- /dev/null +++ b/tests/test_api/test_methods/test_set_webhook.py @@ -0,0 +1,26 @@ +import pytest +from aiogram.api.methods import Request, SetWebhook +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestSetWebhook: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SetWebhook, ok=True, result=None) + + response: bool = await SetWebhook(url=...,) + request: Request = bot.get_request() + assert request.method == "setWebhook" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(SetWebhook, ok=True, result=None) + + response: bool = await bot.set_webhook(url=...,) + request: Request = bot.get_request() + assert request.method == "setWebhook" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_stop_message_live_location.py b/tests/test_api/test_methods/test_stop_message_live_location.py new file mode 100644 index 00000000..7ff8ecf1 --- /dev/null +++ b/tests/test_api/test_methods/test_stop_message_live_location.py @@ -0,0 +1,26 @@ +import pytest +from aiogram.api.methods import Request, StopMessageLiveLocation +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestStopMessageLiveLocation: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(StopMessageLiveLocation, ok=True, result=None) + + response: Union[Message, bool] = await StopMessageLiveLocation() + request: Request = bot.get_request() + assert request.method == "stopMessageLiveLocation" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(StopMessageLiveLocation, ok=True, result=None) + + response: Union[Message, bool] = await bot.stop_message_live_location() + request: Request = bot.get_request() + assert request.method == "stopMessageLiveLocation" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_stop_poll.py b/tests/test_api/test_methods/test_stop_poll.py new file mode 100644 index 00000000..a47b49f5 --- /dev/null +++ b/tests/test_api/test_methods/test_stop_poll.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import Request, StopPoll +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestStopPoll: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(StopPoll, ok=True, result=None) + + response: Poll = await StopPoll( + chat_id=..., message_id=..., + ) + request: Request = bot.get_request() + assert request.method == "stopPoll" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(StopPoll, ok=True, result=None) + + response: Poll = await bot.stop_poll( + chat_id=..., message_id=..., + ) + request: Request = bot.get_request() + assert request.method == "stopPoll" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_unban_chat_member.py b/tests/test_api/test_methods/test_unban_chat_member.py new file mode 100644 index 00000000..84ed8573 --- /dev/null +++ b/tests/test_api/test_methods/test_unban_chat_member.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import Request, UnbanChatMember +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestUnbanChatMember: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(UnbanChatMember, ok=True, result=None) + + response: bool = await UnbanChatMember( + chat_id=..., user_id=..., + ) + request: Request = bot.get_request() + assert request.method == "unbanChatMember" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(UnbanChatMember, ok=True, result=None) + + response: bool = await bot.unban_chat_member( + chat_id=..., user_id=..., + ) + request: Request = bot.get_request() + assert request.method == "unbanChatMember" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_unpin_chat_message.py b/tests/test_api/test_methods/test_unpin_chat_message.py new file mode 100644 index 00000000..e439178b --- /dev/null +++ b/tests/test_api/test_methods/test_unpin_chat_message.py @@ -0,0 +1,26 @@ +import pytest +from aiogram.api.methods import Request, UnpinChatMessage +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestUnpinChatMessage: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(UnpinChatMessage, ok=True, result=None) + + response: bool = await UnpinChatMessage(chat_id=...,) + request: Request = bot.get_request() + assert request.method == "unpinChatMessage" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(UnpinChatMessage, ok=True, result=None) + + response: bool = await bot.unpin_chat_message(chat_id=...,) + request: Request = bot.get_request() + assert request.method == "unpinChatMessage" + # assert request.data == {} + assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_upload_sticker_file.py b/tests/test_api/test_methods/test_upload_sticker_file.py new file mode 100644 index 00000000..f19664fd --- /dev/null +++ b/tests/test_api/test_methods/test_upload_sticker_file.py @@ -0,0 +1,30 @@ +import pytest +from aiogram.api.methods import Request, UploadStickerFile +from tests.mocked_bot import MockedBot + + +@pytest.mark.skip +class TestUploadStickerFile: + @pytest.mark.asyncio + async def test_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(UploadStickerFile, ok=True, result=None) + + response: File = await UploadStickerFile( + user_id=..., png_sticker=..., + ) + request: Request = bot.get_request() + assert request.method == "uploadStickerFile" + # assert request.data == {} + assert response == prepare_result.result + + @pytest.mark.asyncio + async def test_bot_method(self, bot: MockedBot): + prepare_result = bot.add_result_for(UploadStickerFile, ok=True, result=None) + + response: File = await bot.upload_sticker_file( + user_id=..., png_sticker=..., + ) + request: Request = bot.get_request() + assert request.method == "uploadStickerFile" + # assert request.data == {} + assert response == prepare_result.result From e1b2226d0396ab8496f93d9717251ba0f9ff1c1d Mon Sep 17 00:00:00 2001 From: Alex Root Junior Date: Tue, 19 Nov 2019 00:04:02 +0200 Subject: [PATCH 4/6] Enable 37 auto-generated tests --- .../test_methods/test_add_sticker_to_set.py | 12 +++---- .../test_answer_callback_query.py | 12 +++---- .../test_methods/test_answer_inline_query.py | 13 ++++--- .../test_answer_pre_checkout_query.py | 14 +++----- .../test_answer_shipping_query.py | 16 +++------ .../test_create_new_sticker_set.py | 12 +++---- .../test_methods/test_delete_chat_photo.py | 12 +++---- .../test_delete_chat_sticker_set.py | 12 +++---- .../test_methods/test_delete_message.py | 15 +++----- .../test_delete_sticker_from_set.py | 11 +++--- .../test_methods/test_delete_webhook.py | 7 ++-- .../test_methods/test_edit_message_caption.py | 29 ++++++++++++--- .../test_edit_message_live_location.py | 14 ++++---- .../test_methods/test_edit_message_media.py | 14 ++++---- .../test_edit_message_reply_markup.py | 30 ++++++++++++---- .../test_methods/test_edit_message_text.py | 18 ++++++---- .../test_export_chat_invite_link.py | 15 ++++---- .../test_methods/test_forward_message.py | 34 +++++++++++++----- tests/test_api/test_methods/test_get_chat.py | 16 +++++---- .../test_get_chat_administrators.py | 27 +++++++++----- .../test_methods/test_get_chat_member.py | 24 +++++++------ .../test_get_chat_members_count.py | 11 +++--- tests/test_api/test_methods/test_get_file.py | 12 +++---- .../test_methods/test_get_game_high_scores.py | 30 ++++++++++++---- .../test_methods/test_get_sticker_set.py | 32 +++++++++++++---- .../test_api/test_methods/test_get_updates.py | 10 +++--- .../test_get_user_profile_photos.py | 23 ++++++++---- .../test_methods/test_get_webhook_info.py | 20 ++++++++--- .../test_methods/test_kick_chat_member.py | 11 +++--- .../test_api/test_methods/test_leave_chat.py | 11 +++--- .../test_methods/test_pin_chat_message.py | 11 +++--- .../test_methods/test_promote_chat_member.py | 15 +++----- .../test_methods/test_restrict_chat_member.py | 12 +++---- .../test_methods/test_send_animation.py | 36 +++++++++++++------ .../test_api/test_methods/test_send_audio.py | 36 +++++++++++++------ .../test_methods/test_send_chat_action.py | 15 +++----- .../test_methods/test_send_contact.py | 32 +++++++++++------ 37 files changed, 387 insertions(+), 287 deletions(-) diff --git a/tests/test_api/test_methods/test_add_sticker_to_set.py b/tests/test_api/test_methods/test_add_sticker_to_set.py index 0bc5217d..8c91423e 100644 --- a/tests/test_api/test_methods/test_add_sticker_to_set.py +++ b/tests/test_api/test_methods/test_add_sticker_to_set.py @@ -1,30 +1,28 @@ import pytest + from aiogram.api.methods import AddStickerToSet, Request from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestAddStickerToSet: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(AddStickerToSet, ok=True, result=None) + prepare_result = bot.add_result_for(AddStickerToSet, ok=True, result=True) response: bool = await AddStickerToSet( - user_id=..., name=..., png_sticker=..., emojis=..., + user_id=42, name="test stickers pack", png_sticker="file id", emojis=":)" ) request: Request = bot.get_request() assert request.method == "addStickerToSet" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(AddStickerToSet, ok=True, result=None) + prepare_result = bot.add_result_for(AddStickerToSet, ok=True, result=True) response: bool = await bot.add_sticker_to_set( - user_id=..., name=..., png_sticker=..., emojis=..., + user_id=42, name="test stickers pack", png_sticker="file id", emojis=":)" ) request: Request = bot.get_request() assert request.method == "addStickerToSet" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_answer_callback_query.py b/tests/test_api/test_methods/test_answer_callback_query.py index c8d537f4..d2617b38 100644 --- a/tests/test_api/test_methods/test_answer_callback_query.py +++ b/tests/test_api/test_methods/test_answer_callback_query.py @@ -1,26 +1,24 @@ import pytest + from aiogram.api.methods import AnswerCallbackQuery, Request from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestAnswerCallbackQuery: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(AnswerCallbackQuery, ok=True, result=None) + prepare_result = bot.add_result_for(AnswerCallbackQuery, ok=True, result=True) - response: bool = await AnswerCallbackQuery(callback_query_id=...,) + response: bool = await AnswerCallbackQuery(callback_query_id="cq id", text="OK") request: Request = bot.get_request() assert request.method == "answerCallbackQuery" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(AnswerCallbackQuery, ok=True, result=None) + prepare_result = bot.add_result_for(AnswerCallbackQuery, ok=True, result=True) - response: bool = await bot.answer_callback_query(callback_query_id=...,) + response: bool = await bot.answer_callback_query(callback_query_id="cq id", text="OK") request: Request = bot.get_request() assert request.method == "answerCallbackQuery" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_answer_inline_query.py b/tests/test_api/test_methods/test_answer_inline_query.py index 1dc92bf1..e802a2a8 100644 --- a/tests/test_api/test_methods/test_answer_inline_query.py +++ b/tests/test_api/test_methods/test_answer_inline_query.py @@ -1,30 +1,29 @@ import pytest + from aiogram.api.methods import AnswerInlineQuery, Request +from aiogram.api.types import InlineQueryResult from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestAnswerInlineQuery: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(AnswerInlineQuery, ok=True, result=None) + prepare_result = bot.add_result_for(AnswerInlineQuery, ok=True, result=True) response: bool = await AnswerInlineQuery( - inline_query_id=..., results=..., + inline_query_id="query id", results=[InlineQueryResult()] ) request: Request = bot.get_request() assert request.method == "answerInlineQuery" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(AnswerInlineQuery, ok=True, result=None) + prepare_result = bot.add_result_for(AnswerInlineQuery, ok=True, result=True) response: bool = await bot.answer_inline_query( - inline_query_id=..., results=..., + inline_query_id="query id", results=[InlineQueryResult()] ) request: Request = bot.get_request() assert request.method == "answerInlineQuery" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_answer_pre_checkout_query.py b/tests/test_api/test_methods/test_answer_pre_checkout_query.py index e4276399..0d49e8e5 100644 --- a/tests/test_api/test_methods/test_answer_pre_checkout_query.py +++ b/tests/test_api/test_methods/test_answer_pre_checkout_query.py @@ -1,30 +1,26 @@ import pytest + from aiogram.api.methods import AnswerPreCheckoutQuery, Request from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestAnswerPreCheckoutQuery: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(AnswerPreCheckoutQuery, ok=True, result=None) + prepare_result = bot.add_result_for(AnswerPreCheckoutQuery, ok=True, result=True) - response: bool = await AnswerPreCheckoutQuery( - pre_checkout_query_id=..., ok=..., - ) + response: bool = await AnswerPreCheckoutQuery(pre_checkout_query_id="query id", ok=True) request: Request = bot.get_request() assert request.method == "answerPreCheckoutQuery" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(AnswerPreCheckoutQuery, ok=True, result=None) + prepare_result = bot.add_result_for(AnswerPreCheckoutQuery, ok=True, result=True) response: bool = await bot.answer_pre_checkout_query( - pre_checkout_query_id=..., ok=..., + pre_checkout_query_id="query id", ok=True ) request: Request = bot.get_request() assert request.method == "answerPreCheckoutQuery" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_answer_shipping_query.py b/tests/test_api/test_methods/test_answer_shipping_query.py index d57349f2..9a0f1a9e 100644 --- a/tests/test_api/test_methods/test_answer_shipping_query.py +++ b/tests/test_api/test_methods/test_answer_shipping_query.py @@ -1,30 +1,24 @@ import pytest + from aiogram.api.methods import AnswerShippingQuery, Request from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestAnswerShippingQuery: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(AnswerShippingQuery, ok=True, result=None) + prepare_result = bot.add_result_for(AnswerShippingQuery, ok=True, result=True) - response: bool = await AnswerShippingQuery( - shipping_query_id=..., ok=..., - ) + response: bool = await AnswerShippingQuery(shipping_query_id="query id", ok=True) request: Request = bot.get_request() assert request.method == "answerShippingQuery" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(AnswerShippingQuery, ok=True, result=None) + prepare_result = bot.add_result_for(AnswerShippingQuery, ok=True, result=True) - response: bool = await bot.answer_shipping_query( - shipping_query_id=..., ok=..., - ) + response: bool = await bot.answer_shipping_query(shipping_query_id="query id", ok=True) request: Request = bot.get_request() assert request.method == "answerShippingQuery" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_create_new_sticker_set.py b/tests/test_api/test_methods/test_create_new_sticker_set.py index 561f3d2d..17b8b049 100644 --- a/tests/test_api/test_methods/test_create_new_sticker_set.py +++ b/tests/test_api/test_methods/test_create_new_sticker_set.py @@ -1,30 +1,28 @@ import pytest + from aiogram.api.methods import CreateNewStickerSet, Request from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestCreateNewStickerSet: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(CreateNewStickerSet, ok=True, result=None) + prepare_result = bot.add_result_for(CreateNewStickerSet, ok=True, result=True) response: bool = await CreateNewStickerSet( - user_id=..., name=..., title=..., png_sticker=..., emojis=..., + user_id=42, name="name", title="title", png_sticker="file id", emojis=":)" ) request: Request = bot.get_request() assert request.method == "createNewStickerSet" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(CreateNewStickerSet, ok=True, result=None) + prepare_result = bot.add_result_for(CreateNewStickerSet, ok=True, result=True) response: bool = await bot.create_new_sticker_set( - user_id=..., name=..., title=..., png_sticker=..., emojis=..., + user_id=42, name="name", title="title", png_sticker="file id", emojis=":)" ) request: Request = bot.get_request() assert request.method == "createNewStickerSet" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_delete_chat_photo.py b/tests/test_api/test_methods/test_delete_chat_photo.py index ea473aed..293a7b0e 100644 --- a/tests/test_api/test_methods/test_delete_chat_photo.py +++ b/tests/test_api/test_methods/test_delete_chat_photo.py @@ -1,26 +1,24 @@ import pytest + from aiogram.api.methods import DeleteChatPhoto, Request from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestDeleteChatPhoto: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(DeleteChatPhoto, ok=True, result=None) + prepare_result = bot.add_result_for(DeleteChatPhoto, ok=True, result=True) - response: bool = await DeleteChatPhoto(chat_id=...,) + response: bool = await DeleteChatPhoto(chat_id=42) request: Request = bot.get_request() assert request.method == "deleteChatPhoto" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(DeleteChatPhoto, ok=True, result=None) + prepare_result = bot.add_result_for(DeleteChatPhoto, ok=True, result=True) - response: bool = await bot.delete_chat_photo(chat_id=...,) + response: bool = await bot.delete_chat_photo(chat_id=42) request: Request = bot.get_request() assert request.method == "deleteChatPhoto" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_delete_chat_sticker_set.py b/tests/test_api/test_methods/test_delete_chat_sticker_set.py index f2d4edad..618903ec 100644 --- a/tests/test_api/test_methods/test_delete_chat_sticker_set.py +++ b/tests/test_api/test_methods/test_delete_chat_sticker_set.py @@ -1,26 +1,24 @@ import pytest + from aiogram.api.methods import DeleteChatStickerSet, Request from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestDeleteChatStickerSet: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(DeleteChatStickerSet, ok=True, result=None) + prepare_result = bot.add_result_for(DeleteChatStickerSet, ok=True, result=True) - response: bool = await DeleteChatStickerSet(chat_id=...,) + response: bool = await DeleteChatStickerSet(chat_id=42) request: Request = bot.get_request() assert request.method == "deleteChatStickerSet" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(DeleteChatStickerSet, ok=True, result=None) + prepare_result = bot.add_result_for(DeleteChatStickerSet, ok=True, result=True) - response: bool = await bot.delete_chat_sticker_set(chat_id=...,) + response: bool = await bot.delete_chat_sticker_set(chat_id=42) request: Request = bot.get_request() assert request.method == "deleteChatStickerSet" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_delete_message.py b/tests/test_api/test_methods/test_delete_message.py index be12ea13..286f2d6b 100644 --- a/tests/test_api/test_methods/test_delete_message.py +++ b/tests/test_api/test_methods/test_delete_message.py @@ -3,28 +3,21 @@ from aiogram.api.methods import DeleteMessage, Request from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestDeleteMessage: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(DeleteMessage, ok=True, result=None) + prepare_result = bot.add_result_for(DeleteMessage, ok=True, result=True) - response: bool = await DeleteMessage( - chat_id=..., message_id=..., - ) + response: bool = await DeleteMessage(chat_id=42, message_id=42) request: Request = bot.get_request() assert request.method == "deleteMessage" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(DeleteMessage, ok=True, result=None) + prepare_result = bot.add_result_for(DeleteMessage, ok=True, result=True) - response: bool = await bot.delete_message( - chat_id=..., message_id=..., - ) + response: bool = await bot.delete_message(chat_id=42, message_id=42) request: Request = bot.get_request() assert request.method == "deleteMessage" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_delete_sticker_from_set.py b/tests/test_api/test_methods/test_delete_sticker_from_set.py index d3e0866e..a0e02c69 100644 --- a/tests/test_api/test_methods/test_delete_sticker_from_set.py +++ b/tests/test_api/test_methods/test_delete_sticker_from_set.py @@ -3,24 +3,21 @@ from aiogram.api.methods import DeleteStickerFromSet, Request from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestDeleteStickerFromSet: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(DeleteStickerFromSet, ok=True, result=None) + prepare_result = bot.add_result_for(DeleteStickerFromSet, ok=True, result=True) - response: bool = await DeleteStickerFromSet(sticker=...,) + response: bool = await DeleteStickerFromSet(sticker="sticker id") request: Request = bot.get_request() assert request.method == "deleteStickerFromSet" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(DeleteStickerFromSet, ok=True, result=None) + prepare_result = bot.add_result_for(DeleteStickerFromSet, ok=True, result=True) - response: bool = await bot.delete_sticker_from_set(sticker=...,) + response: bool = await bot.delete_sticker_from_set(sticker="sticker id") request: Request = bot.get_request() assert request.method == "deleteStickerFromSet" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_delete_webhook.py b/tests/test_api/test_methods/test_delete_webhook.py index b431288d..16b8e1c6 100644 --- a/tests/test_api/test_methods/test_delete_webhook.py +++ b/tests/test_api/test_methods/test_delete_webhook.py @@ -3,24 +3,21 @@ from aiogram.api.methods import DeleteWebhook, Request from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestDeleteWebhook: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(DeleteWebhook, ok=True, result=None) + prepare_result = bot.add_result_for(DeleteWebhook, ok=True, result=True) response: bool = await DeleteWebhook() request: Request = bot.get_request() assert request.method == "deleteWebhook" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(DeleteWebhook, ok=True, result=None) + prepare_result = bot.add_result_for(DeleteWebhook, ok=True, result=True) response: bool = await bot.delete_webhook() request: Request = bot.get_request() assert request.method == "deleteWebhook" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_edit_message_caption.py b/tests/test_api/test_methods/test_edit_message_caption.py index 42db4ac8..0a1796cb 100644 --- a/tests/test_api/test_methods/test_edit_message_caption.py +++ b/tests/test_api/test_methods/test_edit_message_caption.py @@ -1,26 +1,45 @@ +import datetime +from typing import Union + import pytest from aiogram.api.methods import EditMessageCaption, Request +from aiogram.api.types import Chat, Message from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestEditMessageCaption: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(EditMessageCaption, ok=True, result=None) + prepare_result = bot.add_result_for( + EditMessageCaption, + ok=True, + result=Message( + message_id=42, + date=datetime.datetime.now(), + text="text", + chat=Chat(id=42, type="private"), + ), + ) response: Union[Message, bool] = await EditMessageCaption() request: Request = bot.get_request() assert request.method == "editMessageCaption" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(EditMessageCaption, ok=True, result=None) + prepare_result = bot.add_result_for( + EditMessageCaption, + ok=True, + result=Message( + message_id=42, + date=datetime.datetime.now(), + text="text", + chat=Chat(id=42, type="private"), + ), + ) response: Union[Message, bool] = await bot.edit_message_caption() request: Request = bot.get_request() assert request.method == "editMessageCaption" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_edit_message_live_location.py b/tests/test_api/test_methods/test_edit_message_live_location.py index 07b61a9d..1e8dcfe9 100644 --- a/tests/test_api/test_methods/test_edit_message_live_location.py +++ b/tests/test_api/test_methods/test_edit_message_live_location.py @@ -1,30 +1,30 @@ +from typing import Union + import pytest from aiogram.api.methods import EditMessageLiveLocation, Request +from aiogram.api.types import Message from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestEditMessageLiveLocation: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(EditMessageLiveLocation, ok=True, result=None) + prepare_result = bot.add_result_for(EditMessageLiveLocation, ok=True, result=True) response: Union[Message, bool] = await EditMessageLiveLocation( - latitude=..., longitude=..., + latitude=3.141592, longitude=3.141592, ) request: Request = bot.get_request() assert request.method == "editMessageLiveLocation" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(EditMessageLiveLocation, ok=True, result=None) + prepare_result = bot.add_result_for(EditMessageLiveLocation, ok=True, result=True) response: Union[Message, bool] = await bot.edit_message_live_location( - latitude=..., longitude=..., + latitude=3.141592, longitude=3.141592, ) request: Request = bot.get_request() assert request.method == "editMessageLiveLocation" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_edit_message_media.py b/tests/test_api/test_methods/test_edit_message_media.py index a7f3a23b..e3a4bb0a 100644 --- a/tests/test_api/test_methods/test_edit_message_media.py +++ b/tests/test_api/test_methods/test_edit_message_media.py @@ -1,26 +1,26 @@ +from typing import Union + import pytest from aiogram.api.methods import EditMessageMedia, Request +from aiogram.api.types import InputMedia, Message from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestEditMessageMedia: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(EditMessageMedia, ok=True, result=None) + prepare_result = bot.add_result_for(EditMessageMedia, ok=True, result=True) - response: Union[Message, bool] = await EditMessageMedia(media=...,) + response: Union[Message, bool] = await EditMessageMedia(media=InputMedia()) request: Request = bot.get_request() assert request.method == "editMessageMedia" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(EditMessageMedia, ok=True, result=None) + prepare_result = bot.add_result_for(EditMessageMedia, ok=True, result=True) - response: Union[Message, bool] = await bot.edit_message_media(media=...,) + response: Union[Message, bool] = await bot.edit_message_media(media=InputMedia()) request: Request = bot.get_request() assert request.method == "editMessageMedia" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_edit_message_reply_markup.py b/tests/test_api/test_methods/test_edit_message_reply_markup.py index df4c6a48..46629595 100644 --- a/tests/test_api/test_methods/test_edit_message_reply_markup.py +++ b/tests/test_api/test_methods/test_edit_message_reply_markup.py @@ -1,26 +1,42 @@ +from typing import Union + import pytest from aiogram.api.methods import EditMessageReplyMarkup, Request +from aiogram.api.types import InlineKeyboardButton, InlineKeyboardMarkup, Message from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestEditMessageReplyMarkup: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(EditMessageReplyMarkup, ok=True, result=None) + prepare_result = bot.add_result_for(EditMessageReplyMarkup, ok=True, result=True) - response: Union[Message, bool] = await EditMessageReplyMarkup() + response: Union[Message, bool] = await EditMessageReplyMarkup( + chat_id=42, + inline_message_id="inline message id", + reply_markup=InlineKeyboardMarkup( + inline_keyboard=[ + [InlineKeyboardButton(text="button", callback_data="placeholder")] + ] + ), + ) request: Request = bot.get_request() assert request.method == "editMessageReplyMarkup" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(EditMessageReplyMarkup, ok=True, result=None) + prepare_result = bot.add_result_for(EditMessageReplyMarkup, ok=True, result=True) - response: Union[Message, bool] = await bot.edit_message_reply_markup() + response: Union[Message, bool] = await bot.edit_message_reply_markup( + chat_id=42, + inline_message_id="inline message id", + reply_markup=InlineKeyboardMarkup( + inline_keyboard=[ + [InlineKeyboardButton(text="button", callback_data="placeholder")] + ] + ), + ) request: Request = bot.get_request() assert request.method == "editMessageReplyMarkup" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_edit_message_text.py b/tests/test_api/test_methods/test_edit_message_text.py index a5db3dc6..724f7ce4 100644 --- a/tests/test_api/test_methods/test_edit_message_text.py +++ b/tests/test_api/test_methods/test_edit_message_text.py @@ -1,26 +1,30 @@ +from typing import Union + import pytest from aiogram.api.methods import EditMessageText, Request +from aiogram.api.types import Message from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestEditMessageText: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(EditMessageText, ok=True, result=None) + prepare_result = bot.add_result_for(EditMessageText, ok=True, result=True) - response: Union[Message, bool] = await EditMessageText(text=...,) + response: Union[Message, bool] = await EditMessageText( + chat_id=42, inline_message_id="inline message id", text="text" + ) request: Request = bot.get_request() assert request.method == "editMessageText" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(EditMessageText, ok=True, result=None) + prepare_result = bot.add_result_for(EditMessageText, ok=True, result=True) - response: Union[Message, bool] = await bot.edit_message_text(text=...,) + response: Union[Message, bool] = await bot.edit_message_text( + chat_id=42, inline_message_id="inline message id", text="text" + ) request: Request = bot.get_request() assert request.method == "editMessageText" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_export_chat_invite_link.py b/tests/test_api/test_methods/test_export_chat_invite_link.py index 82d72fd9..c28e7451 100644 --- a/tests/test_api/test_methods/test_export_chat_invite_link.py +++ b/tests/test_api/test_methods/test_export_chat_invite_link.py @@ -3,24 +3,25 @@ from aiogram.api.methods import ExportChatInviteLink, Request from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestExportChatInviteLink: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(ExportChatInviteLink, ok=True, result=None) + prepare_result = bot.add_result_for( + ExportChatInviteLink, ok=True, result="http://example.com" + ) - response: str = await ExportChatInviteLink(chat_id=...,) + response: str = await ExportChatInviteLink(chat_id=42) request: Request = bot.get_request() assert request.method == "exportChatInviteLink" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(ExportChatInviteLink, ok=True, result=None) + prepare_result = bot.add_result_for( + ExportChatInviteLink, ok=True, result="http://example.com" + ) - response: str = await bot.export_chat_invite_link(chat_id=...,) + response: str = await bot.export_chat_invite_link(chat_id=42) request: Request = bot.get_request() assert request.method == "exportChatInviteLink" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_forward_message.py b/tests/test_api/test_methods/test_forward_message.py index 58dc6d1f..6ea4e0ab 100644 --- a/tests/test_api/test_methods/test_forward_message.py +++ b/tests/test_api/test_methods/test_forward_message.py @@ -1,17 +1,26 @@ +import datetime + import pytest from aiogram.api.methods import ForwardMessage, Request +from aiogram.api.types import Chat, Message from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestForwardMessage: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(ForwardMessage, ok=True, result=None) - - response: Message = await ForwardMessage( - chat_id=..., from_chat_id=..., message_id=..., + prepare_result = bot.add_result_for( + ForwardMessage, + ok=True, + result=Message( + message_id=42, + date=datetime.datetime.now(), + chat=Chat(id=42, title="chat", type="private"), + text="text", + ), ) + + response: Message = await ForwardMessage(chat_id=42, from_chat_id=42, message_id=42) request: Request = bot.get_request() assert request.method == "forwardMessage" # assert request.data == {} @@ -19,11 +28,18 @@ class TestForwardMessage: @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(ForwardMessage, ok=True, result=None) - - response: Message = await bot.forward_message( - chat_id=..., from_chat_id=..., message_id=..., + prepare_result = bot.add_result_for( + ForwardMessage, + ok=True, + result=Message( + message_id=42, + date=datetime.datetime.now(), + chat=Chat(id=42, title="chat", type="private"), + text="text", + ), ) + + response: Message = await bot.forward_message(chat_id=42, from_chat_id=42, message_id=42) request: Request = bot.get_request() assert request.method == "forwardMessage" # assert request.data == {} diff --git a/tests/test_api/test_methods/test_get_chat.py b/tests/test_api/test_methods/test_get_chat.py index 3ed7cbe0..0bb78101 100644 --- a/tests/test_api/test_methods/test_get_chat.py +++ b/tests/test_api/test_methods/test_get_chat.py @@ -1,26 +1,28 @@ import pytest from aiogram.api.methods import GetChat, Request +from aiogram.api.types import Chat from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestGetChat: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(GetChat, ok=True, result=None) + prepare_result = bot.add_result_for( + GetChat, ok=True, result=Chat(id=-42, type="channel", title="chat") + ) - response: Chat = await GetChat(chat_id=...,) + response: Chat = await GetChat(chat_id=-42) request: Request = bot.get_request() assert request.method == "getChat" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(GetChat, ok=True, result=None) + prepare_result = bot.add_result_for( + GetChat, ok=True, result=Chat(id=-42, type="channel", title="chat") + ) - response: Chat = await bot.get_chat(chat_id=...,) + response: Chat = await bot.get_chat(chat_id=-42) request: Request = bot.get_request() assert request.method == "getChat" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_get_chat_administrators.py b/tests/test_api/test_methods/test_get_chat_administrators.py index 8cdba9a4..acfd6929 100644 --- a/tests/test_api/test_methods/test_get_chat_administrators.py +++ b/tests/test_api/test_methods/test_get_chat_administrators.py @@ -1,26 +1,37 @@ +from typing import List + import pytest from aiogram.api.methods import GetChatAdministrators, Request +from aiogram.api.types import ChatMember, User from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestGetChatAdministrators: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(GetChatAdministrators, ok=True, result=None) + prepare_result = bot.add_result_for( + GetChatAdministrators, + ok=True, + result=[ + ChatMember(user=User(id=42, is_bot=False, first_name="User"), status="creator") + ], + ) - response: List[ChatMember] = await GetChatAdministrators(chat_id=...,) + response: List[ChatMember] = await GetChatAdministrators(chat_id=-42) request: Request = bot.get_request() assert request.method == "getChatAdministrators" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(GetChatAdministrators, ok=True, result=None) - - response: List[ChatMember] = await bot.get_chat_administrators(chat_id=...,) + prepare_result = bot.add_result_for( + GetChatAdministrators, + ok=True, + result=[ + ChatMember(user=User(id=42, is_bot=False, first_name="User"), status="creator") + ], + ) + response: List[ChatMember] = await bot.get_chat_administrators(chat_id=-42) request: Request = bot.get_request() assert request.method == "getChatAdministrators" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_get_chat_member.py b/tests/test_api/test_methods/test_get_chat_member.py index 5ac97f8e..2a3e22a1 100644 --- a/tests/test_api/test_methods/test_get_chat_member.py +++ b/tests/test_api/test_methods/test_get_chat_member.py @@ -1,30 +1,32 @@ import pytest from aiogram.api.methods import GetChatMember, Request +from aiogram.api.types import ChatMember, User from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestGetChatMember: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(GetChatMember, ok=True, result=None) - - response: ChatMember = await GetChatMember( - chat_id=..., user_id=..., + prepare_result = bot.add_result_for( + GetChatMember, + ok=True, + result=ChatMember(user=User(id=42, is_bot=False, first_name="User"), status="creator"), ) + + response: ChatMember = await GetChatMember(chat_id=-42, user_id=42) request: Request = bot.get_request() assert request.method == "getChatMember" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(GetChatMember, ok=True, result=None) - - response: ChatMember = await bot.get_chat_member( - chat_id=..., user_id=..., + prepare_result = bot.add_result_for( + GetChatMember, + ok=True, + result=ChatMember(user=User(id=42, is_bot=False, first_name="User"), status="creator"), ) + + response: ChatMember = await bot.get_chat_member(chat_id=-42, user_id=42) request: Request = bot.get_request() assert request.method == "getChatMember" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_get_chat_members_count.py b/tests/test_api/test_methods/test_get_chat_members_count.py index 6fa7e0a0..4436fc96 100644 --- a/tests/test_api/test_methods/test_get_chat_members_count.py +++ b/tests/test_api/test_methods/test_get_chat_members_count.py @@ -3,24 +3,21 @@ from aiogram.api.methods import GetChatMembersCount, Request from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestGetChatMembersCount: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(GetChatMembersCount, ok=True, result=None) + prepare_result = bot.add_result_for(GetChatMembersCount, ok=True, result=42) - response: int = await GetChatMembersCount(chat_id=...,) + response: int = await GetChatMembersCount(chat_id=-42,) request: Request = bot.get_request() assert request.method == "getChatMembersCount" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(GetChatMembersCount, ok=True, result=None) + prepare_result = bot.add_result_for(GetChatMembersCount, ok=True, result=42) - response: int = await bot.get_chat_members_count(chat_id=...,) + response: int = await bot.get_chat_members_count(chat_id=-42,) request: Request = bot.get_request() assert request.method == "getChatMembersCount" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_get_file.py b/tests/test_api/test_methods/test_get_file.py index 057284f4..7c2f53af 100644 --- a/tests/test_api/test_methods/test_get_file.py +++ b/tests/test_api/test_methods/test_get_file.py @@ -1,26 +1,24 @@ import pytest from aiogram.api.methods import GetFile, Request +from aiogram.api.types import File from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestGetFile: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(GetFile, ok=True, result=None) + prepare_result = bot.add_result_for(GetFile, ok=True, result=File(file_id="file id")) - response: File = await GetFile(file_id=...,) + response: File = await GetFile(file_id="file id") request: Request = bot.get_request() assert request.method == "getFile" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(GetFile, ok=True, result=None) + prepare_result = bot.add_result_for(GetFile, ok=True, result=File(file_id="file id")) - response: File = await bot.get_file(file_id=...,) + response: File = await bot.get_file(file_id="file id") request: Request = bot.get_request() assert request.method == "getFile" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_get_game_high_scores.py b/tests/test_api/test_methods/test_get_game_high_scores.py index 60c7108e..08eb25e9 100644 --- a/tests/test_api/test_methods/test_get_game_high_scores.py +++ b/tests/test_api/test_methods/test_get_game_high_scores.py @@ -1,26 +1,42 @@ +from typing import List + import pytest from aiogram.api.methods import GetGameHighScores, Request +from aiogram.api.types import GameHighScore, User from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestGetGameHighScores: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(GetGameHighScores, ok=True, result=None) + prepare_result = bot.add_result_for( + GetGameHighScores, + ok=True, + result=[ + GameHighScore( + position=1, user=User(id=42, is_bot=False, first_name="User"), score=42 + ) + ], + ) - response: List[GameHighScore] = await GetGameHighScores(user_id=...,) + response: List[GameHighScore] = await GetGameHighScores(user_id=42) request: Request = bot.get_request() assert request.method == "getGameHighScores" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(GetGameHighScores, ok=True, result=None) + prepare_result = bot.add_result_for( + GetGameHighScores, + ok=True, + result=[ + GameHighScore( + position=1, user=User(id=42, is_bot=False, first_name="User"), score=42 + ) + ], + ) - response: List[GameHighScore] = await bot.get_game_high_scores(user_id=...,) + response: List[GameHighScore] = await bot.get_game_high_scores(user_id=42) request: Request = bot.get_request() assert request.method == "getGameHighScores" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_get_sticker_set.py b/tests/test_api/test_methods/test_get_sticker_set.py index 5a23a400..01b0cc83 100644 --- a/tests/test_api/test_methods/test_get_sticker_set.py +++ b/tests/test_api/test_methods/test_get_sticker_set.py @@ -1,26 +1,44 @@ import pytest from aiogram.api.methods import GetStickerSet, Request +from aiogram.api.types import Sticker, StickerSet from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestGetStickerSet: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(GetStickerSet, ok=True, result=None) + prepare_result = bot.add_result_for( + GetStickerSet, + ok=True, + result=StickerSet( + name="test", + title="test", + is_animated=False, + contains_masks=False, + stickers=[Sticker(file_id="file if", width=42, height=42, is_animated=False)], + ), + ) - response: StickerSet = await GetStickerSet(name=...,) + response: StickerSet = await GetStickerSet(name="test") request: Request = bot.get_request() assert request.method == "getStickerSet" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(GetStickerSet, ok=True, result=None) + prepare_result = bot.add_result_for( + GetStickerSet, + ok=True, + result=StickerSet( + name="test", + title="test", + is_animated=False, + contains_masks=False, + stickers=[Sticker(file_id="file if", width=42, height=42, is_animated=False)], + ), + ) - response: StickerSet = await bot.get_sticker_set(name=...,) + response: StickerSet = await bot.get_sticker_set(name="test") request: Request = bot.get_request() assert request.method == "getStickerSet" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_get_updates.py b/tests/test_api/test_methods/test_get_updates.py index 5bbefdad..cec48071 100644 --- a/tests/test_api/test_methods/test_get_updates.py +++ b/tests/test_api/test_methods/test_get_updates.py @@ -1,26 +1,26 @@ +from typing import List + import pytest from aiogram.api.methods import GetUpdates, Request +from aiogram.api.types import Update from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestGetUpdates: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(GetUpdates, ok=True, result=None) + prepare_result = bot.add_result_for(GetUpdates, ok=True, result=[Update(update_id=42)]) response: List[Update] = await GetUpdates() request: Request = bot.get_request() assert request.method == "getUpdates" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(GetUpdates, ok=True, result=None) + prepare_result = bot.add_result_for(GetUpdates, ok=True, result=[Update(update_id=42)]) response: List[Update] = await bot.get_updates() request: Request = bot.get_request() assert request.method == "getUpdates" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_get_user_profile_photos.py b/tests/test_api/test_methods/test_get_user_profile_photos.py index aa710631..ce02c162 100644 --- a/tests/test_api/test_methods/test_get_user_profile_photos.py +++ b/tests/test_api/test_methods/test_get_user_profile_photos.py @@ -1,5 +1,6 @@ import pytest from aiogram.api.methods import GetUserProfilePhotos, Request +from aiogram.api.types import PhotoSize, UserProfilePhotos from tests.mocked_bot import MockedBot @@ -7,20 +8,30 @@ from tests.mocked_bot import MockedBot class TestGetUserProfilePhotos: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(GetUserProfilePhotos, ok=True, result=None) + prepare_result = bot.add_result_for( + GetUserProfilePhotos, + ok=True, + result=UserProfilePhotos( + total_count=1, photos=[[PhotoSize(file_id="file_id", width=42, height=42)]] + ), + ) - response: UserProfilePhotos = await GetUserProfilePhotos(user_id=...,) + response: UserProfilePhotos = await GetUserProfilePhotos(user_id=42) request: Request = bot.get_request() assert request.method == "getUserProfilePhotos" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(GetUserProfilePhotos, ok=True, result=None) + prepare_result = bot.add_result_for( + GetUserProfilePhotos, + ok=True, + result=UserProfilePhotos( + total_count=1, photos=[[PhotoSize(file_id="file_id", width=42, height=42)]] + ), + ) - response: UserProfilePhotos = await bot.get_user_profile_photos(user_id=...,) + response: UserProfilePhotos = await bot.get_user_profile_photos(user_id=42) request: Request = bot.get_request() assert request.method == "getUserProfilePhotos" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_get_webhook_info.py b/tests/test_api/test_methods/test_get_webhook_info.py index b6b23af5..0ef09081 100644 --- a/tests/test_api/test_methods/test_get_webhook_info.py +++ b/tests/test_api/test_methods/test_get_webhook_info.py @@ -1,26 +1,36 @@ import pytest from aiogram.api.methods import GetWebhookInfo, Request +from aiogram.api.types import WebhookInfo from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestGetWebhookInfo: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(GetWebhookInfo, ok=True, result=None) + prepare_result = bot.add_result_for( + GetWebhookInfo, + ok=True, + result=WebhookInfo( + url="https://example.com", has_custom_certificate=False, pending_update_count=0 + ), + ) response: WebhookInfo = await GetWebhookInfo() request: Request = bot.get_request() assert request.method == "getWebhookInfo" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(GetWebhookInfo, ok=True, result=None) + prepare_result = bot.add_result_for( + GetWebhookInfo, + ok=True, + result=WebhookInfo( + url="https://example.com", has_custom_certificate=False, pending_update_count=0 + ), + ) response: WebhookInfo = await bot.get_webhook_info() request: Request = bot.get_request() assert request.method == "getWebhookInfo" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_kick_chat_member.py b/tests/test_api/test_methods/test_kick_chat_member.py index 45c61e3d..ade81c6d 100644 --- a/tests/test_api/test_methods/test_kick_chat_member.py +++ b/tests/test_api/test_methods/test_kick_chat_member.py @@ -3,28 +3,25 @@ from aiogram.api.methods import KickChatMember, Request from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestKickChatMember: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(KickChatMember, ok=True, result=None) + prepare_result = bot.add_result_for(KickChatMember, ok=True, result=True) response: bool = await KickChatMember( - chat_id=..., user_id=..., + chat_id=-42, user_id=42, ) request: Request = bot.get_request() assert request.method == "kickChatMember" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(KickChatMember, ok=True, result=None) + prepare_result = bot.add_result_for(KickChatMember, ok=True, result=True) response: bool = await bot.kick_chat_member( - chat_id=..., user_id=..., + chat_id=-42, user_id=42, ) request: Request = bot.get_request() assert request.method == "kickChatMember" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_leave_chat.py b/tests/test_api/test_methods/test_leave_chat.py index f791b154..834e9578 100644 --- a/tests/test_api/test_methods/test_leave_chat.py +++ b/tests/test_api/test_methods/test_leave_chat.py @@ -3,24 +3,21 @@ from aiogram.api.methods import LeaveChat, Request from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestLeaveChat: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(LeaveChat, ok=True, result=None) + prepare_result = bot.add_result_for(LeaveChat, ok=True, result=True) - response: bool = await LeaveChat(chat_id=...,) + response: bool = await LeaveChat(chat_id=-42,) request: Request = bot.get_request() assert request.method == "leaveChat" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(LeaveChat, ok=True, result=None) + prepare_result = bot.add_result_for(LeaveChat, ok=True, result=True) - response: bool = await bot.leave_chat(chat_id=...,) + response: bool = await bot.leave_chat(chat_id=-42,) request: Request = bot.get_request() assert request.method == "leaveChat" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_pin_chat_message.py b/tests/test_api/test_methods/test_pin_chat_message.py index a6cfb1ac..3a4c47aa 100644 --- a/tests/test_api/test_methods/test_pin_chat_message.py +++ b/tests/test_api/test_methods/test_pin_chat_message.py @@ -3,28 +3,25 @@ from aiogram.api.methods import PinChatMessage, Request from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestPinChatMessage: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(PinChatMessage, ok=True, result=None) + prepare_result = bot.add_result_for(PinChatMessage, ok=True, result=True) response: bool = await PinChatMessage( - chat_id=..., message_id=..., + chat_id=-42, message_id=42, ) request: Request = bot.get_request() assert request.method == "pinChatMessage" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(PinChatMessage, ok=True, result=None) + prepare_result = bot.add_result_for(PinChatMessage, ok=True, result=True) response: bool = await bot.pin_chat_message( - chat_id=..., message_id=..., + chat_id=-42, message_id=42, ) request: Request = bot.get_request() assert request.method == "pinChatMessage" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_promote_chat_member.py b/tests/test_api/test_methods/test_promote_chat_member.py index eed01f39..93695602 100644 --- a/tests/test_api/test_methods/test_promote_chat_member.py +++ b/tests/test_api/test_methods/test_promote_chat_member.py @@ -3,28 +3,21 @@ from aiogram.api.methods import PromoteChatMember, Request from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestPromoteChatMember: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(PromoteChatMember, ok=True, result=None) + prepare_result = bot.add_result_for(PromoteChatMember, ok=True, result=True) - response: bool = await PromoteChatMember( - chat_id=..., user_id=..., - ) + response: bool = await PromoteChatMember(chat_id=-42, user_id=42) request: Request = bot.get_request() assert request.method == "promoteChatMember" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(PromoteChatMember, ok=True, result=None) + prepare_result = bot.add_result_for(PromoteChatMember, ok=True, result=True) - response: bool = await bot.promote_chat_member( - chat_id=..., user_id=..., - ) + response: bool = await bot.promote_chat_member(chat_id=-42, user_id=42) request: Request = bot.get_request() assert request.method == "promoteChatMember" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_restrict_chat_member.py b/tests/test_api/test_methods/test_restrict_chat_member.py index f5779dbd..da0b4354 100644 --- a/tests/test_api/test_methods/test_restrict_chat_member.py +++ b/tests/test_api/test_methods/test_restrict_chat_member.py @@ -1,30 +1,28 @@ import pytest from aiogram.api.methods import Request, RestrictChatMember +from aiogram.api.types import ChatPermissions from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestRestrictChatMember: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(RestrictChatMember, ok=True, result=None) + prepare_result = bot.add_result_for(RestrictChatMember, ok=True, result=True) response: bool = await RestrictChatMember( - chat_id=..., user_id=..., permissions=..., + chat_id=-42, user_id=42, permissions=ChatPermissions(), ) request: Request = bot.get_request() assert request.method == "restrictChatMember" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(RestrictChatMember, ok=True, result=None) + prepare_result = bot.add_result_for(RestrictChatMember, ok=True, result=True) response: bool = await bot.restrict_chat_member( - chat_id=..., user_id=..., permissions=..., + chat_id=-42, user_id=42, permissions=ChatPermissions(), ) request: Request = bot.get_request() assert request.method == "restrictChatMember" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_send_animation.py b/tests/test_api/test_methods/test_send_animation.py index 478f2a22..d23a6d36 100644 --- a/tests/test_api/test_methods/test_send_animation.py +++ b/tests/test_api/test_methods/test_send_animation.py @@ -1,30 +1,44 @@ +import datetime + import pytest from aiogram.api.methods import Request, SendAnimation +from aiogram.api.types import Animation, Chat, Message from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestSendAnimation: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(SendAnimation, ok=True, result=None) - - response: Message = await SendAnimation( - chat_id=..., animation=..., + prepare_result = bot.add_result_for( + SendAnimation, + ok=True, + result=Message( + message_id=42, + date=datetime.datetime.now(), + animation=Animation(file_id="file id", width=42, height=42, duration=0), + chat=Chat(id=42, type="private"), + ), ) + + response: Message = await SendAnimation(chat_id=42, animation="file id") request: Request = bot.get_request() assert request.method == "sendAnimation" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(SendAnimation, ok=True, result=None) - - response: Message = await bot.send_animation( - chat_id=..., animation=..., + prepare_result = bot.add_result_for( + SendAnimation, + ok=True, + result=Message( + message_id=42, + date=datetime.datetime.now(), + animation=Animation(file_id="file id", width=42, height=42, duration=0), + chat=Chat(id=42, type="private"), + ), ) + + response: Message = await bot.send_animation(chat_id=42, animation="file id") request: Request = bot.get_request() assert request.method == "sendAnimation" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_send_audio.py b/tests/test_api/test_methods/test_send_audio.py index c5a4d789..fd28f61b 100644 --- a/tests/test_api/test_methods/test_send_audio.py +++ b/tests/test_api/test_methods/test_send_audio.py @@ -1,30 +1,44 @@ +import datetime + import pytest from aiogram.api.methods import Request, SendAudio +from aiogram.api.types import Audio, Chat, File, Message from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestSendAudio: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(SendAudio, ok=True, result=None) - - response: Message = await SendAudio( - chat_id=..., audio=..., + prepare_result = bot.add_result_for( + SendAudio, + ok=True, + result=Message( + message_id=42, + date=datetime.datetime.now(), + audio=Audio(file_id="file id", duration=42), + chat=Chat(id=42, type="private"), + ), ) + + response: Message = await SendAudio(chat_id=42, audio="file id") request: Request = bot.get_request() assert request.method == "sendAudio" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(SendAudio, ok=True, result=None) - - response: Message = await bot.send_audio( - chat_id=..., audio=..., + prepare_result = bot.add_result_for( + SendAudio, + ok=True, + result=Message( + message_id=42, + date=datetime.datetime.now(), + audio=Audio(file_id="file id", duration=42), + chat=Chat(id=42, type="private"), + ), ) + + response: Message = await bot.send_audio(chat_id=42, audio="file id") request: Request = bot.get_request() assert request.method == "sendAudio" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_send_chat_action.py b/tests/test_api/test_methods/test_send_chat_action.py index aaa64539..e265b264 100644 --- a/tests/test_api/test_methods/test_send_chat_action.py +++ b/tests/test_api/test_methods/test_send_chat_action.py @@ -3,28 +3,21 @@ from aiogram.api.methods import Request, SendChatAction from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestSendChatAction: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(SendChatAction, ok=True, result=None) + prepare_result = bot.add_result_for(SendChatAction, ok=True, result=True) - response: bool = await SendChatAction( - chat_id=..., action=..., - ) + response: bool = await SendChatAction(chat_id=42, action="typing") request: Request = bot.get_request() assert request.method == "sendChatAction" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(SendChatAction, ok=True, result=None) + prepare_result = bot.add_result_for(SendChatAction, ok=True, result=True) - response: bool = await bot.send_chat_action( - chat_id=..., action=..., - ) + response: bool = await bot.send_chat_action(chat_id=42, action="typing") request: Request = bot.get_request() assert request.method == "sendChatAction" - # assert request.data == {} assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_send_contact.py b/tests/test_api/test_methods/test_send_contact.py index 22a056cb..7b13af6b 100644 --- a/tests/test_api/test_methods/test_send_contact.py +++ b/tests/test_api/test_methods/test_send_contact.py @@ -1,30 +1,40 @@ +import datetime + import pytest from aiogram.api.methods import Request, SendContact +from aiogram.api.types import Chat, Contact, Message from tests.mocked_bot import MockedBot -@pytest.mark.skip class TestSendContact: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(SendContact, ok=True, result=None) - - response: Message = await SendContact( - chat_id=..., phone_number=..., first_name=..., + prepare_result = bot.add_result_for( + SendContact, + ok=True, + result=Message( + message_id=42, + date=datetime.datetime.now(), + contact=Contact(phone_number="911", first_name="911"), + chat=Chat(id=42, type="private"), + ), ) + + response: Message = await SendContact(chat_id=42, phone_number="911", first_name="911") request: Request = bot.get_request() assert request.method == "sendContact" - # assert request.data == {} assert response == prepare_result.result @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(SendContact, ok=True, result=None) + prepare_result = bot.add_result_for(SendContact, ok=True, result=Message( + message_id=42, + date=datetime.datetime.now(), + contact=Contact(phone_number="911", first_name="911"), + chat=Chat(id=42, type="private"), + ),) - response: Message = await bot.send_contact( - chat_id=..., phone_number=..., first_name=..., - ) + response: Message = await bot.send_contact(chat_id=42, phone_number="911", first_name="911") request: Request = bot.get_request() assert request.method == "sendContact" - # assert request.data == {} assert response == prepare_result.result From 5413cf4367466e83030121ba30fd28a723927b0a Mon Sep 17 00:00:00 2001 From: Alex Root Junior Date: Tue, 19 Nov 2019 00:05:19 +0200 Subject: [PATCH 5/6] Reformate tests code --- tests/mocked_bot.py | 2 +- tests/test_api/test_methods/test_delete_message.py | 1 + .../test_methods/test_delete_sticker_from_set.py | 1 + tests/test_api/test_methods/test_delete_webhook.py | 1 + .../test_methods/test_edit_message_caption.py | 1 + .../test_methods/test_edit_message_live_location.py | 5 +++-- .../test_methods/test_edit_message_media.py | 1 + .../test_methods/test_edit_message_reply_markup.py | 1 + .../test_api/test_methods/test_edit_message_text.py | 1 + .../test_methods/test_export_chat_invite_link.py | 1 + tests/test_api/test_methods/test_forward_message.py | 1 + tests/test_api/test_methods/test_get_chat.py | 1 + .../test_methods/test_get_chat_administrators.py | 1 + tests/test_api/test_methods/test_get_chat_member.py | 1 + .../test_methods/test_get_chat_members_count.py | 5 +++-- tests/test_api/test_methods/test_get_file.py | 1 + .../test_methods/test_get_game_high_scores.py | 1 + tests/test_api/test_methods/test_get_sticker_set.py | 1 + tests/test_api/test_methods/test_get_updates.py | 1 + .../test_methods/test_get_user_profile_photos.py | 1 + .../test_api/test_methods/test_get_webhook_info.py | 1 + .../test_api/test_methods/test_kick_chat_member.py | 9 +++------ tests/test_api/test_methods/test_leave_chat.py | 5 +++-- .../test_api/test_methods/test_pin_chat_message.py | 9 +++------ .../test_methods/test_promote_chat_member.py | 1 + .../test_methods/test_restrict_chat_member.py | 5 +++-- tests/test_api/test_methods/test_send_animation.py | 1 + tests/test_api/test_methods/test_send_audio.py | 1 + .../test_api/test_methods/test_send_chat_action.py | 1 + tests/test_api/test_methods/test_send_contact.py | 13 ++++++++++--- tests/test_api/test_methods/test_send_document.py | 9 +++------ tests/test_api/test_methods/test_send_game.py | 9 +++------ tests/test_api/test_methods/test_send_invoice.py | 1 + tests/test_api/test_methods/test_send_location.py | 9 +++------ .../test_api/test_methods/test_send_media_group.py | 9 +++------ tests/test_api/test_methods/test_send_message.py | 9 +++------ tests/test_api/test_methods/test_send_photo.py | 9 +++------ tests/test_api/test_methods/test_send_poll.py | 9 +++------ tests/test_api/test_methods/test_send_sticker.py | 9 +++------ tests/test_api/test_methods/test_send_venue.py | 5 +++-- tests/test_api/test_methods/test_send_video.py | 9 +++------ tests/test_api/test_methods/test_send_video_note.py | 9 +++------ tests/test_api/test_methods/test_send_voice.py | 9 +++------ .../test_methods/test_set_chat_description.py | 5 +++-- .../test_methods/test_set_chat_permissions.py | 9 +++------ tests/test_api/test_methods/test_set_chat_photo.py | 9 +++------ .../test_methods/test_set_chat_sticker_set.py | 9 +++------ tests/test_api/test_methods/test_set_chat_title.py | 9 +++------ tests/test_api/test_methods/test_set_game_score.py | 9 +++------ .../test_methods/test_set_passport_data_errors.py | 9 +++------ .../test_set_sticker_position_in_set.py | 9 +++------ tests/test_api/test_methods/test_set_webhook.py | 5 +++-- .../test_methods/test_stop_message_live_location.py | 1 + tests/test_api/test_methods/test_stop_poll.py | 9 +++------ .../test_api/test_methods/test_unban_chat_member.py | 9 +++------ .../test_methods/test_unpin_chat_message.py | 5 +++-- .../test_methods/test_upload_sticker_file.py | 9 +++------ 57 files changed, 128 insertions(+), 158 deletions(-) diff --git a/tests/mocked_bot.py b/tests/mocked_bot.py index 9a1a1609..77da88bc 100644 --- a/tests/mocked_bot.py +++ b/tests/mocked_bot.py @@ -41,7 +41,7 @@ class MockedBot(Bot): self, method: Type[TelegramMethod[T]], ok: bool, - result: Optional[T] = None, + result: T = None, description: Optional[str] = None, error_code: Optional[int] = None, migrate_to_chat_id: Optional[int] = None, diff --git a/tests/test_api/test_methods/test_delete_message.py b/tests/test_api/test_methods/test_delete_message.py index 286f2d6b..0b510abd 100644 --- a/tests/test_api/test_methods/test_delete_message.py +++ b/tests/test_api/test_methods/test_delete_message.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import DeleteMessage, Request from tests.mocked_bot import MockedBot diff --git a/tests/test_api/test_methods/test_delete_sticker_from_set.py b/tests/test_api/test_methods/test_delete_sticker_from_set.py index a0e02c69..8b344225 100644 --- a/tests/test_api/test_methods/test_delete_sticker_from_set.py +++ b/tests/test_api/test_methods/test_delete_sticker_from_set.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import DeleteStickerFromSet, Request from tests.mocked_bot import MockedBot diff --git a/tests/test_api/test_methods/test_delete_webhook.py b/tests/test_api/test_methods/test_delete_webhook.py index 16b8e1c6..22c4d5c9 100644 --- a/tests/test_api/test_methods/test_delete_webhook.py +++ b/tests/test_api/test_methods/test_delete_webhook.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import DeleteWebhook, Request from tests.mocked_bot import MockedBot diff --git a/tests/test_api/test_methods/test_edit_message_caption.py b/tests/test_api/test_methods/test_edit_message_caption.py index 0a1796cb..50fcf838 100644 --- a/tests/test_api/test_methods/test_edit_message_caption.py +++ b/tests/test_api/test_methods/test_edit_message_caption.py @@ -2,6 +2,7 @@ import datetime from typing import Union import pytest + from aiogram.api.methods import EditMessageCaption, Request from aiogram.api.types import Chat, Message from tests.mocked_bot import MockedBot diff --git a/tests/test_api/test_methods/test_edit_message_live_location.py b/tests/test_api/test_methods/test_edit_message_live_location.py index 1e8dcfe9..96e566ac 100644 --- a/tests/test_api/test_methods/test_edit_message_live_location.py +++ b/tests/test_api/test_methods/test_edit_message_live_location.py @@ -1,6 +1,7 @@ from typing import Union import pytest + from aiogram.api.methods import EditMessageLiveLocation, Request from aiogram.api.types import Message from tests.mocked_bot import MockedBot @@ -12,7 +13,7 @@ class TestEditMessageLiveLocation: prepare_result = bot.add_result_for(EditMessageLiveLocation, ok=True, result=True) response: Union[Message, bool] = await EditMessageLiveLocation( - latitude=3.141592, longitude=3.141592, + latitude=3.141592, longitude=3.141592 ) request: Request = bot.get_request() assert request.method == "editMessageLiveLocation" @@ -23,7 +24,7 @@ class TestEditMessageLiveLocation: prepare_result = bot.add_result_for(EditMessageLiveLocation, ok=True, result=True) response: Union[Message, bool] = await bot.edit_message_live_location( - latitude=3.141592, longitude=3.141592, + latitude=3.141592, longitude=3.141592 ) request: Request = bot.get_request() assert request.method == "editMessageLiveLocation" diff --git a/tests/test_api/test_methods/test_edit_message_media.py b/tests/test_api/test_methods/test_edit_message_media.py index e3a4bb0a..11f94be4 100644 --- a/tests/test_api/test_methods/test_edit_message_media.py +++ b/tests/test_api/test_methods/test_edit_message_media.py @@ -1,6 +1,7 @@ from typing import Union import pytest + from aiogram.api.methods import EditMessageMedia, Request from aiogram.api.types import InputMedia, Message from tests.mocked_bot import MockedBot diff --git a/tests/test_api/test_methods/test_edit_message_reply_markup.py b/tests/test_api/test_methods/test_edit_message_reply_markup.py index 46629595..48f69e2a 100644 --- a/tests/test_api/test_methods/test_edit_message_reply_markup.py +++ b/tests/test_api/test_methods/test_edit_message_reply_markup.py @@ -1,6 +1,7 @@ from typing import Union import pytest + from aiogram.api.methods import EditMessageReplyMarkup, Request from aiogram.api.types import InlineKeyboardButton, InlineKeyboardMarkup, Message from tests.mocked_bot import MockedBot diff --git a/tests/test_api/test_methods/test_edit_message_text.py b/tests/test_api/test_methods/test_edit_message_text.py index 724f7ce4..0e349a03 100644 --- a/tests/test_api/test_methods/test_edit_message_text.py +++ b/tests/test_api/test_methods/test_edit_message_text.py @@ -1,6 +1,7 @@ from typing import Union import pytest + from aiogram.api.methods import EditMessageText, Request from aiogram.api.types import Message from tests.mocked_bot import MockedBot diff --git a/tests/test_api/test_methods/test_export_chat_invite_link.py b/tests/test_api/test_methods/test_export_chat_invite_link.py index c28e7451..8e76e907 100644 --- a/tests/test_api/test_methods/test_export_chat_invite_link.py +++ b/tests/test_api/test_methods/test_export_chat_invite_link.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import ExportChatInviteLink, Request from tests.mocked_bot import MockedBot diff --git a/tests/test_api/test_methods/test_forward_message.py b/tests/test_api/test_methods/test_forward_message.py index 6ea4e0ab..3e2ae0d9 100644 --- a/tests/test_api/test_methods/test_forward_message.py +++ b/tests/test_api/test_methods/test_forward_message.py @@ -1,6 +1,7 @@ import datetime import pytest + from aiogram.api.methods import ForwardMessage, Request from aiogram.api.types import Chat, Message from tests.mocked_bot import MockedBot diff --git a/tests/test_api/test_methods/test_get_chat.py b/tests/test_api/test_methods/test_get_chat.py index 0bb78101..d88b5261 100644 --- a/tests/test_api/test_methods/test_get_chat.py +++ b/tests/test_api/test_methods/test_get_chat.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import GetChat, Request from aiogram.api.types import Chat from tests.mocked_bot import MockedBot diff --git a/tests/test_api/test_methods/test_get_chat_administrators.py b/tests/test_api/test_methods/test_get_chat_administrators.py index acfd6929..f5e76c2e 100644 --- a/tests/test_api/test_methods/test_get_chat_administrators.py +++ b/tests/test_api/test_methods/test_get_chat_administrators.py @@ -1,6 +1,7 @@ from typing import List import pytest + from aiogram.api.methods import GetChatAdministrators, Request from aiogram.api.types import ChatMember, User from tests.mocked_bot import MockedBot diff --git a/tests/test_api/test_methods/test_get_chat_member.py b/tests/test_api/test_methods/test_get_chat_member.py index 2a3e22a1..d63bdbd0 100644 --- a/tests/test_api/test_methods/test_get_chat_member.py +++ b/tests/test_api/test_methods/test_get_chat_member.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import GetChatMember, Request from aiogram.api.types import ChatMember, User from tests.mocked_bot import MockedBot diff --git a/tests/test_api/test_methods/test_get_chat_members_count.py b/tests/test_api/test_methods/test_get_chat_members_count.py index 4436fc96..1ae1a6e7 100644 --- a/tests/test_api/test_methods/test_get_chat_members_count.py +++ b/tests/test_api/test_methods/test_get_chat_members_count.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import GetChatMembersCount, Request from tests.mocked_bot import MockedBot @@ -8,7 +9,7 @@ class TestGetChatMembersCount: async def test_method(self, bot: MockedBot): prepare_result = bot.add_result_for(GetChatMembersCount, ok=True, result=42) - response: int = await GetChatMembersCount(chat_id=-42,) + response: int = await GetChatMembersCount(chat_id=-42) request: Request = bot.get_request() assert request.method == "getChatMembersCount" assert response == prepare_result.result @@ -17,7 +18,7 @@ class TestGetChatMembersCount: async def test_bot_method(self, bot: MockedBot): prepare_result = bot.add_result_for(GetChatMembersCount, ok=True, result=42) - response: int = await bot.get_chat_members_count(chat_id=-42,) + response: int = await bot.get_chat_members_count(chat_id=-42) request: Request = bot.get_request() assert request.method == "getChatMembersCount" assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_get_file.py b/tests/test_api/test_methods/test_get_file.py index 7c2f53af..6b8e2ff0 100644 --- a/tests/test_api/test_methods/test_get_file.py +++ b/tests/test_api/test_methods/test_get_file.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import GetFile, Request from aiogram.api.types import File from tests.mocked_bot import MockedBot diff --git a/tests/test_api/test_methods/test_get_game_high_scores.py b/tests/test_api/test_methods/test_get_game_high_scores.py index 08eb25e9..efeac5cb 100644 --- a/tests/test_api/test_methods/test_get_game_high_scores.py +++ b/tests/test_api/test_methods/test_get_game_high_scores.py @@ -1,6 +1,7 @@ from typing import List import pytest + from aiogram.api.methods import GetGameHighScores, Request from aiogram.api.types import GameHighScore, User from tests.mocked_bot import MockedBot diff --git a/tests/test_api/test_methods/test_get_sticker_set.py b/tests/test_api/test_methods/test_get_sticker_set.py index 01b0cc83..236116ce 100644 --- a/tests/test_api/test_methods/test_get_sticker_set.py +++ b/tests/test_api/test_methods/test_get_sticker_set.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import GetStickerSet, Request from aiogram.api.types import Sticker, StickerSet from tests.mocked_bot import MockedBot diff --git a/tests/test_api/test_methods/test_get_updates.py b/tests/test_api/test_methods/test_get_updates.py index cec48071..92081e7b 100644 --- a/tests/test_api/test_methods/test_get_updates.py +++ b/tests/test_api/test_methods/test_get_updates.py @@ -1,6 +1,7 @@ from typing import List import pytest + from aiogram.api.methods import GetUpdates, Request from aiogram.api.types import Update from tests.mocked_bot import MockedBot diff --git a/tests/test_api/test_methods/test_get_user_profile_photos.py b/tests/test_api/test_methods/test_get_user_profile_photos.py index ce02c162..9d277f98 100644 --- a/tests/test_api/test_methods/test_get_user_profile_photos.py +++ b/tests/test_api/test_methods/test_get_user_profile_photos.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import GetUserProfilePhotos, Request from aiogram.api.types import PhotoSize, UserProfilePhotos from tests.mocked_bot import MockedBot diff --git a/tests/test_api/test_methods/test_get_webhook_info.py b/tests/test_api/test_methods/test_get_webhook_info.py index 0ef09081..e3259125 100644 --- a/tests/test_api/test_methods/test_get_webhook_info.py +++ b/tests/test_api/test_methods/test_get_webhook_info.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import GetWebhookInfo, Request from aiogram.api.types import WebhookInfo from tests.mocked_bot import MockedBot diff --git a/tests/test_api/test_methods/test_kick_chat_member.py b/tests/test_api/test_methods/test_kick_chat_member.py index ade81c6d..f142f649 100644 --- a/tests/test_api/test_methods/test_kick_chat_member.py +++ b/tests/test_api/test_methods/test_kick_chat_member.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import KickChatMember, Request from tests.mocked_bot import MockedBot @@ -8,9 +9,7 @@ class TestKickChatMember: async def test_method(self, bot: MockedBot): prepare_result = bot.add_result_for(KickChatMember, ok=True, result=True) - response: bool = await KickChatMember( - chat_id=-42, user_id=42, - ) + response: bool = await KickChatMember(chat_id=-42, user_id=42) request: Request = bot.get_request() assert request.method == "kickChatMember" assert response == prepare_result.result @@ -19,9 +18,7 @@ class TestKickChatMember: async def test_bot_method(self, bot: MockedBot): prepare_result = bot.add_result_for(KickChatMember, ok=True, result=True) - response: bool = await bot.kick_chat_member( - chat_id=-42, user_id=42, - ) + response: bool = await bot.kick_chat_member(chat_id=-42, user_id=42) request: Request = bot.get_request() assert request.method == "kickChatMember" assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_leave_chat.py b/tests/test_api/test_methods/test_leave_chat.py index 834e9578..f9f876e6 100644 --- a/tests/test_api/test_methods/test_leave_chat.py +++ b/tests/test_api/test_methods/test_leave_chat.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import LeaveChat, Request from tests.mocked_bot import MockedBot @@ -8,7 +9,7 @@ class TestLeaveChat: async def test_method(self, bot: MockedBot): prepare_result = bot.add_result_for(LeaveChat, ok=True, result=True) - response: bool = await LeaveChat(chat_id=-42,) + response: bool = await LeaveChat(chat_id=-42) request: Request = bot.get_request() assert request.method == "leaveChat" assert response == prepare_result.result @@ -17,7 +18,7 @@ class TestLeaveChat: async def test_bot_method(self, bot: MockedBot): prepare_result = bot.add_result_for(LeaveChat, ok=True, result=True) - response: bool = await bot.leave_chat(chat_id=-42,) + response: bool = await bot.leave_chat(chat_id=-42) request: Request = bot.get_request() assert request.method == "leaveChat" assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_pin_chat_message.py b/tests/test_api/test_methods/test_pin_chat_message.py index 3a4c47aa..fa87d796 100644 --- a/tests/test_api/test_methods/test_pin_chat_message.py +++ b/tests/test_api/test_methods/test_pin_chat_message.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import PinChatMessage, Request from tests.mocked_bot import MockedBot @@ -8,9 +9,7 @@ class TestPinChatMessage: async def test_method(self, bot: MockedBot): prepare_result = bot.add_result_for(PinChatMessage, ok=True, result=True) - response: bool = await PinChatMessage( - chat_id=-42, message_id=42, - ) + response: bool = await PinChatMessage(chat_id=-42, message_id=42) request: Request = bot.get_request() assert request.method == "pinChatMessage" assert response == prepare_result.result @@ -19,9 +18,7 @@ class TestPinChatMessage: async def test_bot_method(self, bot: MockedBot): prepare_result = bot.add_result_for(PinChatMessage, ok=True, result=True) - response: bool = await bot.pin_chat_message( - chat_id=-42, message_id=42, - ) + response: bool = await bot.pin_chat_message(chat_id=-42, message_id=42) request: Request = bot.get_request() assert request.method == "pinChatMessage" assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_promote_chat_member.py b/tests/test_api/test_methods/test_promote_chat_member.py index 93695602..3b8a7797 100644 --- a/tests/test_api/test_methods/test_promote_chat_member.py +++ b/tests/test_api/test_methods/test_promote_chat_member.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import PromoteChatMember, Request from tests.mocked_bot import MockedBot diff --git a/tests/test_api/test_methods/test_restrict_chat_member.py b/tests/test_api/test_methods/test_restrict_chat_member.py index da0b4354..a48caeff 100644 --- a/tests/test_api/test_methods/test_restrict_chat_member.py +++ b/tests/test_api/test_methods/test_restrict_chat_member.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import Request, RestrictChatMember from aiogram.api.types import ChatPermissions from tests.mocked_bot import MockedBot @@ -10,7 +11,7 @@ class TestRestrictChatMember: prepare_result = bot.add_result_for(RestrictChatMember, ok=True, result=True) response: bool = await RestrictChatMember( - chat_id=-42, user_id=42, permissions=ChatPermissions(), + chat_id=-42, user_id=42, permissions=ChatPermissions() ) request: Request = bot.get_request() assert request.method == "restrictChatMember" @@ -21,7 +22,7 @@ class TestRestrictChatMember: prepare_result = bot.add_result_for(RestrictChatMember, ok=True, result=True) response: bool = await bot.restrict_chat_member( - chat_id=-42, user_id=42, permissions=ChatPermissions(), + chat_id=-42, user_id=42, permissions=ChatPermissions() ) request: Request = bot.get_request() assert request.method == "restrictChatMember" diff --git a/tests/test_api/test_methods/test_send_animation.py b/tests/test_api/test_methods/test_send_animation.py index d23a6d36..06af5218 100644 --- a/tests/test_api/test_methods/test_send_animation.py +++ b/tests/test_api/test_methods/test_send_animation.py @@ -1,6 +1,7 @@ import datetime import pytest + from aiogram.api.methods import Request, SendAnimation from aiogram.api.types import Animation, Chat, Message from tests.mocked_bot import MockedBot diff --git a/tests/test_api/test_methods/test_send_audio.py b/tests/test_api/test_methods/test_send_audio.py index fd28f61b..c15d6728 100644 --- a/tests/test_api/test_methods/test_send_audio.py +++ b/tests/test_api/test_methods/test_send_audio.py @@ -1,6 +1,7 @@ import datetime import pytest + from aiogram.api.methods import Request, SendAudio from aiogram.api.types import Audio, Chat, File, Message from tests.mocked_bot import MockedBot diff --git a/tests/test_api/test_methods/test_send_chat_action.py b/tests/test_api/test_methods/test_send_chat_action.py index e265b264..1d98b482 100644 --- a/tests/test_api/test_methods/test_send_chat_action.py +++ b/tests/test_api/test_methods/test_send_chat_action.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import Request, SendChatAction from tests.mocked_bot import MockedBot diff --git a/tests/test_api/test_methods/test_send_contact.py b/tests/test_api/test_methods/test_send_contact.py index 7b13af6b..44435d2d 100644 --- a/tests/test_api/test_methods/test_send_contact.py +++ b/tests/test_api/test_methods/test_send_contact.py @@ -1,6 +1,7 @@ import datetime import pytest + from aiogram.api.methods import Request, SendContact from aiogram.api.types import Chat, Contact, Message from tests.mocked_bot import MockedBot @@ -27,14 +28,20 @@ class TestSendContact: @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): - prepare_result = bot.add_result_for(SendContact, ok=True, result=Message( + prepare_result = bot.add_result_for( + SendContact, + ok=True, + result=Message( message_id=42, date=datetime.datetime.now(), contact=Contact(phone_number="911", first_name="911"), chat=Chat(id=42, type="private"), - ),) + ), + ) - response: Message = await bot.send_contact(chat_id=42, phone_number="911", first_name="911") + response: Message = await bot.send_contact( + chat_id=42, phone_number="911", first_name="911" + ) request: Request = bot.get_request() assert request.method == "sendContact" assert response == prepare_result.result diff --git a/tests/test_api/test_methods/test_send_document.py b/tests/test_api/test_methods/test_send_document.py index 69fbd458..c91ebfa2 100644 --- a/tests/test_api/test_methods/test_send_document.py +++ b/tests/test_api/test_methods/test_send_document.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import Request, SendDocument from tests.mocked_bot import MockedBot @@ -9,9 +10,7 @@ class TestSendDocument: async def test_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SendDocument, ok=True, result=None) - response: Message = await SendDocument( - chat_id=..., document=..., - ) + response: Message = await SendDocument(chat_id=..., document=...) request: Request = bot.get_request() assert request.method == "sendDocument" # assert request.data == {} @@ -21,9 +20,7 @@ class TestSendDocument: async def test_bot_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SendDocument, ok=True, result=None) - response: Message = await bot.send_document( - chat_id=..., document=..., - ) + response: Message = await bot.send_document(chat_id=..., document=...) request: Request = bot.get_request() assert request.method == "sendDocument" # assert request.data == {} diff --git a/tests/test_api/test_methods/test_send_game.py b/tests/test_api/test_methods/test_send_game.py index 7726becc..b2a6b114 100644 --- a/tests/test_api/test_methods/test_send_game.py +++ b/tests/test_api/test_methods/test_send_game.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import Request, SendGame from tests.mocked_bot import MockedBot @@ -9,9 +10,7 @@ class TestSendGame: async def test_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SendGame, ok=True, result=None) - response: Message = await SendGame( - chat_id=..., game_short_name=..., - ) + response: Message = await SendGame(chat_id=..., game_short_name=...) request: Request = bot.get_request() assert request.method == "sendGame" # assert request.data == {} @@ -21,9 +20,7 @@ class TestSendGame: async def test_bot_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SendGame, ok=True, result=None) - response: Message = await bot.send_game( - chat_id=..., game_short_name=..., - ) + response: Message = await bot.send_game(chat_id=..., game_short_name=...) request: Request = bot.get_request() assert request.method == "sendGame" # assert request.data == {} diff --git a/tests/test_api/test_methods/test_send_invoice.py b/tests/test_api/test_methods/test_send_invoice.py index 93f94cdb..b69272bc 100644 --- a/tests/test_api/test_methods/test_send_invoice.py +++ b/tests/test_api/test_methods/test_send_invoice.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import Request, SendInvoice from tests.mocked_bot import MockedBot diff --git a/tests/test_api/test_methods/test_send_location.py b/tests/test_api/test_methods/test_send_location.py index 7caf659b..33a2fda6 100644 --- a/tests/test_api/test_methods/test_send_location.py +++ b/tests/test_api/test_methods/test_send_location.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import Request, SendLocation from tests.mocked_bot import MockedBot @@ -9,9 +10,7 @@ class TestSendLocation: async def test_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SendLocation, ok=True, result=None) - response: Message = await SendLocation( - chat_id=..., latitude=..., longitude=..., - ) + response: Message = await SendLocation(chat_id=..., latitude=..., longitude=...) request: Request = bot.get_request() assert request.method == "sendLocation" # assert request.data == {} @@ -21,9 +20,7 @@ class TestSendLocation: async def test_bot_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SendLocation, ok=True, result=None) - response: Message = await bot.send_location( - chat_id=..., latitude=..., longitude=..., - ) + response: Message = await bot.send_location(chat_id=..., latitude=..., longitude=...) request: Request = bot.get_request() assert request.method == "sendLocation" # assert request.data == {} diff --git a/tests/test_api/test_methods/test_send_media_group.py b/tests/test_api/test_methods/test_send_media_group.py index bfec3864..7983260a 100644 --- a/tests/test_api/test_methods/test_send_media_group.py +++ b/tests/test_api/test_methods/test_send_media_group.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import Request, SendMediaGroup from tests.mocked_bot import MockedBot @@ -9,9 +10,7 @@ class TestSendMediaGroup: async def test_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SendMediaGroup, ok=True, result=None) - response: List[Message] = await SendMediaGroup( - chat_id=..., media=..., - ) + response: List[Message] = await SendMediaGroup(chat_id=..., media=...) request: Request = bot.get_request() assert request.method == "sendMediaGroup" # assert request.data == {} @@ -21,9 +20,7 @@ class TestSendMediaGroup: async def test_bot_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SendMediaGroup, ok=True, result=None) - response: List[Message] = await bot.send_media_group( - chat_id=..., media=..., - ) + response: List[Message] = await bot.send_media_group(chat_id=..., media=...) request: Request = bot.get_request() assert request.method == "sendMediaGroup" # assert request.data == {} diff --git a/tests/test_api/test_methods/test_send_message.py b/tests/test_api/test_methods/test_send_message.py index 68492ff0..6fb8d34a 100644 --- a/tests/test_api/test_methods/test_send_message.py +++ b/tests/test_api/test_methods/test_send_message.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import Request, SendMessage from tests.mocked_bot import MockedBot @@ -9,9 +10,7 @@ class TestSendMessage: async def test_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SendMessage, ok=True, result=None) - response: Message = await SendMessage( - chat_id=..., text=..., - ) + response: Message = await SendMessage(chat_id=..., text=...) request: Request = bot.get_request() assert request.method == "sendMessage" # assert request.data == {} @@ -21,9 +20,7 @@ class TestSendMessage: async def test_bot_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SendMessage, ok=True, result=None) - response: Message = await bot.send_message( - chat_id=..., text=..., - ) + response: Message = await bot.send_message(chat_id=..., text=...) request: Request = bot.get_request() assert request.method == "sendMessage" # assert request.data == {} diff --git a/tests/test_api/test_methods/test_send_photo.py b/tests/test_api/test_methods/test_send_photo.py index d62af71a..08f02ead 100644 --- a/tests/test_api/test_methods/test_send_photo.py +++ b/tests/test_api/test_methods/test_send_photo.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import Request, SendPhoto from tests.mocked_bot import MockedBot @@ -9,9 +10,7 @@ class TestSendPhoto: async def test_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SendPhoto, ok=True, result=None) - response: Message = await SendPhoto( - chat_id=..., photo=..., - ) + response: Message = await SendPhoto(chat_id=..., photo=...) request: Request = bot.get_request() assert request.method == "sendPhoto" # assert request.data == {} @@ -21,9 +20,7 @@ class TestSendPhoto: async def test_bot_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SendPhoto, ok=True, result=None) - response: Message = await bot.send_photo( - chat_id=..., photo=..., - ) + response: Message = await bot.send_photo(chat_id=..., photo=...) request: Request = bot.get_request() assert request.method == "sendPhoto" # assert request.data == {} diff --git a/tests/test_api/test_methods/test_send_poll.py b/tests/test_api/test_methods/test_send_poll.py index bdcded0e..d7a96ab1 100644 --- a/tests/test_api/test_methods/test_send_poll.py +++ b/tests/test_api/test_methods/test_send_poll.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import Request, SendPoll from tests.mocked_bot import MockedBot @@ -9,9 +10,7 @@ class TestSendPoll: async def test_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SendPoll, ok=True, result=None) - response: Message = await SendPoll( - chat_id=..., question=..., options=..., - ) + response: Message = await SendPoll(chat_id=..., question=..., options=...) request: Request = bot.get_request() assert request.method == "sendPoll" # assert request.data == {} @@ -21,9 +20,7 @@ class TestSendPoll: async def test_bot_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SendPoll, ok=True, result=None) - response: Message = await bot.send_poll( - chat_id=..., question=..., options=..., - ) + response: Message = await bot.send_poll(chat_id=..., question=..., options=...) request: Request = bot.get_request() assert request.method == "sendPoll" # assert request.data == {} diff --git a/tests/test_api/test_methods/test_send_sticker.py b/tests/test_api/test_methods/test_send_sticker.py index e5d68b4f..81a4e345 100644 --- a/tests/test_api/test_methods/test_send_sticker.py +++ b/tests/test_api/test_methods/test_send_sticker.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import Request, SendSticker from tests.mocked_bot import MockedBot @@ -9,9 +10,7 @@ class TestSendSticker: async def test_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SendSticker, ok=True, result=None) - response: Message = await SendSticker( - chat_id=..., sticker=..., - ) + response: Message = await SendSticker(chat_id=..., sticker=...) request: Request = bot.get_request() assert request.method == "sendSticker" # assert request.data == {} @@ -21,9 +20,7 @@ class TestSendSticker: async def test_bot_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SendSticker, ok=True, result=None) - response: Message = await bot.send_sticker( - chat_id=..., sticker=..., - ) + response: Message = await bot.send_sticker(chat_id=..., sticker=...) request: Request = bot.get_request() assert request.method == "sendSticker" # assert request.data == {} diff --git a/tests/test_api/test_methods/test_send_venue.py b/tests/test_api/test_methods/test_send_venue.py index 18f56024..f2d09cea 100644 --- a/tests/test_api/test_methods/test_send_venue.py +++ b/tests/test_api/test_methods/test_send_venue.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import Request, SendVenue from tests.mocked_bot import MockedBot @@ -10,7 +11,7 @@ class TestSendVenue: prepare_result = bot.add_result_for(SendVenue, ok=True, result=None) response: Message = await SendVenue( - chat_id=..., latitude=..., longitude=..., title=..., address=..., + chat_id=..., latitude=..., longitude=..., title=..., address=... ) request: Request = bot.get_request() assert request.method == "sendVenue" @@ -22,7 +23,7 @@ class TestSendVenue: prepare_result = bot.add_result_for(SendVenue, ok=True, result=None) response: Message = await bot.send_venue( - chat_id=..., latitude=..., longitude=..., title=..., address=..., + chat_id=..., latitude=..., longitude=..., title=..., address=... ) request: Request = bot.get_request() assert request.method == "sendVenue" diff --git a/tests/test_api/test_methods/test_send_video.py b/tests/test_api/test_methods/test_send_video.py index cfcacfd4..ea3c9220 100644 --- a/tests/test_api/test_methods/test_send_video.py +++ b/tests/test_api/test_methods/test_send_video.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import Request, SendVideo from tests.mocked_bot import MockedBot @@ -9,9 +10,7 @@ class TestSendVideo: async def test_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SendVideo, ok=True, result=None) - response: Message = await SendVideo( - chat_id=..., video=..., - ) + response: Message = await SendVideo(chat_id=..., video=...) request: Request = bot.get_request() assert request.method == "sendVideo" # assert request.data == {} @@ -21,9 +20,7 @@ class TestSendVideo: async def test_bot_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SendVideo, ok=True, result=None) - response: Message = await bot.send_video( - chat_id=..., video=..., - ) + response: Message = await bot.send_video(chat_id=..., video=...) request: Request = bot.get_request() assert request.method == "sendVideo" # assert request.data == {} diff --git a/tests/test_api/test_methods/test_send_video_note.py b/tests/test_api/test_methods/test_send_video_note.py index 4d19d62a..e5b27f68 100644 --- a/tests/test_api/test_methods/test_send_video_note.py +++ b/tests/test_api/test_methods/test_send_video_note.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import Request, SendVideoNote from tests.mocked_bot import MockedBot @@ -9,9 +10,7 @@ class TestSendVideoNote: async def test_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SendVideoNote, ok=True, result=None) - response: Message = await SendVideoNote( - chat_id=..., video_note=..., - ) + response: Message = await SendVideoNote(chat_id=..., video_note=...) request: Request = bot.get_request() assert request.method == "sendVideoNote" # assert request.data == {} @@ -21,9 +20,7 @@ class TestSendVideoNote: async def test_bot_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SendVideoNote, ok=True, result=None) - response: Message = await bot.send_video_note( - chat_id=..., video_note=..., - ) + response: Message = await bot.send_video_note(chat_id=..., video_note=...) request: Request = bot.get_request() assert request.method == "sendVideoNote" # assert request.data == {} diff --git a/tests/test_api/test_methods/test_send_voice.py b/tests/test_api/test_methods/test_send_voice.py index 6ee4fd2b..2bed25b6 100644 --- a/tests/test_api/test_methods/test_send_voice.py +++ b/tests/test_api/test_methods/test_send_voice.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import Request, SendVoice from tests.mocked_bot import MockedBot @@ -9,9 +10,7 @@ class TestSendVoice: async def test_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SendVoice, ok=True, result=None) - response: Message = await SendVoice( - chat_id=..., voice=..., - ) + response: Message = await SendVoice(chat_id=..., voice=...) request: Request = bot.get_request() assert request.method == "sendVoice" # assert request.data == {} @@ -21,9 +20,7 @@ class TestSendVoice: async def test_bot_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SendVoice, ok=True, result=None) - response: Message = await bot.send_voice( - chat_id=..., voice=..., - ) + response: Message = await bot.send_voice(chat_id=..., voice=...) request: Request = bot.get_request() assert request.method == "sendVoice" # assert request.data == {} diff --git a/tests/test_api/test_methods/test_set_chat_description.py b/tests/test_api/test_methods/test_set_chat_description.py index c889995c..8ac46632 100644 --- a/tests/test_api/test_methods/test_set_chat_description.py +++ b/tests/test_api/test_methods/test_set_chat_description.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import Request, SetChatDescription from tests.mocked_bot import MockedBot @@ -9,7 +10,7 @@ class TestSetChatDescription: async def test_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SetChatDescription, ok=True, result=None) - response: bool = await SetChatDescription(chat_id=...,) + response: bool = await SetChatDescription(chat_id=...) request: Request = bot.get_request() assert request.method == "setChatDescription" # assert request.data == {} @@ -19,7 +20,7 @@ class TestSetChatDescription: async def test_bot_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SetChatDescription, ok=True, result=None) - response: bool = await bot.set_chat_description(chat_id=...,) + response: bool = await bot.set_chat_description(chat_id=...) request: Request = bot.get_request() assert request.method == "setChatDescription" # assert request.data == {} diff --git a/tests/test_api/test_methods/test_set_chat_permissions.py b/tests/test_api/test_methods/test_set_chat_permissions.py index 4d1692f8..933ed677 100644 --- a/tests/test_api/test_methods/test_set_chat_permissions.py +++ b/tests/test_api/test_methods/test_set_chat_permissions.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import Request, SetChatPermissions from tests.mocked_bot import MockedBot @@ -9,9 +10,7 @@ class TestSetChatPermissions: async def test_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SetChatPermissions, ok=True, result=None) - response: bool = await SetChatPermissions( - chat_id=..., permissions=..., - ) + response: bool = await SetChatPermissions(chat_id=..., permissions=...) request: Request = bot.get_request() assert request.method == "setChatPermissions" # assert request.data == {} @@ -21,9 +20,7 @@ class TestSetChatPermissions: async def test_bot_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SetChatPermissions, ok=True, result=None) - response: bool = await bot.set_chat_permissions( - chat_id=..., permissions=..., - ) + response: bool = await bot.set_chat_permissions(chat_id=..., permissions=...) request: Request = bot.get_request() assert request.method == "setChatPermissions" # assert request.data == {} diff --git a/tests/test_api/test_methods/test_set_chat_photo.py b/tests/test_api/test_methods/test_set_chat_photo.py index 52ec7646..ce20f997 100644 --- a/tests/test_api/test_methods/test_set_chat_photo.py +++ b/tests/test_api/test_methods/test_set_chat_photo.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import Request, SetChatPhoto from tests.mocked_bot import MockedBot @@ -9,9 +10,7 @@ class TestSetChatPhoto: async def test_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SetChatPhoto, ok=True, result=None) - response: bool = await SetChatPhoto( - chat_id=..., photo=..., - ) + response: bool = await SetChatPhoto(chat_id=..., photo=...) request: Request = bot.get_request() assert request.method == "setChatPhoto" # assert request.data == {} @@ -21,9 +20,7 @@ class TestSetChatPhoto: async def test_bot_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SetChatPhoto, ok=True, result=None) - response: bool = await bot.set_chat_photo( - chat_id=..., photo=..., - ) + response: bool = await bot.set_chat_photo(chat_id=..., photo=...) request: Request = bot.get_request() assert request.method == "setChatPhoto" # assert request.data == {} diff --git a/tests/test_api/test_methods/test_set_chat_sticker_set.py b/tests/test_api/test_methods/test_set_chat_sticker_set.py index ab73950d..c8b0108e 100644 --- a/tests/test_api/test_methods/test_set_chat_sticker_set.py +++ b/tests/test_api/test_methods/test_set_chat_sticker_set.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import Request, SetChatStickerSet from tests.mocked_bot import MockedBot @@ -9,9 +10,7 @@ class TestSetChatStickerSet: async def test_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SetChatStickerSet, ok=True, result=None) - response: bool = await SetChatStickerSet( - chat_id=..., sticker_set_name=..., - ) + response: bool = await SetChatStickerSet(chat_id=..., sticker_set_name=...) request: Request = bot.get_request() assert request.method == "setChatStickerSet" # assert request.data == {} @@ -21,9 +20,7 @@ class TestSetChatStickerSet: async def test_bot_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SetChatStickerSet, ok=True, result=None) - response: bool = await bot.set_chat_sticker_set( - chat_id=..., sticker_set_name=..., - ) + response: bool = await bot.set_chat_sticker_set(chat_id=..., sticker_set_name=...) request: Request = bot.get_request() assert request.method == "setChatStickerSet" # assert request.data == {} diff --git a/tests/test_api/test_methods/test_set_chat_title.py b/tests/test_api/test_methods/test_set_chat_title.py index 58e3e9ca..cce2b768 100644 --- a/tests/test_api/test_methods/test_set_chat_title.py +++ b/tests/test_api/test_methods/test_set_chat_title.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import Request, SetChatTitle from tests.mocked_bot import MockedBot @@ -9,9 +10,7 @@ class TestSetChatTitle: async def test_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SetChatTitle, ok=True, result=None) - response: bool = await SetChatTitle( - chat_id=..., title=..., - ) + response: bool = await SetChatTitle(chat_id=..., title=...) request: Request = bot.get_request() assert request.method == "setChatTitle" # assert request.data == {} @@ -21,9 +20,7 @@ class TestSetChatTitle: async def test_bot_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SetChatTitle, ok=True, result=None) - response: bool = await bot.set_chat_title( - chat_id=..., title=..., - ) + response: bool = await bot.set_chat_title(chat_id=..., title=...) request: Request = bot.get_request() assert request.method == "setChatTitle" # assert request.data == {} diff --git a/tests/test_api/test_methods/test_set_game_score.py b/tests/test_api/test_methods/test_set_game_score.py index 631eaf06..27183a7d 100644 --- a/tests/test_api/test_methods/test_set_game_score.py +++ b/tests/test_api/test_methods/test_set_game_score.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import Request, SetGameScore from tests.mocked_bot import MockedBot @@ -9,9 +10,7 @@ class TestSetGameScore: async def test_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SetGameScore, ok=True, result=None) - response: Union[Message, bool] = await SetGameScore( - user_id=..., score=..., - ) + response: Union[Message, bool] = await SetGameScore(user_id=..., score=...) request: Request = bot.get_request() assert request.method == "setGameScore" # assert request.data == {} @@ -21,9 +20,7 @@ class TestSetGameScore: async def test_bot_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SetGameScore, ok=True, result=None) - response: Union[Message, bool] = await bot.set_game_score( - user_id=..., score=..., - ) + response: Union[Message, bool] = await bot.set_game_score(user_id=..., score=...) request: Request = bot.get_request() assert request.method == "setGameScore" # assert request.data == {} diff --git a/tests/test_api/test_methods/test_set_passport_data_errors.py b/tests/test_api/test_methods/test_set_passport_data_errors.py index 7e479c1f..fe74df09 100644 --- a/tests/test_api/test_methods/test_set_passport_data_errors.py +++ b/tests/test_api/test_methods/test_set_passport_data_errors.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import Request, SetPassportDataErrors from tests.mocked_bot import MockedBot @@ -9,9 +10,7 @@ class TestSetPassportDataErrors: async def test_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SetPassportDataErrors, ok=True, result=None) - response: bool = await SetPassportDataErrors( - user_id=..., errors=..., - ) + response: bool = await SetPassportDataErrors(user_id=..., errors=...) request: Request = bot.get_request() assert request.method == "setPassportDataErrors" # assert request.data == {} @@ -21,9 +20,7 @@ class TestSetPassportDataErrors: async def test_bot_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SetPassportDataErrors, ok=True, result=None) - response: bool = await bot.set_passport_data_errors( - user_id=..., errors=..., - ) + response: bool = await bot.set_passport_data_errors(user_id=..., errors=...) request: Request = bot.get_request() assert request.method == "setPassportDataErrors" # assert request.data == {} diff --git a/tests/test_api/test_methods/test_set_sticker_position_in_set.py b/tests/test_api/test_methods/test_set_sticker_position_in_set.py index bf589b74..a31f7920 100644 --- a/tests/test_api/test_methods/test_set_sticker_position_in_set.py +++ b/tests/test_api/test_methods/test_set_sticker_position_in_set.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import Request, SetStickerPositionInSet from tests.mocked_bot import MockedBot @@ -9,9 +10,7 @@ class TestSetStickerPositionInSet: async def test_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SetStickerPositionInSet, ok=True, result=None) - response: bool = await SetStickerPositionInSet( - sticker=..., position=..., - ) + response: bool = await SetStickerPositionInSet(sticker=..., position=...) request: Request = bot.get_request() assert request.method == "setStickerPositionInSet" # assert request.data == {} @@ -21,9 +20,7 @@ class TestSetStickerPositionInSet: async def test_bot_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SetStickerPositionInSet, ok=True, result=None) - response: bool = await bot.set_sticker_position_in_set( - sticker=..., position=..., - ) + response: bool = await bot.set_sticker_position_in_set(sticker=..., position=...) request: Request = bot.get_request() assert request.method == "setStickerPositionInSet" # assert request.data == {} diff --git a/tests/test_api/test_methods/test_set_webhook.py b/tests/test_api/test_methods/test_set_webhook.py index e42743e0..cccee5d3 100644 --- a/tests/test_api/test_methods/test_set_webhook.py +++ b/tests/test_api/test_methods/test_set_webhook.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import Request, SetWebhook from tests.mocked_bot import MockedBot @@ -9,7 +10,7 @@ class TestSetWebhook: async def test_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SetWebhook, ok=True, result=None) - response: bool = await SetWebhook(url=...,) + response: bool = await SetWebhook(url=...) request: Request = bot.get_request() assert request.method == "setWebhook" # assert request.data == {} @@ -19,7 +20,7 @@ class TestSetWebhook: async def test_bot_method(self, bot: MockedBot): prepare_result = bot.add_result_for(SetWebhook, ok=True, result=None) - response: bool = await bot.set_webhook(url=...,) + response: bool = await bot.set_webhook(url=...) request: Request = bot.get_request() assert request.method == "setWebhook" # assert request.data == {} diff --git a/tests/test_api/test_methods/test_stop_message_live_location.py b/tests/test_api/test_methods/test_stop_message_live_location.py index 7ff8ecf1..e7d927c2 100644 --- a/tests/test_api/test_methods/test_stop_message_live_location.py +++ b/tests/test_api/test_methods/test_stop_message_live_location.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import Request, StopMessageLiveLocation from tests.mocked_bot import MockedBot diff --git a/tests/test_api/test_methods/test_stop_poll.py b/tests/test_api/test_methods/test_stop_poll.py index a47b49f5..5141d2c4 100644 --- a/tests/test_api/test_methods/test_stop_poll.py +++ b/tests/test_api/test_methods/test_stop_poll.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import Request, StopPoll from tests.mocked_bot import MockedBot @@ -9,9 +10,7 @@ class TestStopPoll: async def test_method(self, bot: MockedBot): prepare_result = bot.add_result_for(StopPoll, ok=True, result=None) - response: Poll = await StopPoll( - chat_id=..., message_id=..., - ) + response: Poll = await StopPoll(chat_id=..., message_id=...) request: Request = bot.get_request() assert request.method == "stopPoll" # assert request.data == {} @@ -21,9 +20,7 @@ class TestStopPoll: async def test_bot_method(self, bot: MockedBot): prepare_result = bot.add_result_for(StopPoll, ok=True, result=None) - response: Poll = await bot.stop_poll( - chat_id=..., message_id=..., - ) + response: Poll = await bot.stop_poll(chat_id=..., message_id=...) request: Request = bot.get_request() assert request.method == "stopPoll" # assert request.data == {} diff --git a/tests/test_api/test_methods/test_unban_chat_member.py b/tests/test_api/test_methods/test_unban_chat_member.py index 84ed8573..9ca14ad2 100644 --- a/tests/test_api/test_methods/test_unban_chat_member.py +++ b/tests/test_api/test_methods/test_unban_chat_member.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import Request, UnbanChatMember from tests.mocked_bot import MockedBot @@ -9,9 +10,7 @@ class TestUnbanChatMember: async def test_method(self, bot: MockedBot): prepare_result = bot.add_result_for(UnbanChatMember, ok=True, result=None) - response: bool = await UnbanChatMember( - chat_id=..., user_id=..., - ) + response: bool = await UnbanChatMember(chat_id=..., user_id=...) request: Request = bot.get_request() assert request.method == "unbanChatMember" # assert request.data == {} @@ -21,9 +20,7 @@ class TestUnbanChatMember: async def test_bot_method(self, bot: MockedBot): prepare_result = bot.add_result_for(UnbanChatMember, ok=True, result=None) - response: bool = await bot.unban_chat_member( - chat_id=..., user_id=..., - ) + response: bool = await bot.unban_chat_member(chat_id=..., user_id=...) request: Request = bot.get_request() assert request.method == "unbanChatMember" # assert request.data == {} diff --git a/tests/test_api/test_methods/test_unpin_chat_message.py b/tests/test_api/test_methods/test_unpin_chat_message.py index e439178b..a12efeab 100644 --- a/tests/test_api/test_methods/test_unpin_chat_message.py +++ b/tests/test_api/test_methods/test_unpin_chat_message.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import Request, UnpinChatMessage from tests.mocked_bot import MockedBot @@ -9,7 +10,7 @@ class TestUnpinChatMessage: async def test_method(self, bot: MockedBot): prepare_result = bot.add_result_for(UnpinChatMessage, ok=True, result=None) - response: bool = await UnpinChatMessage(chat_id=...,) + response: bool = await UnpinChatMessage(chat_id=...) request: Request = bot.get_request() assert request.method == "unpinChatMessage" # assert request.data == {} @@ -19,7 +20,7 @@ class TestUnpinChatMessage: async def test_bot_method(self, bot: MockedBot): prepare_result = bot.add_result_for(UnpinChatMessage, ok=True, result=None) - response: bool = await bot.unpin_chat_message(chat_id=...,) + response: bool = await bot.unpin_chat_message(chat_id=...) request: Request = bot.get_request() assert request.method == "unpinChatMessage" # assert request.data == {} diff --git a/tests/test_api/test_methods/test_upload_sticker_file.py b/tests/test_api/test_methods/test_upload_sticker_file.py index f19664fd..1a24522d 100644 --- a/tests/test_api/test_methods/test_upload_sticker_file.py +++ b/tests/test_api/test_methods/test_upload_sticker_file.py @@ -1,4 +1,5 @@ import pytest + from aiogram.api.methods import Request, UploadStickerFile from tests.mocked_bot import MockedBot @@ -9,9 +10,7 @@ class TestUploadStickerFile: async def test_method(self, bot: MockedBot): prepare_result = bot.add_result_for(UploadStickerFile, ok=True, result=None) - response: File = await UploadStickerFile( - user_id=..., png_sticker=..., - ) + response: File = await UploadStickerFile(user_id=..., png_sticker=...) request: Request = bot.get_request() assert request.method == "uploadStickerFile" # assert request.data == {} @@ -21,9 +20,7 @@ class TestUploadStickerFile: async def test_bot_method(self, bot: MockedBot): prepare_result = bot.add_result_for(UploadStickerFile, ok=True, result=None) - response: File = await bot.upload_sticker_file( - user_id=..., png_sticker=..., - ) + response: File = await bot.upload_sticker_file(user_id=..., png_sticker=...) request: Request = bot.get_request() assert request.method == "uploadStickerFile" # assert request.data == {} From 2d6a9e4ff75f4f50770c6dc0eae604e03f376e1d Mon Sep 17 00:00:00 2001 From: Alex Root Junior Date: Tue, 19 Nov 2019 00:05:45 +0200 Subject: [PATCH 6/6] Fix validation error for empty files in request --- aiogram/api/methods/base.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/aiogram/api/methods/base.py b/aiogram/api/methods/base.py index 28186724..ee475913 100644 --- a/aiogram/api/methods/base.py +++ b/aiogram/api/methods/base.py @@ -54,6 +54,8 @@ class TelegramMethod(abc.ABC, BaseModel, Generic[T]): return Response[self.__returning__](**data) # type: ignore def prepare_file(self, name: str, value: Any, data: Dict[str, Any], files: Dict[str, Any]): + if not value: + return if name == "thumb": tag = secrets.token_urlsafe(10) files[tag] = value