diff --git a/homeassistant/components/here_travel_time/__init__.py b/homeassistant/components/here_travel_time/__init__.py index f1c01ab1771..2ce91946f86 100644 --- a/homeassistant/components/here_travel_time/__init__.py +++ b/homeassistant/components/here_travel_time/__init__.py @@ -32,16 +32,8 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b """Set up HERE Travel Time from a config entry.""" api_key = config_entry.data[CONF_API_KEY] - arrival = ( - dt.parse_time(config_entry.options[CONF_ARRIVAL_TIME]) - if config_entry.options[CONF_ARRIVAL_TIME] is not None - else None - ) - departure = ( - dt.parse_time(config_entry.options[CONF_DEPARTURE_TIME]) - if config_entry.options[CONF_DEPARTURE_TIME] is not None - else None - ) + arrival = dt.parse_time(config_entry.options.get(CONF_ARRIVAL_TIME, "")) + departure = dt.parse_time(config_entry.options.get(CONF_DEPARTURE_TIME, "")) here_travel_time_config = HERETravelTimeConfig( destination_latitude=config_entry.data.get(CONF_DESTINATION_LATITUDE), diff --git a/tests/components/here_travel_time/test_init.py b/tests/components/here_travel_time/test_init.py index 18ef2e45410..682d8c560bb 100644 --- a/tests/components/here_travel_time/test_init.py +++ b/tests/components/here_travel_time/test_init.py @@ -1,9 +1,17 @@ """The test for the HERE Travel Time integration.""" +from datetime import datetime + import pytest from homeassistant.components.here_travel_time.config_flow import DEFAULT_OPTIONS -from homeassistant.components.here_travel_time.const import DOMAIN +from homeassistant.components.here_travel_time.const import ( + CONF_ARRIVAL_TIME, + CONF_DEPARTURE_TIME, + CONF_ROUTE_MODE, + DOMAIN, + ROUTE_MODE_FASTEST, +) from homeassistant.core import HomeAssistant from .const import DEFAULT_CONFIG @@ -12,13 +20,30 @@ from tests.common import MockConfigEntry @pytest.mark.usefixtures("valid_response") -async def test_unload_entry(hass: HomeAssistant) -> None: +@pytest.mark.parametrize( + "options", + [ + DEFAULT_OPTIONS, + { + CONF_ROUTE_MODE: ROUTE_MODE_FASTEST, + CONF_DEPARTURE_TIME: datetime.now(), + }, + { + CONF_ROUTE_MODE: ROUTE_MODE_FASTEST, + CONF_ARRIVAL_TIME: datetime.now(), + }, + { + CONF_ROUTE_MODE: ROUTE_MODE_FASTEST, + }, + ], +) +async def test_unload_entry(hass: HomeAssistant, options) -> None: """Test that unloading an entry works.""" entry = MockConfigEntry( domain=DOMAIN, unique_id="0123456789", data=DEFAULT_CONFIG, - options=DEFAULT_OPTIONS, + options=options, ) entry.add_to_hass(hass)