Fix review comments

homeassistant/helpers/config_validation.py

@@ -1557,13 +1557,13 @@ STATE_CONDITION_BASE_SCHEMA = {
         vol.Lower, vol.Any(ENTITY_MATCH_ALL, ENTITY_MATCH_ANY)
     ),
     vol.Optional(CONF_ATTRIBUTE): str,
-    vol.Optional(CONF_FOR): positive_time_period_template,
 }
 
 STATE_CONDITION_STATE_SCHEMA = vol.Schema(
     {
         **STATE_CONDITION_BASE_SCHEMA,
         vol.Required(CONF_STATE): vol.Any(str, [str]),
+        vol.Optional(CONF_FOR): positive_time_period_template,
     }
 )
 

tests/helpers/test_condition.py

@@ -1462,6 +1462,19 @@ async def test_state_for_invalid_template(
         assert not test.async_check()
 
 
+def test_state_for_not_allowed_with_attribute() -> None:
+    """Test state condition rejects `for` combined with `attribute` is rejected."""
+    config = {
+        "condition": "state",
+        "entity_id": "sensor.temperature",
+        "attribute": "battery_level",
+        "state": "100",
+        "for": {"seconds": 5},
+    }
+    with pytest.raises(vol.Invalid, match=r"extra keys not allowed @ data\['for'\]"):
+        cv.CONDITION_SCHEMA(config)
+
+
 async def test_state_unknown_attribute(hass: HomeAssistant) -> None:
     """Test that state returns False on unknown attribute."""
     # Unknown attribute