From daa926d5ee4a0e446c2fe15635e3d3c500266853 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 30 Aug 2026 16:57:47 +0200 Subject: [PATCH] Split the Minecraft Server user flow init from its data (#180779) --- .../minecraft_server/test_config_flow.py | 75 ++++++++++++++++--- 1 file changed, 63 insertions(+), 12 deletions(-) diff --git a/tests/components/minecraft_server/test_config_flow.py b/tests/components/minecraft_server/test_config_flow.py index 254e156f1f00..8f966ea48315 100644 --- a/tests/components/minecraft_server/test_config_flow.py +++ b/tests/components/minecraft_server/test_config_flow.py @@ -50,8 +50,9 @@ async def test_full_flow_java(hass: HomeAssistant) -> None: return_value=TEST_JAVA_STATUS_RESPONSE, ), ): - result = await hass.config_entries.flow.async_init( - DOMAIN, context={"source": SOURCE_USER}, data=USER_INPUT + result = await hass.config_entries.flow.async_configure( + result["flow_id"], + user_input=USER_INPUT, ) assert result["type"] is FlowResultType.CREATE_ENTRY @@ -79,8 +80,9 @@ async def test_full_flow_bedrock(hass: HomeAssistant) -> None: return_value=TEST_BEDROCK_STATUS_RESPONSE, ), ): - result = await hass.config_entries.flow.async_init( - DOMAIN, context={"source": SOURCE_USER}, data=USER_INPUT + result = await hass.config_entries.flow.async_configure( + result["flow_id"], + user_input=USER_INPUT, ) assert result["type"] is FlowResultType.CREATE_ENTRY @@ -116,8 +118,9 @@ async def test_full_flow_legacy_java(hass: HomeAssistant) -> None: return_value=TEST_LEGACY_JAVA_STATUS_RESPONSE, ), ): - result = await hass.config_entries.flow.async_init( - DOMAIN, context={"source": SOURCE_USER}, data=USER_INPUT + result = await hass.config_entries.flow.async_configure( + result["flow_id"], + user_input=USER_INPUT, ) assert result["type"] is FlowResultType.CREATE_ENTRY @@ -147,7 +150,15 @@ async def test_service_already_configured_java( ), ): result = await hass.config_entries.flow.async_init( - DOMAIN, context={"source": SOURCE_USER}, data=USER_INPUT + DOMAIN, context={"source": SOURCE_USER} + ) + + assert result["type"] is FlowResultType.FORM + assert result["step_id"] == "user" + + result = await hass.config_entries.flow.async_configure( + result["flow_id"], + user_input=USER_INPUT, ) assert result["type"] is FlowResultType.ABORT assert result["reason"] == "already_configured" @@ -170,7 +181,15 @@ async def test_service_already_configured_bedrock( ), ): result = await hass.config_entries.flow.async_init( - DOMAIN, context={"source": SOURCE_USER}, data=USER_INPUT + DOMAIN, context={"source": SOURCE_USER} + ) + + assert result["type"] is FlowResultType.FORM + assert result["step_id"] == "user" + + result = await hass.config_entries.flow.async_configure( + result["flow_id"], + user_input=USER_INPUT, ) assert result["type"] is FlowResultType.ABORT assert result["reason"] == "already_configured" @@ -201,7 +220,15 @@ async def test_service_already_configured_legacy_java( ), ): result = await hass.config_entries.flow.async_init( - DOMAIN, context={"source": SOURCE_USER}, data=USER_INPUT + DOMAIN, context={"source": SOURCE_USER} + ) + + assert result["type"] is FlowResultType.FORM + assert result["step_id"] == "user" + + result = await hass.config_entries.flow.async_configure( + result["flow_id"], + user_input=USER_INPUT, ) assert result["type"] is FlowResultType.ABORT assert result["reason"] == "already_configured" @@ -228,7 +255,15 @@ async def test_recovery_java(hass: HomeAssistant) -> None: ), ): result = await hass.config_entries.flow.async_init( - DOMAIN, context={"source": SOURCE_USER}, data=USER_INPUT + DOMAIN, context={"source": SOURCE_USER} + ) + + assert result["type"] is FlowResultType.FORM + assert result["step_id"] == "user" + + result = await hass.config_entries.flow.async_configure( + result["flow_id"], + user_input=USER_INPUT, ) assert result["type"] is FlowResultType.FORM assert result["errors"] == {"base": "cannot_connect"} @@ -277,7 +312,15 @@ async def test_recovery_bedrock(hass: HomeAssistant) -> None: ), ): result = await hass.config_entries.flow.async_init( - DOMAIN, context={"source": SOURCE_USER}, data=USER_INPUT + DOMAIN, context={"source": SOURCE_USER} + ) + + assert result["type"] is FlowResultType.FORM + assert result["step_id"] == "user" + + result = await hass.config_entries.flow.async_configure( + result["flow_id"], + user_input=USER_INPUT, ) assert result["type"] is FlowResultType.FORM assert result["errors"] == {"base": "cannot_connect"} @@ -322,7 +365,15 @@ async def test_recovery_legacy_java(hass: HomeAssistant) -> None: ), ): result = await hass.config_entries.flow.async_init( - DOMAIN, context={"source": SOURCE_USER}, data=USER_INPUT + DOMAIN, context={"source": SOURCE_USER} + ) + + assert result["type"] is FlowResultType.FORM + assert result["step_id"] == "user" + + result = await hass.config_entries.flow.async_configure( + result["flow_id"], + user_input=USER_INPUT, ) assert result["type"] is FlowResultType.FORM assert result["errors"] == {"base": "cannot_connect"}