Refactor deprecated RESULT_TYPE_* (#97367)

This commit is contained in:
Meow 2023-07-30 19:27:30 +02:00 committed by GitHub
parent 04e72fec57
commit a4b2ded503
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 202 additions and 200 deletions

View file

@ -3,11 +3,11 @@ from unittest.mock import patch
from aiopyarr import exceptions
from homeassistant import data_entry_flow
from homeassistant.components.radarr.const import DEFAULT_NAME, DOMAIN
from homeassistant.config_entries import SOURCE_REAUTH, SOURCE_USER
from homeassistant.const import CONF_API_KEY, CONF_SOURCE, CONF_URL, CONF_VERIFY_SSL
from homeassistant.core import HomeAssistant
from homeassistant.data_entry_flow import FlowResultType
from . import (
API_KEY,
@ -33,7 +33,7 @@ async def test_show_user_form(hass: HomeAssistant) -> None:
)
assert result["step_id"] == "user"
assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
assert result["type"] == FlowResultType.FORM
async def test_cannot_connect(
@ -48,7 +48,7 @@ async def test_cannot_connect(
data=MOCK_USER_INPUT,
)
assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
assert result["type"] == FlowResultType.FORM
assert result["step_id"] == "user"
assert result["errors"] == {"base": "cannot_connect"}
@ -62,7 +62,7 @@ async def test_invalid_auth(
DOMAIN, context={CONF_SOURCE: SOURCE_USER}, data=MOCK_USER_INPUT
)
assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
assert result["type"] == FlowResultType.FORM
assert result["step_id"] == "user"
assert result["errors"] == {"base": "invalid_auth"}
@ -79,7 +79,7 @@ async def test_wrong_app(hass: HomeAssistant) -> None:
data={CONF_URL: URL, CONF_VERIFY_SSL: False},
)
assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
assert result["type"] == FlowResultType.FORM
assert result["step_id"] == "user"
assert result["errors"]["base"] == "wrong_app"
@ -96,7 +96,7 @@ async def test_zero_conf_failure(hass: HomeAssistant) -> None:
data={CONF_URL: URL, CONF_VERIFY_SSL: False},
)
assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
assert result["type"] == FlowResultType.FORM
assert result["step_id"] == "user"
assert result["errors"]["base"] == "zeroconf_failed"
@ -113,7 +113,7 @@ async def test_unknown_error(hass: HomeAssistant) -> None:
data=MOCK_USER_INPUT,
)
assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
assert result["type"] == FlowResultType.FORM
assert result["step_id"] == "user"
assert result["errors"] == {"base": "unknown"}
@ -130,7 +130,7 @@ async def test_zero_conf(hass: HomeAssistant) -> None:
data={CONF_URL: URL, CONF_VERIFY_SSL: False},
)
assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
assert result["type"] == FlowResultType.CREATE_ENTRY
assert result["title"] == DEFAULT_NAME
assert result["data"] == CONF_DATA
@ -150,14 +150,14 @@ async def test_full_reauth_flow_implementation(
data=entry.data,
)
assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
assert result["type"] == FlowResultType.FORM
assert result["step_id"] == "reauth_confirm"
result = await hass.config_entries.flow.async_configure(
result["flow_id"], user_input={}
)
assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
assert result["type"] == FlowResultType.FORM
assert result["step_id"] == "user"
with patch_async_setup_entry() as mock_setup_entry:
@ -166,7 +166,7 @@ async def test_full_reauth_flow_implementation(
)
await hass.async_block_till_done()
assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
assert result["type"] == FlowResultType.ABORT
assert result["reason"] == "reauth_successful"
assert entry.data == CONF_DATA | {CONF_API_KEY: "test-api-key-reauth"}
@ -185,7 +185,7 @@ async def test_full_user_flow_implementation(
context={CONF_SOURCE: SOURCE_USER},
)
assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
assert result["type"] == FlowResultType.FORM
assert result["step_id"] == "user"
with patch_async_setup_entry():
@ -194,7 +194,7 @@ async def test_full_user_flow_implementation(
user_input=MOCK_USER_INPUT,
)
assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
assert result["type"] == FlowResultType.CREATE_ENTRY
assert result["title"] == DEFAULT_NAME
assert result["data"] == CONF_DATA
assert result["data"][CONF_URL] == "http://192.168.1.189:7887/test"