alihan/textual
1
0
Fork 0
mirror of https://github.com/Textualize/textual.git synced 2025-10-17 02:38:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Round off the priority clash test and un-xfail it

Browse Source 
Also add in a test for when there is no priority anywhere. This is still a
priority level that needs testing, it just isn't a priority.
This commit is contained in:
Dave Pearson
2022-12-15 12:47:46 +00:00
parent 90ecf4e37b
commit ad7c2e6c4d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/test_binding_inheritance.py
View File

@@ -532,22 +532,20 @@ async def test_focused_child_widget_no_inherit_empty_bindings_with_movement_bind
# |-----|----------|----------|----------|--------| # |-----|----------|----------|----------|--------|
# | Key | App | Screen | Widget | Winner | # | Key | App | Screen | Widget | Winner |
# |-----|----------|----------|----------|--------| # |-----|----------|----------|----------|--------|
# | 0 | | | | Widget |
# | A | Priority | | | App | # | A | Priority | | | App |
# | B | | Priority | | Screen | # | B | | Priority | | Screen |
# | C | | | Priority | Widget | # | C | | | Priority | Widget |
# | D | Priority | Priority | | App | # | D | Priority | Priority | | App |
# | E | Priority | | Priority | App | # | E | Priority | | Priority | App |
# | F | | Priority | Priority | Screen | # | F | | Priority | Priority | Screen |
#
# NOTE: The winner column is still up for grabs when there's more than one
# priority binding. Need to check with Will which he feels makes more sense:
# deeper priority wins, or shallower?
class PriorityOverlapWidget(Static, can_focus=True): class PriorityOverlapWidget(Static, can_focus=True):
"""A focusable widget with a priority binding.""" """A focusable widget with a priority binding."""
BINDINGS = [ BINDINGS = [
Binding("0", "record('widget_0')", "0", priority=False),
Binding("a", "record('widget_a')", "a", priority=False), Binding("a", "record('widget_a')", "a", priority=False),
Binding("b", "record('widget_b')", "b", priority=False), Binding("b", "record('widget_b')", "b", priority=False),
Binding("c", "record('widget_c')", "c", priority=True), Binding("c", "record('widget_c')", "c", priority=True),
@@ -561,6 +559,7 @@ class PriorityOverlapScreen(Screen):
"""A screen with a priority binding.""" """A screen with a priority binding."""
BINDINGS = [ BINDINGS = [
Binding("0", "record('screen_0')", "0", priority=False),
Binding("a", "record('screen_a')", "a", priority=False), Binding("a", "record('screen_a')", "a", priority=False),
Binding("b", "record('screen_b')", "b", priority=True), Binding("b", "record('screen_b')", "b", priority=True),
Binding("c", "record('screen_c')", "c", priority=False), Binding("c", "record('screen_c')", "c", priority=False),
@@ -580,6 +579,7 @@ class PriorityOverlapApp(AppKeyRecorder):
"""An application with a priority binding.""" """An application with a priority binding."""
BINDINGS = [ BINDINGS = [
Binding("0", "record('app_0')", "0", priority=False),
Binding("a", "record('app_a')", "a", priority=True), Binding("a", "record('app_a')", "a", priority=True),
Binding("b", "record('app_b')", "b", priority=False), Binding("b", "record('app_b')", "b", priority=False),
Binding("c", "record('app_c')", "c", priority=False), Binding("c", "record('app_c')", "c", priority=False),
@@ -594,13 +594,13 @@ class PriorityOverlapApp(AppKeyRecorder):
self.push_screen("main") self.push_screen("main")
@pytest.mark.xfail(reason="The final decision about who wins when needs to be made")
async def test_overlapping_priority_bindings() -> None: async def test_overlapping_priority_bindings() -> None:
"""Test an app stack with overlapping bindings.""" """Test an app stack with overlapping bindings."""
async with PriorityOverlapApp().run_test() as pilot: async with PriorityOverlapApp().run_test() as pilot:
await pilot.press(*"abcdef") await pilot.press(*"0abcdef")
await pilot.pause(2 / 100) await pilot.pause(2 / 100)
assert pilot.app.pressed_keys == [ assert pilot.app.pressed_keys == [
"widget_0",
"app_a", "app_a",
"screen_b", "screen_b",
"widget_c", "widget_c",