From 6e93facffc944273a34749e3bb41bdc09eabe38e Mon Sep 17 00:00:00 2001 From: Egor Date: Fri, 3 Jul 2020 16:15:37 +0500 Subject: [PATCH] chore: lint --- tests/factories/chat_member.py | 6 +++--- tests/factories/message.py | 3 ++- tests/test_api/test_methods/test_forward_message.py | 8 ++++++-- tests/test_api/test_methods/test_get_chat.py | 8 ++------ .../test_methods/test_get_chat_administrators.py | 12 ++---------- tests/test_api/test_methods/test_send_contact.py | 4 +++- tests/test_api/test_methods/test_send_location.py | 8 ++++++-- tests/test_api/test_types/test_message.py | 4 +--- 8 files changed, 25 insertions(+), 28 deletions(-) diff --git a/tests/factories/chat_member.py b/tests/factories/chat_member.py index 3c5cba93..f1f317df 100644 --- a/tests/factories/chat_member.py +++ b/tests/factories/chat_member.py @@ -1,13 +1,13 @@ import factory -from aiogram.api.types.chat_member import ChatMemberStatus, ChatMember +from aiogram.api.types.chat_member import ChatMember, ChatMemberStatus from tests.factories.user import UserFactory class ChatMemberFactory(factory.Factory): - class Meta: + class Meta: model = ChatMember - + user = factory.SubFactory(UserFactory) status = ChatMemberStatus.ADMINISTRATOR diff --git a/tests/factories/message.py b/tests/factories/message.py index 25f44a15..e489788f 100644 --- a/tests/factories/message.py +++ b/tests/factories/message.py @@ -1,6 +1,7 @@ -import factory from datetime import datetime +import factory + from aiogram.api.types import Message from tests.factories import sequences from tests.factories.chat import ChatFactory diff --git a/tests/test_api/test_methods/test_forward_message.py b/tests/test_api/test_methods/test_forward_message.py index 6d788986..c52561e0 100644 --- a/tests/test_api/test_methods/test_forward_message.py +++ b/tests/test_api/test_methods/test_forward_message.py @@ -13,7 +13,9 @@ class TestForwardMessage: prepare_result = bot.add_result_for( ForwardMessage, ok=True, - result=Message(message_id=42, date=datetime.datetime.now(), chat=private_chat, text="text", ), + result=Message( + message_id=42, date=datetime.datetime.now(), chat=private_chat, text="text", + ), ) response: Message = await ForwardMessage( @@ -29,7 +31,9 @@ class TestForwardMessage: prepare_result = bot.add_result_for( ForwardMessage, ok=True, - result=Message(message_id=42, date=datetime.datetime.now(), chat=private_chat, text="text", ), + result=Message( + message_id=42, date=datetime.datetime.now(), chat=private_chat, text="text", + ), ) response: Message = await bot.forward_message( diff --git a/tests/test_api/test_methods/test_get_chat.py b/tests/test_api/test_methods/test_get_chat.py index f79aa49c..41b5aea8 100644 --- a/tests/test_api/test_methods/test_get_chat.py +++ b/tests/test_api/test_methods/test_get_chat.py @@ -11,9 +11,7 @@ class TestGetChat: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): channel = ChatFactory(type=ChatType.CHANNEL) - prepare_result = bot.add_result_for( - GetChat, ok=True, result=channel - ) + prepare_result = bot.add_result_for(GetChat, ok=True, result=channel) response: Chat = await GetChat(chat_id=channel.id) request: Request = bot.get_request() @@ -23,9 +21,7 @@ class TestGetChat: @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): channel = ChatFactory(type=ChatType.CHANNEL) - prepare_result = bot.add_result_for( - GetChat, ok=True, result=channel - ) + prepare_result = bot.add_result_for(GetChat, ok=True, result=channel) response: Chat = await bot.get_chat(chat_id=channel.id) request: Request = bot.get_request() 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 b24af662..dc3574bf 100644 --- a/tests/test_api/test_methods/test_get_chat_administrators.py +++ b/tests/test_api/test_methods/test_get_chat_administrators.py @@ -12,11 +12,7 @@ class TestGetChatAdministrators: @pytest.mark.asyncio async def test_method(self, bot: MockedBot): prepare_result = bot.add_result_for( - GetChatAdministrators, - ok=True, - result=[ - ChatMember(status="creator") - ], + GetChatAdministrators, ok=True, result=[ChatMember(status="creator")], ) response: List[ChatMember] = await GetChatAdministrators(chat_id=-42) @@ -27,11 +23,7 @@ class TestGetChatAdministrators: @pytest.mark.asyncio async def test_bot_method(self, bot: MockedBot): prepare_result = bot.add_result_for( - GetChatAdministrators, - ok=True, - result=[ - ChatMember(status="creator") - ], + GetChatAdministrators, ok=True, result=[ChatMember(status="creator")], ) response: List[ChatMember] = await bot.get_chat_administrators(chat_id=-42) request: Request = bot.get_request() diff --git a/tests/test_api/test_methods/test_send_contact.py b/tests/test_api/test_methods/test_send_contact.py index d7e89d40..147a70d7 100644 --- a/tests/test_api/test_methods/test_send_contact.py +++ b/tests/test_api/test_methods/test_send_contact.py @@ -21,7 +21,9 @@ class TestSendContact: ), ) - response: Message = await SendContact(chat_id=private_chat.id, phone_number="911", first_name="911") + response: Message = await SendContact( + chat_id=private_chat.id, 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_location.py b/tests/test_api/test_methods/test_send_location.py index 49a64d99..7d0cc9cb 100644 --- a/tests/test_api/test_methods/test_send_location.py +++ b/tests/test_api/test_methods/test_send_location.py @@ -21,7 +21,9 @@ class TestSendLocation: ), ) - response: Message = await SendLocation(chat_id=private_chat.id, latitude=3.14, longitude=3.14) + response: Message = await SendLocation( + chat_id=private_chat.id, latitude=3.14, longitude=3.14 + ) request: Request = bot.get_request() assert request.method == "sendLocation" assert response == prepare_result.result @@ -39,7 +41,9 @@ class TestSendLocation: ), ) - response: Message = await bot.send_location(chat_id=private_chat.id, latitude=3.14, longitude=3.14) + response: Message = await bot.send_location( + chat_id=private_chat.id, latitude=3.14, longitude=3.14 + ) request: Request = bot.get_request() assert request.method == "sendLocation" assert response == prepare_result.result diff --git a/tests/test_api/test_types/test_message.py b/tests/test_api/test_types/test_message.py index c8cb59a2..ee146734 100644 --- a/tests/test_api/test_types/test_message.py +++ b/tests/test_api/test_types/test_message.py @@ -484,9 +484,7 @@ class TestMessage: ] ], ): - message = Message( - message_id=42, chat=ChatFactory(), date=datetime.datetime.now() - ) + message = Message(message_id=42, chat=ChatFactory(), date=datetime.datetime.now()) alias_name = "_".join(item for item in [alias_type, alias_for_method] if item) alias = getattr(message, alias_name)