Fix config flow tests

Author: golles

tests/test_config_flow.py

@@ -2,11 +2,11 @@
 
 from unittest.mock import patch
 
-from homeassistant import config_entries, data_entry_flow
+from homeassistant.config_entries import SOURCE_USER
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResultType
 import pytest
-from pytest_homeassistant_custom_component.common import MockConfigEntry
 
 from custom_components.knmi.const import DOMAIN
 
@@ -27,18 +27,18 @@ def bypass_setup_fixture():
         yield
 
 
-# Here we simiulate a successful config flow from the backend.
+# Here we simulate a successful config flow from the backend.
 # Note that we use the `mocked_data` fixture here because
 # we want the config flow validation to succeed during the test.
 async def test_successful_config_flow(hass: HomeAssistant, mocked_data):
     """Test a successful config flow."""
     # Initialize a config flow
     result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
+        DOMAIN, context={"source": SOURCE_USER}
     )
 
     # Check that the config flow shows the user form as the first step
-    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["type"] == FlowResultType.FORM
     assert result["step_id"] == "user"
 
     # If a user were to fill in all fields, it would result in this function call
@@ -48,7 +48,7 @@ async def test_successful_config_flow(hass: HomeAssistant, mocked_data):
 
     # Check that the config flow is complete and a new entry is created with
     # the input data
-    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result["type"] == FlowResultType.CREATE_ENTRY
     assert result["title"] == MOCK_CONFIG[CONF_NAME]
     assert result["data"] == MOCK_CONFIG
     assert result["result"]
@@ -61,17 +61,17 @@ async def test_successful_config_flow(hass: HomeAssistant, mocked_data):
 async def test_failed_config_flow(hass: HomeAssistant, config_flow_exceptions):
     """Test a failed config flow due to credential validation failure."""
     result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
+        DOMAIN, context={"source": SOURCE_USER}
     )
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["type"] == FlowResultType.FORM
     assert result["step_id"] == "user"
 
     result = await hass.config_entries.flow.async_configure(
         result["flow_id"], user_input=MOCK_CONFIG
     )
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["type"] == FlowResultType.FORM
     assert "base" in result["errors"]
 
 
@@ -86,7 +86,7 @@ async def test_options_flow(hass: HomeAssistant):
     result = await hass.config_entries.options.async_init(config_entry.entry_id)
 
     # Verify that the first options step is a user form
-    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["type"] == FlowResultType.FORM
     assert result["step_id"] == "user"
 
     # Enter some fake data into the form
@@ -96,7 +96,7 @@ async def test_options_flow(hass: HomeAssistant):
     )
 
     # Verify that the flow finishes
-    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result["type"] == FlowResultType.CREATE_ENTRY
     assert result["title"] == MOCK_CONFIG[CONF_NAME]
 
     # Verify that the options were updated