1
0
mirror of https://github.com/home-assistant/core.git synced 2025-12-25 05:26:47 +00:00

Listen for group member state changes when using expand in templates (#35398)

* Re-evaluate template on group member state change

* Use named groups for entity extraction regex

This will avoid unnecessary edits of match indices if the regex is
amended in the future

* Improve test coverage
This commit is contained in:
Thomas Hollstegge
2020-05-10 17:48:56 +02:00
committed by GitHub
parent c71b6c8a71
commit 8f285c15d3
2 changed files with 64 additions and 31 deletions

View File

@@ -1552,19 +1552,19 @@ def test_closest_function_no_location_states(hass):
def test_extract_entities_none_exclude_stuff(hass):
"""Test extract entities function with none or exclude stuff."""
assert template.extract_entities(None) == []
assert template.extract_entities(hass, None) == []
assert template.extract_entities("mdi:water") == []
assert template.extract_entities(hass, "mdi:water") == []
assert (
template.extract_entities(
"{{ closest(states.zone.far_away, states.test_domain).entity_id }}"
hass, "{{ closest(states.zone.far_away, states.test_domain).entity_id }}"
)
== MATCH_ALL
)
assert (
template.extract_entities('{{ distance("123", states.test_object_2) }}')
template.extract_entities(hass, '{{ distance("123", states.test_object_2) }}')
== MATCH_ALL
)
@@ -1572,7 +1572,9 @@ def test_extract_entities_none_exclude_stuff(hass):
def test_extract_entities_no_match_entities(hass):
"""Test extract entities function with none entities stuff."""
assert (
template.extract_entities("{{ value_json.tst | timestamp_custom('%Y' True) }}")
template.extract_entities(
hass, "{{ value_json.tst | timestamp_custom('%Y' True) }}"
)
== MATCH_ALL
)
@@ -1671,35 +1673,38 @@ def test_generate_select(hass):
)
def test_extract_entities_match_entities(hass):
async def test_extract_entities_match_entities(hass):
"""Test extract entities function with entities stuff."""
assert (
template.extract_entities(
hass,
"""
{% if is_state('device_tracker.phone_1', 'home') %}
Ha, Hercules is home!
{% else %}
Hercules is at {{ states('device_tracker.phone_1') }}.
{% endif %}
"""
""",
)
== ["device_tracker.phone_1"]
)
assert (
template.extract_entities(
hass,
"""
{{ as_timestamp(states.binary_sensor.garage_door.last_changed) }}
"""
""",
)
== ["binary_sensor.garage_door"]
)
assert (
template.extract_entities(
hass,
"""
{{ states("binary_sensor.garage_door") }}
"""
""",
)
== ["binary_sensor.garage_door"]
)
@@ -1708,33 +1713,36 @@ Hercules is at {{ states('device_tracker.phone_1') }}.
assert (
template.extract_entities(
hass,
"""
{{ is_state_attr('device_tracker.phone_2', 'battery', 40) }}
"""
""",
)
== ["device_tracker.phone_2"]
)
assert sorted(["device_tracker.phone_1", "device_tracker.phone_2"]) == sorted(
template.extract_entities(
hass,
"""
{% if is_state('device_tracker.phone_1', 'home') %}
Ha, Hercules is home!
{% elif states.device_tracker.phone_2.attributes.battery < 40 %}
Hercules you power goes done!.
{% endif %}
"""
""",
)
)
assert sorted(["sensor.pick_humidity", "sensor.pick_temperature"]) == sorted(
template.extract_entities(
hass,
"""
{{
states.sensor.pick_temperature.state ~ „°C (“ ~
states.sensor.pick_humidity.state ~ „ %
}}
"""
""",
)
)
@@ -1742,35 +1750,55 @@ states.sensor.pick_humidity.state ~ „ %“
["sensor.luftfeuchtigkeit_mean", "input_number.luftfeuchtigkeit"]
) == sorted(
template.extract_entities(
hass,
"{% if (states('sensor.luftfeuchtigkeit_mean') | int)"
" > (states('input_number.luftfeuchtigkeit') | int +1.5)"
" %}true{% endif %}"
" %}true{% endif %}",
)
)
await group.Group.async_create_group(hass, "empty group", [])
assert ["group.empty_group"] == template.extract_entities(
hass, "{{ expand('group.empty_group') | list | length }}"
)
hass.states.async_set("test_domain.object", "exists")
await group.Group.async_create_group(hass, "expand group", ["test_domain.object"])
assert sorted(["group.expand_group", "test_domain.object"]) == sorted(
template.extract_entities(
hass, "{{ expand('group.expand_group') | list | length }}"
)
)
assert ["test_domain.entity"] == template.Template(
'{{ is_state("test_domain.entity", "on") }}', hass
).extract_entities()
def test_extract_entities_with_variables(hass):
"""Test extract entities function with variables and entities stuff."""
hass.states.async_set("input_boolean.switch", "on")
assert {"input_boolean.switch"} == extract_entities(
assert ["input_boolean.switch"] == template.extract_entities(
hass, "{{ is_state('input_boolean.switch', 'off') }}", {}
)
assert {"input_boolean.switch"} == extract_entities(
assert ["input_boolean.switch"] == template.extract_entities(
hass,
"{{ is_state(trigger.entity_id, 'off') }}",
{"trigger": {"entity_id": "input_boolean.switch"}},
)
assert {"no_state"} == extract_entities(
assert MATCH_ALL == template.extract_entities(
hass, "{{ is_state(data, 'off') }}", {"data": "no_state"}
)
assert {"input_boolean.switch"} == extract_entities(
assert ["input_boolean.switch"] == template.extract_entities(
hass, "{{ is_state(data, 'off') }}", {"data": "input_boolean.switch"}
)
assert {"input_boolean.switch"} == extract_entities(
assert ["input_boolean.switch"] == template.extract_entities(
hass,
"{{ is_state(trigger.entity_id, 'off') }}",
{"trigger": {"entity_id": "input_boolean.switch"}},