From 513d6cc4676bf93c813a3c230429eed14a40b386 Mon Sep 17 00:00:00 2001 From: Erik Montnemery Date: Mon, 17 Jan 2022 16:34:40 +0100 Subject: [PATCH] Change value of device_automation constant (#64296) * Change value of constant CONF_CHANGED_STATES * Adjust tests --- homeassistant/components/device_automation/const.py | 2 +- homeassistant/components/fan/strings.json | 2 +- homeassistant/components/humidifier/strings.json | 2 +- homeassistant/components/light/strings.json | 2 +- homeassistant/components/remote/strings.json | 2 +- homeassistant/components/switch/strings.json | 2 +- tests/components/device_automation/test_init.py | 2 +- tests/components/device_automation/test_toggle_entity.py | 4 ++-- tests/components/fan/test_device_trigger.py | 4 ++-- tests/components/humidifier/test_device_trigger.py | 4 ++-- tests/components/light/test_device_trigger.py | 4 ++-- tests/components/remote/test_device_trigger.py | 4 ++-- tests/components/switch/test_device_trigger.py | 4 ++-- tests/components/wemo/test_device_trigger.py | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/homeassistant/components/device_automation/const.py b/homeassistant/components/device_automation/const.py index bede5635f4c..2970e5e79b2 100644 --- a/homeassistant/components/device_automation/const.py +++ b/homeassistant/components/device_automation/const.py @@ -1,5 +1,5 @@ """Constants for device automations.""" -CONF_CHANGED_STATES = "toggled" +CONF_CHANGED_STATES = "changed_states" CONF_IS_OFF = "is_off" CONF_IS_ON = "is_on" CONF_TOGGLE = "toggle" diff --git a/homeassistant/components/fan/strings.json b/homeassistant/components/fan/strings.json index fb15354a8ef..403a63f99d5 100644 --- a/homeassistant/components/fan/strings.json +++ b/homeassistant/components/fan/strings.json @@ -6,7 +6,7 @@ "is_off": "{entity_name} is off" }, "trigger_type": { - "toggled": "{entity_name} turned on or off", + "changed_states": "{entity_name} turned on or off", "turned_on": "{entity_name} turned on", "turned_off": "{entity_name} turned off" }, diff --git a/homeassistant/components/humidifier/strings.json b/homeassistant/components/humidifier/strings.json index 809eeb9fcfb..46e2fc16055 100644 --- a/homeassistant/components/humidifier/strings.json +++ b/homeassistant/components/humidifier/strings.json @@ -3,7 +3,7 @@ "device_automation": { "trigger_type": { "target_humidity_changed": "{entity_name} target humidity changed", - "toggled": "{entity_name} turned on or off", + "changed_states": "{entity_name} turned on or off", "turned_on": "{entity_name} turned on", "turned_off": "{entity_name} turned off" }, diff --git a/homeassistant/components/light/strings.json b/homeassistant/components/light/strings.json index 9a63b53e8d7..ee1f8e13b61 100644 --- a/homeassistant/components/light/strings.json +++ b/homeassistant/components/light/strings.json @@ -14,7 +14,7 @@ "is_off": "{entity_name} is off" }, "trigger_type": { - "toggled": "{entity_name} turned on or off", + "changed_states": "{entity_name} turned on or off", "turned_on": "{entity_name} turned on", "turned_off": "{entity_name} turned off" } diff --git a/homeassistant/components/remote/strings.json b/homeassistant/components/remote/strings.json index 91cf5ac0946..4a2b20c65de 100644 --- a/homeassistant/components/remote/strings.json +++ b/homeassistant/components/remote/strings.json @@ -11,7 +11,7 @@ "is_off": "{entity_name} is off" }, "trigger_type": { - "toggled": "{entity_name} turned on or off", + "changed_states": "{entity_name} turned on or off", "turned_on": "{entity_name} turned on", "turned_off": "{entity_name} turned off" } diff --git a/homeassistant/components/switch/strings.json b/homeassistant/components/switch/strings.json index 1e18b874972..7ea84e649ef 100644 --- a/homeassistant/components/switch/strings.json +++ b/homeassistant/components/switch/strings.json @@ -11,7 +11,7 @@ "is_off": "{entity_name} is off" }, "trigger_type": { - "toggled": "{entity_name} turned on or off", + "changed_states": "{entity_name} turned on or off", "turned_on": "{entity_name} turned on", "turned_off": "{entity_name} turned off" } diff --git a/tests/components/device_automation/test_init.py b/tests/components/device_automation/test_init.py index 4aca4016b8b..f7b1339014a 100644 --- a/tests/components/device_automation/test_init.py +++ b/tests/components/device_automation/test_init.py @@ -143,7 +143,7 @@ async def test_websocket_get_triggers(hass, hass_ws_client, device_reg, entity_r { "platform": "device", "domain": "light", - "type": "toggled", + "type": "changed_states", "device_id": device_entry.id, "entity_id": "light.test_5678", }, diff --git a/tests/components/device_automation/test_toggle_entity.py b/tests/components/device_automation/test_toggle_entity.py index 0414dc97944..4e125b9bf10 100644 --- a/tests/components/device_automation/test_toggle_entity.py +++ b/tests/components/device_automation/test_toggle_entity.py @@ -93,7 +93,7 @@ async def test_if_fires_on_state_change(hass, calls, enable_custom_integrations) "domain": "switch", "device_id": "", "entity_id": ent1.entity_id, - "type": "toggled", + "type": "changed_states", }, "action": { "service": "test.automation", @@ -135,7 +135,7 @@ async def test_if_fires_on_state_change(hass, calls, enable_custom_integrations) } -@pytest.mark.parametrize("trigger", ["turned_off", "toggled"]) +@pytest.mark.parametrize("trigger", ["turned_off", "changed_states"]) async def test_if_fires_on_state_change_with_for( hass, calls, enable_custom_integrations, trigger ): diff --git a/tests/components/fan/test_device_trigger.py b/tests/components/fan/test_device_trigger.py index 7b4bd8186c3..ca947f1e822 100644 --- a/tests/components/fan/test_device_trigger.py +++ b/tests/components/fan/test_device_trigger.py @@ -69,7 +69,7 @@ async def test_get_triggers(hass, device_reg, entity_reg): { "platform": "device", "domain": DOMAIN, - "type": "toggled", + "type": "changed_states", "device_id": device_entry.id, "entity_id": f"{DOMAIN}.test_5678", }, @@ -157,7 +157,7 @@ async def test_if_fires_on_state_change(hass, calls): "domain": DOMAIN, "device_id": "", "entity_id": "fan.entity", - "type": "toggled", + "type": "changed_states", }, "action": { "service": "test.automation", diff --git a/tests/components/humidifier/test_device_trigger.py b/tests/components/humidifier/test_device_trigger.py index 7fa27dacada..144bbf3cdaf 100644 --- a/tests/components/humidifier/test_device_trigger.py +++ b/tests/components/humidifier/test_device_trigger.py @@ -87,7 +87,7 @@ async def test_get_triggers(hass, device_reg, entity_reg): { "platform": "device", "domain": DOMAIN, - "type": "toggled", + "type": "changed_states", "device_id": device_entry.id, "entity_id": f"{DOMAIN}.test_5678", }, @@ -213,7 +213,7 @@ async def test_if_fires_on_state_change(hass, calls): "domain": DOMAIN, "device_id": "", "entity_id": "humidifier.entity", - "type": "toggled", + "type": "changed_states", }, "action": { "service": "test.automation", diff --git a/tests/components/light/test_device_trigger.py b/tests/components/light/test_device_trigger.py index 3dd9f846ec5..0e9b334c6d1 100644 --- a/tests/components/light/test_device_trigger.py +++ b/tests/components/light/test_device_trigger.py @@ -54,7 +54,7 @@ async def test_get_triggers(hass, device_reg, entity_reg): { "platform": "device", "domain": DOMAIN, - "type": "toggled", + "type": "changed_states", "device_id": device_entry.id, "entity_id": f"{DOMAIN}.test_5678", }, @@ -174,7 +174,7 @@ async def test_if_fires_on_state_change(hass, calls, enable_custom_integrations) "domain": DOMAIN, "device_id": "", "entity_id": ent1.entity_id, - "type": "toggled", + "type": "changed_states", }, "action": { "service": "test.automation", diff --git a/tests/components/remote/test_device_trigger.py b/tests/components/remote/test_device_trigger.py index a3a0d049e34..0db45318bfa 100644 --- a/tests/components/remote/test_device_trigger.py +++ b/tests/components/remote/test_device_trigger.py @@ -54,7 +54,7 @@ async def test_get_triggers(hass, device_reg, entity_reg): { "platform": "device", "domain": DOMAIN, - "type": "toggled", + "type": "changed_states", "device_id": device_entry.id, "entity_id": f"{DOMAIN}.test_5678", }, @@ -172,7 +172,7 @@ async def test_if_fires_on_state_change(hass, calls, enable_custom_integrations) "domain": DOMAIN, "device_id": "", "entity_id": ent1.entity_id, - "type": "toggled", + "type": "changed_states", }, "action": { "service": "test.automation", diff --git a/tests/components/switch/test_device_trigger.py b/tests/components/switch/test_device_trigger.py index dbbf1eeeec7..832a58d6f2c 100644 --- a/tests/components/switch/test_device_trigger.py +++ b/tests/components/switch/test_device_trigger.py @@ -54,7 +54,7 @@ async def test_get_triggers(hass, device_reg, entity_reg): { "platform": "device", "domain": DOMAIN, - "type": "toggled", + "type": "changed_states", "device_id": device_entry.id, "entity_id": f"{DOMAIN}.test_5678", }, @@ -172,7 +172,7 @@ async def test_if_fires_on_state_change(hass, calls, enable_custom_integrations) "domain": DOMAIN, "device_id": "", "entity_id": ent1.entity_id, - "type": "toggled", + "type": "changed_states", }, "action": { "service": "test.automation", diff --git a/tests/components/wemo/test_device_trigger.py b/tests/components/wemo/test_device_trigger.py index 2e3ba3f6034..e29864c7a64 100644 --- a/tests/components/wemo/test_device_trigger.py +++ b/tests/components/wemo/test_device_trigger.py @@ -71,7 +71,7 @@ async def test_get_triggers(hass, wemo_entity): CONF_DOMAIN: Platform.SWITCH, CONF_ENTITY_ID: wemo_entity.entity_id, CONF_PLATFORM: "device", - CONF_TYPE: "toggled", + CONF_TYPE: "changed_states", }, { CONF_DEVICE_ID: wemo_entity.device_id,