From 821f9b8a41f78233d7d68d232cdd5eb49234536b Mon Sep 17 00:00:00 2001
From: epenet <6771947+epenet@users.noreply.github.com>
Date: Fri, 15 Nov 2024 15:05:59 +0100
Subject: [PATCH] Fix modern_forms config flow test logic (#130491)

---
 tests/components/modern_forms/__init__.py     |  4 ++-
 .../snapshots/test_diagnostics.ambr           |  2 +-
 .../modern_forms/test_config_flow.py          | 36 ++++++-------------
 3 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/tests/components/modern_forms/__init__.py b/tests/components/modern_forms/__init__.py
index ae4e5bd9862..5882eaf1ec9 100644
--- a/tests/components/modern_forms/__init__.py
+++ b/tests/components/modern_forms/__init__.py
@@ -62,7 +62,9 @@ async def init_integration(
     )
 
     entry = MockConfigEntry(
-        domain=DOMAIN, data={CONF_HOST: "192.168.1.123", CONF_MAC: "AA:BB:CC:DD:EE:FF"}
+        domain=DOMAIN,
+        data={CONF_HOST: "192.168.1.123", CONF_MAC: "AA:BB:CC:DD:EE:FF"},
+        unique_id="AA:BB:CC:DD:EE:FF",
     )
 
     entry.add_to_hass(hass)
diff --git a/tests/components/modern_forms/snapshots/test_diagnostics.ambr b/tests/components/modern_forms/snapshots/test_diagnostics.ambr
index 75794aaca12..f8897a4a47f 100644
--- a/tests/components/modern_forms/snapshots/test_diagnostics.ambr
+++ b/tests/components/modern_forms/snapshots/test_diagnostics.ambr
@@ -17,7 +17,7 @@
       'pref_disable_polling': False,
       'source': 'user',
       'title': 'Mock Title',
-      'unique_id': None,
+      'unique_id': 'AA:BB:CC:DD:EE:FF',
       'version': 1,
     }),
     'device': dict({
diff --git a/tests/components/modern_forms/test_config_flow.py b/tests/components/modern_forms/test_config_flow.py
index 1484b5d5992..5b10d4d729e 100644
--- a/tests/components/modern_forms/test_config_flow.py
+++ b/tests/components/modern_forms/test_config_flow.py
@@ -113,7 +113,11 @@ async def test_connection_error(
     result = await hass.config_entries.flow.async_init(
         DOMAIN,
         context={"source": SOURCE_USER},
-        data={CONF_HOST: "example.com"},
+    )
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input={CONF_HOST: "example.com"},
     )
 
     assert result.get("type") is FlowResultType.FORM
@@ -193,24 +197,14 @@ async def test_user_device_exists_abort(
 
     await init_integration(hass, aioclient_mock, skip_setup=True)
 
-    await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_USER},
-        data={
-            "host": "192.168.1.123",
-            "hostname": "example.local.",
-            "properties": {CONF_MAC: "AA:BB:CC:DD:EE:FF"},
-        },
-    )
-
     result = await hass.config_entries.flow.async_init(
         DOMAIN,
         context={"source": SOURCE_USER},
-        data={
-            "host": "192.168.1.123",
-            "hostname": "example.local.",
-            "properties": {CONF_MAC: "AA:BB:CC:DD:EE:FF"},
-        },
+    )
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input={CONF_HOST: "192.168.1.123"},
     )
 
     assert result.get("type") is FlowResultType.ABORT
@@ -223,16 +217,6 @@ async def test_zeroconf_with_mac_device_exists_abort(
     """Test we abort zeroconf flow if a Modern Forms device already configured."""
     await init_integration(hass, aioclient_mock, skip_setup=True)
 
-    await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_USER},
-        data={
-            "host": "192.168.1.123",
-            "hostname": "example.local.",
-            "properties": {CONF_MAC: "AA:BB:CC:DD:EE:FF"},
-        },
-    )
-
     result = await hass.config_entries.flow.async_init(
         DOMAIN,
         context={"source": SOURCE_ZEROCONF},