jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-09 14:27:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set the default upgrade icon for the MQTT device to the default icon for Home Assistant instead of the icon for the MQTT integration (#144295)

Browse Source 
* Set the default upgrade icon for the MQTT device to the default icon for Home Assistant instead of the icon for the MQTT integration

* Set the default upgrade icon for the MQTT device to the default icon for Home Assistant instead of the icon for the MQTT integration

* Set the default upgrade icon for the MQTT device to the default icon for Home Assistant instead of the icon for the MQTT integration

* Set the default upgrade icon for the MQTT device to the default icon for Home Assistant instead of the icon for the MQTT integration

* Fix failed tests

* Fix failed tests

* Cleanup unused helper option

* ruff

---------

Co-authored-by: jbouwh <jan@jbsoft.nl>
This commit is contained in:
XiaoXianNv-boot 2025-05-18 07:30:04 +08:00 committed by GitHub
parent a169d6ca97
commit f07265ece4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
homeassistant/components/mqtt/update.py
View File

@ -105,10 +105,7 @@ class MqttUpdate(MqttEntity, UpdateEntity, RestoreEntity):
@property @property
def entity_picture(self) -> str | None: def entity_picture(self) -> str | None:
"""Return the entity picture to use in the frontend.""" """Return the entity picture to use in the frontend."""
if self._attr_entity_picture is not None: return self._attr_entity_picture
return self._attr_entity_picture
return super().entity_picture
@staticmethod @staticmethod
def config_schema() -> VolSchemaType: def config_schema() -> VolSchemaType:

5
tests/components/mqtt/common.py
View File

@ -1875,7 +1875,6 @@ async def help_test_entity_icon_and_entity_picture(
mqtt_mock_entry: MqttMockHAClientGenerator, mqtt_mock_entry: MqttMockHAClientGenerator,
domain: str, domain: str,
config: ConfigType, config: ConfigType,
default_entity_picture: str | None = None,
) -> None: ) -> None:
"""Test entity picture and icon.""" """Test entity picture and icon."""
await mqtt_mock_entry() await mqtt_mock_entry()
@ -1895,7 +1894,7 @@ async def help_test_entity_icon_and_entity_picture(
state = hass.states.get(entity_id) state = hass.states.get(entity_id)
assert entity_id is not None and state assert entity_id is not None and state
assert state.attributes.get("icon") is None assert state.attributes.get("icon") is None
assert state.attributes.get("entity_picture") == default_entity_picture assert state.attributes.get("entity_picture") is None
# Discover an entity with an entity picture set # Discover an entity with an entity picture set
unique_id = "veryunique2" unique_id = "veryunique2"
@ -1922,7 +1921,7 @@ async def help_test_entity_icon_and_entity_picture(
state = hass.states.get(entity_id) state = hass.states.get(entity_id)
assert entity_id is not None and state assert entity_id is not None and state
assert state.attributes.get("icon") == "mdi:emoji-happy-outline" assert state.attributes.get("icon") == "mdi:emoji-happy-outline"
assert state.attributes.get("entity_picture") == default_entity_picture assert state.attributes.get("entity_picture") is None
async def help_test_publishing_with_custom_encoding( async def help_test_publishing_with_custom_encoding(

16
tests/components/mqtt/test_update.py
View File

@ -211,10 +211,7 @@ async def test_value_template(
assert state.state == STATE_OFF assert state.state == STATE_OFF
assert state.attributes.get("installed_version") == "1.9.0" assert state.attributes.get("installed_version") == "1.9.0"
assert state.attributes.get("latest_version") == "1.9.0" assert state.attributes.get("latest_version") == "1.9.0"
assert ( assert state.attributes.get("entity_picture") is None
state.attributes.get("entity_picture")
== "https://brands.home-assistant.io/_/mqtt/icon.png"
)
async_fire_mqtt_message(hass, latest_version_topic, '{"latest":"2.0.0"}') async_fire_mqtt_message(hass, latest_version_topic, '{"latest":"2.0.0"}')
@ -324,10 +321,7 @@ async def test_value_template_float(
assert state.state == STATE_OFF assert state.state == STATE_OFF
assert state.attributes.get("installed_version") == "1.9" assert state.attributes.get("installed_version") == "1.9"
assert state.attributes.get("latest_version") == "1.9" assert state.attributes.get("latest_version") == "1.9"
assert ( assert state.attributes.get("entity_picture") is None
state.attributes.get("entity_picture")
== "https://brands.home-assistant.io/_/mqtt/icon.png"
)
async_fire_mqtt_message(hass, latest_version_topic, '{"latest":"2.0"}') async_fire_mqtt_message(hass, latest_version_topic, '{"latest":"2.0"}')
@ -949,9 +943,5 @@ async def test_entity_icon_and_entity_picture(
domain = update.DOMAIN domain = update.DOMAIN
config = DEFAULT_CONFIG config = DEFAULT_CONFIG
await help_test_entity_icon_and_entity_picture( await help_test_entity_icon_and_entity_picture(
hass, hass, mqtt_mock_entry, domain, config
mqtt_mock_entry,
domain,
config,
default_entity_picture="https://brands.home-assistant.io/_/mqtt/icon.png",
) )