Revert "Ignore turn off command for only on capabilities (#507)"

This reverts commit fb656bf.
dext0r · Feb 18, 2024 · 7882c62 · 7882c62
1 parent 5881b7d
commit 7882c62
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 28 deletions.
diff --git a/custom_components/yandex_smart_home/capability_onoff.py b/custom_components/yandex_smart_home/capability_onoff.py
@@ -179,15 +179,14 @@ def supported(self) -> bool:
         return self.state.domain in (scene.DOMAIN, script.DOMAIN)
 
     async def _set_state(self, data: RequestData, state: dict[str, Any]):
-        if state['value']:
-            await self.hass.services.async_call(
-                self.state.domain,
-                SERVICE_TURN_ON, {
-                    ATTR_ENTITY_ID: self.state.entity_id
-                },
-                blocking=self.state.domain != script.DOMAIN,
-                context=data.context
-            )
+        await self.hass.services.async_call(
+            self.state.domain,
+            SERVICE_TURN_ON, {
+                ATTR_ENTITY_ID: self.state.entity_id
+            },
+            blocking=self.state.domain != script.DOMAIN,
+            context=data.context
+        )
 
 
 @register_capability
@@ -199,15 +198,14 @@ def supported(self) -> bool:
         return self.state.domain == button.DOMAIN
 
     async def _set_state(self, data: RequestData, state: dict[str, Any]):
-        if state['value']:
-            await self.hass.services.async_call(
-                self.state.domain,
-                button.SERVICE_PRESS, {
-                    ATTR_ENTITY_ID: self.state.entity_id
-                },
-                blocking=True,
-                context=data.context
-            )
+        await self.hass.services.async_call(
+            self.state.domain,
+            button.SERVICE_PRESS, {
+                ATTR_ENTITY_ID: self.state.entity_id
+            },
+            blocking=True,
+            context=data.context
+        )
 
 
 @register_capability
@@ -219,15 +217,14 @@ def supported(self) -> bool:
         return self.state.domain == input_button.DOMAIN
 
     async def _set_state(self, data: RequestData, state: dict[str, Any]):
-        if state['value']:
-            await self.hass.services.async_call(
-                self.state.domain,
-                input_button.SERVICE_PRESS, {
-                    ATTR_ENTITY_ID: self.state.entity_id
-                },
-                blocking=True,
-                context=data.context
-            )
+        await self.hass.services.async_call(
+            self.state.domain,
+            input_button.SERVICE_PRESS, {
+                ATTR_ENTITY_ID: self.state.entity_id
+            },
+            blocking=True,
+            context=data.context
+        )
 
 
 @register_capability

diff --git a/tests/test_capability_onoff.py b/tests/test_capability_onoff.py
@@ -112,8 +112,9 @@ async def test_capability_onoff_only_on(hass, domain, initial_state, service):
     if domain == script.DOMAIN:
         await hass.async_block_till_done()
 
-    assert len(on_calls) == 1
+    assert len(on_calls) == 2
     assert on_calls[0].data == {ATTR_ENTITY_ID: f'{domain}.test'}
+    assert on_calls[1].data == {ATTR_ENTITY_ID: f'{domain}.test'}
 
 
 async def test_capability_onoff_cover(hass):