python/aiogram
1
0
Fork 0
mirror of https://github.com/aiogram/aiogram.git synced 2026-04-08 16:37:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix: remove direct creation of Message instances

Browse source
This commit is contained in:
Egor 2020-07-08 19:24:11 +05:00
parent 5a561ea5a3
commit 54ab659a6d
2 changed files with 15 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tests/test_api/test_types/test_message.py
View file

@ -45,6 +45,7 @@ from aiogram.api.types import (
) )
from aiogram.api.types.message import ContentType, Message from aiogram.api.types.message import ContentType, Message
from tests.factories.chat import ChatFactory from tests.factories.chat import ChatFactory
from tests.factories.message import MessageFactory
from tests.factories.user import UserFactory from tests.factories.user import UserFactory
@ -53,12 +54,7 @@ class TestMessage:
"message,content_type", "message,content_type",
[ [
[ [
Message( MessageFactory(
message_id=42,
date=datetime.datetime.now(),
text="test",
chat=ChatFactory(),
from_user=UserFactory(),
), ),
ContentType.TEXT, ContentType.TEXT,
], ],

110
tests/test_dispatcher/test_filters/test_text.py
View file

@ -5,9 +5,10 @@ from typing import Sequence, Type
import pytest import pytest
from pydantic import ValidationError from pydantic import ValidationError
from aiogram.api.types import CallbackQuery, Chat, InlineQuery, Message, Poll, PollOption, User from aiogram.api.types import CallbackQuery, Chat, InlineQuery, Poll, PollOption, User, Message
from aiogram.dispatcher.filters import BUILTIN_FILTERS from aiogram.dispatcher.filters import BUILTIN_FILTERS
from aiogram.dispatcher.filters.text import Text from aiogram.dispatcher.filters.text import Text
from tests.factories.message import MessageFactory
class TestText: class TestText:
@ -55,116 +56,33 @@ class TestText:
@pytest.mark.parametrize( @pytest.mark.parametrize(
"argument,ignore_case,input_value,update_type,result", "argument,ignore_case,input_value,update_type,result",
[ [
["text", False, "test", MessageFactory(text=""), False,],
[ [
"text", "text",
False, False,
"test", "test",
Message( MessageFactory(
message_id=42,
date=datetime.datetime.now(),
chat=Chat(id=42, type="private"),
from_user=User(id=42, is_bot=False, first_name="Test"),
),
False,
],
[
"text",
False,
"test",
Message(
message_id=42, message_id=42,
date=datetime.datetime.now(), date=datetime.datetime.now(),
text="",
caption="test", caption="test",
chat=Chat(id=42, type="private"), chat=Chat(id=42, type="private"),
from_user=User(id=42, is_bot=False, first_name="Test"), from_user=User(id=42, is_bot=False, first_name="Test"),
), ),
True, True,
], ],
[ ["text", False, "test", MessageFactory(text="test"), True,],
"text", ["text", True, "TEst", MessageFactory(text="tesT"), True,],
False, ["text", False, "TEst", MessageFactory(text="tesT"), False,],
"test", ["text_startswith", False, "test", MessageFactory(text="test case"), True,],
Message( ["text_endswith", False, "case", MessageFactory(text="test case"), True,],
message_id=42, ["text_contains", False, " ", MessageFactory(text="test case"), True,],
date=datetime.datetime.now(),
text="test",
chat=Chat(id=42, type="private"),
from_user=User(id=42, is_bot=False, first_name="Test"),
),
True,
],
[
"text",
True,
"TEst",
Message(
message_id=42,
date=datetime.datetime.now(),
text="tesT",
chat=Chat(id=42, type="private"),
from_user=User(id=42, is_bot=False, first_name="Test"),
),
True,
],
[
"text",
False,
"TEst",
Message(
message_id=42,
date=datetime.datetime.now(),
text="tesT",
chat=Chat(id=42, type="private"),
from_user=User(id=42, is_bot=False, first_name="Test"),
),
False,
],
[
"text_startswith",
False,
"test",
Message(
message_id=42,
date=datetime.datetime.now(),
text="test case",
chat=Chat(id=42, type="private"),
from_user=User(id=42, is_bot=False, first_name="Test"),
),
True,
],
[
"text_endswith",
False,
"case",
Message(
message_id=42,
date=datetime.datetime.now(),
text="test case",
chat=Chat(id=42, type="private"),
from_user=User(id=42, is_bot=False, first_name="Test"),
),
True,
],
[
"text_contains",
False,
" ",
Message(
message_id=42,
date=datetime.datetime.now(),
text="test case",
chat=Chat(id=42, type="private"),
from_user=User(id=42, is_bot=False, first_name="Test"),
),
True,
],
[ [
"text_startswith", "text_startswith",
True, True,
"question", "question",
Message( MessageFactory(
message_id=42, text="",
date=datetime.datetime.now(),
poll=Poll( poll=Poll(
id="poll id", id="poll id",
question="Question?", question="Question?",
@ -175,8 +93,6 @@ class TestText:
allows_multiple_answers=False, allows_multiple_answers=False,
total_voter_count=0, total_voter_count=0,
), ),
chat=Chat(id=42, type="private"),
from_user=User(id=42, is_bot=False, first_name="Test"),
), ),
True, True,
], ],