starred/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2026-09-25 07:51:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

Preserve form values on error in Remote Calendar config flow (#181908)

Browse Source 
Co-authored-by: Home Assistant Developer <hello@home-assistant.io>
This commit is contained in:
Allen Porter
2026-09-11 18:50:23 +00:00
committed by Franck Nijhof
co-authored by Home Assistant Developer
parent 1fde53edf2
commit a3d42b9838
2 changed files with 103 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
homeassistant/components/remote_calendar/config_flow.py
+14 -15
View File
@@ -71,12 +71,8 @@ class RemoteCalendarConfigFlow(ConfigFlow, domain=DOMAIN):
return await self.async_step_auth()
if res.status_code == HTTPStatus.FORBIDDEN:
errors["base"] = "forbidden"
return self.async_show_form(
step_id="user",
data_schema=STEP_USER_DATA_SCHEMA,
errors=errors,
)
res.raise_for_status()
else:
res.raise_for_status()
except TimeoutException as err:
errors["base"] = "timeout_connect"
_LOGGER.debug(
@@ -86,18 +82,21 @@ class RemoteCalendarConfigFlow(ConfigFlow, domain=DOMAIN):
errors["base"] = "cannot_connect"
_LOGGER.debug("An error occurred: %s", str(err) or type(err).__name__)
else:
try:
await parse_calendar(self.hass, res.text)
except InvalidIcsException:
errors["base"] = "invalid_ics_file"
else:
return self.async_create_entry(
title=user_input[CONF_CALENDAR_NAME], data=user_input
)
if not errors:
try:
await parse_calendar(self.hass, res.text)
except InvalidIcsException:
errors["base"] = "invalid_ics_file"
else:
return self.async_create_entry(
title=user_input[CONF_CALENDAR_NAME], data=user_input
)
return self.async_show_form(
step_id="user",
data_schema=STEP_USER_DATA_SCHEMA,
data_schema=self.add_suggested_values_to_schema(
STEP_USER_DATA_SCHEMA, user_input
),
errors=errors,
)
tests/components/remote_calendar/test_config_flow.py
+89 -1
View File
@@ -13,7 +13,7 @@ from homeassistant.data_entry_flow import FlowResultType
from . import setup_integration
from .conftest import CALENDAR_NAME, CALENDER_URL
from tests.common import MockConfigEntry
from tests.common import MockConfigEntry, get_schema_suggested_value
@respx.mock
@@ -77,6 +77,61 @@ async def test_form_import_webcal(hass: HomeAssistant, ics_content: str) -> None
}
@respx.mock
async def test_form_import_webcal_error(hass: HomeAssistant, ics_content: str) -> None:
"""Test webcal URL error re-displays form with suggested values."""
respx.get(CALENDER_URL).mock(side_effect=HTTPError("Connection failed"))
result = await hass.config_entries.flow.async_init(
DOMAIN, context={"source": SOURCE_USER}
)
assert result["type"] is FlowResultType.FORM
result2 = await hass.config_entries.flow.async_configure(
result["flow_id"],
user_input={
CONF_CALENDAR_NAME: CALENDAR_NAME,
CONF_URL: "webcal://some.calendar.com/calendar.ics",
CONF_VERIFY_SSL: False,
},
)
assert result2["type"] is FlowResultType.FORM
assert result2["errors"] == {"base": "cannot_connect"}
assert (
get_schema_suggested_value(result2["data_schema"].schema, CONF_CALENDAR_NAME)
== CALENDAR_NAME
)
assert (
get_schema_suggested_value(result2["data_schema"].schema, CONF_URL)
== CALENDER_URL
)
assert (
get_schema_suggested_value(result2["data_schema"].schema, CONF_VERIFY_SSL)
is False
)
respx.get(CALENDER_URL).mock(
return_value=Response(
status_code=200,
text=ics_content,
)
)
result3 = await hass.config_entries.flow.async_configure(
result["flow_id"],
{
CONF_CALENDAR_NAME: CALENDAR_NAME,
CONF_URL: CALENDER_URL,
CONF_VERIFY_SSL: False,
},
)
assert result3["type"] is FlowResultType.CREATE_ENTRY
assert result3["title"] == CALENDAR_NAME
assert result3["data"] == {
CONF_CALENDAR_NAME: CALENDAR_NAME,
CONF_URL: CALENDER_URL,
CONF_VERIFY_SSL: False,
}
@pytest.mark.parametrize(
("side_effect", "base_error"),
[
@@ -108,6 +163,14 @@ async def test_form_invalid_url(
)
assert result2["type"] is FlowResultType.FORM
assert result2["errors"] == {"base": base_error}
assert (
get_schema_suggested_value(result2["data_schema"].schema, CONF_CALENDAR_NAME)
== CALENDAR_NAME
)
assert (
get_schema_suggested_value(result2["data_schema"].schema, CONF_URL)
== "invalid-url.com"
)
respx.get(CALENDER_URL).mock(
return_value=Response(
status_code=200,
@@ -167,6 +230,11 @@ async def test_unsupported_inputs(
assert result2["type"] is FlowResultType.FORM
assert result2["errors"] == {"base": "cannot_connect"}
assert (
get_schema_suggested_value(result2["data_schema"].schema, CONF_CALENDAR_NAME)
== CALENDAR_NAME
)
assert get_schema_suggested_value(result2["data_schema"].schema, CONF_URL) == url
assert log_message in caplog.text
## It's not possible to test a successful config flow because,
## we need to mock httpx.get here and then the exception isn't
@@ -204,6 +272,14 @@ async def test_form_http_status_error(
)
assert result2["type"] is FlowResultType.FORM
assert result2["errors"] == {"base": error}
assert (
get_schema_suggested_value(result2["data_schema"].schema, CONF_CALENDAR_NAME)
== CALENDAR_NAME
)
assert (
get_schema_suggested_value(result2["data_schema"].schema, CONF_URL)
== CALENDER_URL
)
respx.get(CALENDER_URL).mock(
return_value=Response(
status_code=200,
@@ -252,6 +328,18 @@ async def test_no_valid_calendar(hass: HomeAssistant, ics_content: str) -> None:
assert result2["type"] is FlowResultType.FORM
assert result2["errors"] == {"base": "invalid_ics_file"}
assert (
get_schema_suggested_value(result2["data_schema"].schema, CONF_CALENDAR_NAME)
== CALENDAR_NAME
)
assert (
get_schema_suggested_value(result2["data_schema"].schema, CONF_URL)
== CALENDER_URL
)
assert (
get_schema_suggested_value(result2["data_schema"].schema, CONF_VERIFY_SSL)
is True
)
respx.get(CALENDER_URL).mock(
return_value=Response(
status_code=200,