python/aiogram
1
0
Fork 0
mirror of https://github.com/aiogram/aiogram.git synced 2025-12-14 19:00:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update KeyboardBuilder utility, fixed type-hints for button method, a… (#1399)

Browse source 
* Update KeyboardBuilder utility, fixed type-hints for button method, adjusted limits of the different markup types to real world values.

* Added changelog

* Fixed coverage

* Update aiogram/utils/keyboard.py

Co-authored-by: Suren Khorenyan <surenkhorenyan@gmail.com>

* Fixed codestyle

---------

Co-authored-by: Suren Khorenyan <surenkhorenyan@gmail.com>
This commit is contained in:
Alex Root Junior 2024-01-27 19:01:19 +02:00 • committed by GitHub
parent d3c63797b0
commit 844d6f58f5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 108 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

41
tests/test_utils/test_keyboard.py
View file

@ -61,36 +61,38 @@ class TestKeyboardBuilder:
with pytest.raises(ValueError):
assert builder._validate_row(
row=(KeyboardButton(text=f"test {index}") for index in range(10))
row=(
KeyboardButton(text=f"test {index}") for index in range(builder.max_width + 5)
)
)
with pytest.raises(ValueError):
assert builder._validate_row(
row=[KeyboardButton(text=f"test {index}") for index in range(10)]
row=[
KeyboardButton(text=f"test {index}") for index in range(builder.max_width + 5)
]
)
for count in range(9):
for count in range(11):
assert builder._validate_row(
row=[KeyboardButton(text=f"test {index}") for index in range(count)]
)
def test_validate_markup(self):
def test_validate_markup_invalid_type(self):
builder = ReplyKeyboardBuilder()
with pytest.raises(ValueError):
builder._validate_markup(markup=())
def test_validate_markup_too_many_buttons(self):
builder = ReplyKeyboardBuilder()
with pytest.raises(ValueError):
builder._validate_markup(
markup=[
[KeyboardButton(text=f"{row}.{col}") for col in range(8)] for row in range(15)
[KeyboardButton(text=f"{row}.{col}") for col in range(builder.max_width)]
for row in range(builder.max_buttons)
]
)
assert builder._validate_markup(
markup=[[KeyboardButton(text=f"{row}.{col}") for col in range(8)] for row in range(8)]
)
def test_validate_size(self):
builder = ReplyKeyboardBuilder()
with pytest.raises(ValueError):
@ -102,7 +104,7 @@ class TestKeyboardBuilder:
builder._validate_size(0)
with pytest.raises(ValueError):
builder._validate_size(10)
builder._validate_size(builder.max_width + 5)
for size in range(1, 9):
builder._validate_size(size)
@ -126,12 +128,6 @@ class TestKeyboardBuilder:
InlineKeyboardBuilder(markup=[[InlineKeyboardButton(text="test")]]),
InlineKeyboardButton(text="test2"),
],
[
KeyboardBuilder(
button_type=InlineKeyboardButton, markup=[[InlineKeyboardButton(text="test")]]
),
InlineKeyboardButton(text="test2"),
],
],
)
def test_copy(self, builder, button):
@ -153,7 +149,14 @@ class TestKeyboardBuilder:
@pytest.mark.parametrize(
"count,rows,last_columns",
[[0, 0, 0], [3, 1, 3], [8, 1, 8], [9, 2, 1], [16, 2, 8], [19, 3, 3]],
[
[0, 0, 0],
[3, 1, 3],
[8, 1, 8],
[12, 2, 2],
[16, 2, 6],
[22, 3, 2],
],
)
def test_add(self, count: int, rows: int, last_columns: int):
builder = ReplyKeyboardBuilder()
@ -182,8 +185,8 @@ class TestKeyboardBuilder:
[0, False, [2], []],
[1, False, [2], [1]],
[3, False, [2], [2, 1]],
[10, False, [], [8, 2]],
[10, False, [3, 2, 1], [3, 2, 1, 1, 1, 1, 1]],
[12, False, [], [10, 2]],
[12, True, [3, 2, 1], [3, 2, 1, 3, 2, 1]],
],
)