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

Enhance keyboard utility, improved documentation page. (#1236)

Browse source 
* Enhance keyboard utility, improved documentation for this utility.

Updated the 'aiogram/utils/keyboard.py' file with new methods for integrating buttons and keyboard creation more seamlessly. Added functionality to create buttons from existing markup and attach another builder. This improvement aims to make the keyboard building process more user-friendly and flexible.

* Added changelog

* Cover by tests
This commit is contained in:
Alex Root Junior 2023-08-04 22:36:50 +03:00 • committed by GitHub
parent 11dc7eaa31
commit 90654ac0fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 146 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

72
tests/test_utils/test_keyboard.py
View file

@ -228,3 +228,75 @@ class TestKeyboardBuilder:
)
def test_as_markup(self, builder, expected):
assert isinstance(builder.as_markup(), expected)
@pytest.mark.parametrize(
"markup,builder_type",
[
[
ReplyKeyboardMarkup(
keyboard=[
[KeyboardButton(text="test-1"), KeyboardButton(text="test-2")],
[KeyboardButton(text="test-3")],
]
),
ReplyKeyboardBuilder,
],
[
InlineKeyboardMarkup(
inline_keyboard=[
[InlineKeyboardButton(text="test-1"), InlineKeyboardButton(text="test-2")],
[InlineKeyboardButton(text="test-3")],
]
),
InlineKeyboardBuilder,
],
],
)
def test_from_markup(self, markup, builder_type):
builder = builder_type.from_markup(markup)
assert len(builder.export()) == 2
assert len(list(builder.buttons)) == 3
def test_attach(self):
builder = ReplyKeyboardBuilder(
markup=[
[
KeyboardButton(text="test1"),
KeyboardButton(text="test2"),
KeyboardButton(text="test3"),
]
]
)
builder.adjust(2)
builder.attach(ReplyKeyboardBuilder(markup=[[KeyboardButton(text="test2")]]))
markup = builder.export()
assert len(markup) == 3
assert len(markup[0]) == 2
assert len(markup[1]) == 1
assert len(markup[2]) == 1
def test_attach_invalid_button_type(self):
builder = ReplyKeyboardBuilder(
markup=[
[
KeyboardButton(text="test1"),
KeyboardButton(text="test2"),
KeyboardButton(text="test3"),
]
]
)
with pytest.raises(ValueError):
builder.attach(InlineKeyboardBuilder(markup=[[InlineKeyboardButton(text="test2")]]))
def test_attach_not_builder(self):
builder = ReplyKeyboardBuilder(
markup=[
[
KeyboardButton(text="test1"),
KeyboardButton(text="test2"),
KeyboardButton(text="test3"),
]
]
)
with pytest.raises(ValueError):
builder.attach(KeyboardButton(text="test2"))