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

Throw an error from reload_themes if themes are invalid (#148827)

Browse Source 
Co-authored-by: Joost Lekkerkerker <joostlek@outlook.com>
This commit is contained in:
karwosts 2025-07-15 08:08:19 -07:00 committed by GitHub
parent 35097602d7
commit 2c2ac4b669
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
homeassistant/components/frontend/__init__.py
View File

@ -26,6 +26,7 @@ from homeassistant.const import (
EVENT_THEMES_UPDATED,
)
from homeassistant.core import HomeAssistant, ServiceCall, callback
from homeassistant.exceptions import HomeAssistantError
from homeassistant.helpers import config_validation as cv, service
from homeassistant.helpers.icon import async_get_icons
from homeassistant.helpers.json import json_dumps_sorted
@ -543,6 +544,12 @@ async def _async_setup_themes(
"""Reload themes."""
config = await async_hass_config_yaml(hass)
new_themes = config.get(DOMAIN, {}).get(CONF_THEMES, {})
try:
THEME_SCHEMA(new_themes)
except vol.Invalid as err:
raise HomeAssistantError(f"Failed to reload themes: {err}") from err
hass.data[DATA_THEMES] = new_themes
if hass.data[DATA_DEFAULT_THEME] not in new_themes:
hass.data[DATA_DEFAULT_THEME] = DEFAULT_THEME

30
tests/components/frontend/test_init.py
View File

@ -26,6 +26,7 @@ from homeassistant.components.frontend import (
)
from homeassistant.components.websocket_api import TYPE_RESULT
from homeassistant.core import HomeAssistant
from homeassistant.exceptions import HomeAssistantError
from homeassistant.loader import async_get_integration
from homeassistant.setup import async_setup_component
@ -408,6 +409,35 @@ async def test_themes_reload_themes(
assert msg["result"]["default_theme"] == "default"
@pytest.mark.usefixtures("frontend")
async def test_themes_reload_invalid(
hass: HomeAssistant, themes_ws_client: MockHAClientWebSocket
) -> None:
"""Test frontend.reload_themes service with an invalid theme."""
with patch(
"homeassistant.components.frontend.async_hass_config_yaml",
return_value={DOMAIN: {CONF_THEMES: {"happy": {"primary-color": "pink"}}}},
):
await hass.services.async_call(DOMAIN, "reload_themes", blocking=True)
with (
patch(
"homeassistant.components.frontend.async_hass_config_yaml",
return_value={DOMAIN: {CONF_THEMES: {"sad": "blue"}}},
),
pytest.raises(HomeAssistantError, match="Failed to reload themes"),
):
await hass.services.async_call(DOMAIN, "reload_themes", blocking=True)
await themes_ws_client.send_json({"id": 5, "type": "frontend/get_themes"})
msg = await themes_ws_client.receive_json()
assert msg["result"]["themes"] == {"happy": {"primary-color": "pink"}}
assert msg["result"]["default_theme"] == "default"
async def test_missing_themes(ws_client: MockHAClientWebSocket) -> None:
"""Test that themes API works when themes are not defined."""
await ws_client.send_json({"id": 5, "type": "frontend/get_themes"})