From 52ca1a3d475fdd96e6998d8c8b0be9a423b4dd06 Mon Sep 17 00:00:00 2001
From: Simon Hansen <67142049+DurgNomis-drol@users.noreply.github.com>
Date: Sat, 19 Feb 2022 11:38:10 +0100
Subject: [PATCH] Code enhancements for ISS (#66813)

* Code enhancements for ISS

* Assert options
---
 homeassistant/components/iss/__init__.py      |  3 +--
 homeassistant/components/iss/binary_sensor.py |  1 -
 tests/components/iss/test_config_flow.py      | 20 +++++++++++--------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/homeassistant/components/iss/__init__.py b/homeassistant/components/iss/__init__.py
index 29d6ced184b..997c3fff2a3 100644
--- a/homeassistant/components/iss/__init__.py
+++ b/homeassistant/components/iss/__init__.py
@@ -12,7 +12,6 @@ PLATFORMS = [Platform.BINARY_SENSOR]
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up this integration using UI."""
-
     hass.data.setdefault(DOMAIN, {})
 
     entry.async_on_unload(entry.add_update_listener(update_listener))
@@ -29,6 +28,6 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     return unload_ok
 
 
-async def update_listener(hass: HomeAssistant, entry: ConfigEntry):
+async def update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
     """Handle options update."""
     await hass.config_entries.async_reload(entry.entry_id)
diff --git a/homeassistant/components/iss/binary_sensor.py b/homeassistant/components/iss/binary_sensor.py
index 196bdfd055e..12a8a7514b2 100644
--- a/homeassistant/components/iss/binary_sensor.py
+++ b/homeassistant/components/iss/binary_sensor.py
@@ -71,7 +71,6 @@ async def async_setup_entry(
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the sensor platform."""
-
     name = entry.title
     show_on_map = entry.options.get(CONF_SHOW_ON_MAP, False)
 
diff --git a/tests/components/iss/test_config_flow.py b/tests/components/iss/test_config_flow.py
index e47d977b96f..09f7f391b89 100644
--- a/tests/components/iss/test_config_flow.py
+++ b/tests/components/iss/test_config_flow.py
@@ -90,13 +90,17 @@ async def test_options(hass: HomeAssistant):
 
     config_entry.add_to_hass(hass)
 
-    optionflow = await hass.config_entries.options.async_init(config_entry.entry_id)
+    with patch("homeassistant.components.iss.async_setup_entry", return_value=True):
+        assert await hass.config_entries.async_setup(config_entry.entry_id)
 
-    configured = await hass.config_entries.options.async_configure(
-        optionflow["flow_id"],
-        user_input={
-            CONF_SHOW_ON_MAP: True,
-        },
-    )
+        optionflow = await hass.config_entries.options.async_init(config_entry.entry_id)
 
-    assert configured.get("type") == "create_entry"
+        configured = await hass.config_entries.options.async_configure(
+            optionflow["flow_id"],
+            user_input={
+                CONF_SHOW_ON_MAP: True,
+            },
+        )
+
+        assert configured.get("type") == "create_entry"
+        assert config_entry.options == {CONF_SHOW_ON_MAP: True}