mirror of
https://github.com/home-assistant/core.git
synced 2025-04-25 17:57:55 +00:00
Allow ignored yale_ble devices to be set up from the user flow (#137103)
Every few days we get an issue report about a device a user ignored and forgot about, and than can no longer get set up. Sometimes its a govee device, sometimes its a switchbot device, but the pattern is consistent. Allow ignored devices to be selected in the user step and replace the ignored entry. Same as #137056 and #137052 but for yalexs_ble
This commit is contained in:
parent
bad966f3ab
commit
76937541f1
@ -267,7 +267,7 @@ class YalexsConfigFlow(ConfigFlow, domain=DOMAIN):
|
|||||||
if discovery := self._discovery_info:
|
if discovery := self._discovery_info:
|
||||||
self._discovered_devices[discovery.address] = discovery
|
self._discovered_devices[discovery.address] = discovery
|
||||||
else:
|
else:
|
||||||
current_addresses = self._async_current_ids()
|
current_addresses = self._async_current_ids(include_ignore=False)
|
||||||
current_unique_names = {
|
current_unique_names = {
|
||||||
entry.data.get(CONF_LOCAL_NAME)
|
entry.data.get(CONF_LOCAL_NAME)
|
||||||
for entry in self._async_current_entries()
|
for entry in self._async_current_entries()
|
||||||
|
@ -92,6 +92,58 @@ async def test_user_step_success(hass: HomeAssistant, slot: int) -> None:
|
|||||||
assert len(mock_setup_entry.mock_calls) == 1
|
assert len(mock_setup_entry.mock_calls) == 1
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize("slot", [0, 1, 66])
|
||||||
|
async def test_user_step_from_ignored(hass: HomeAssistant, slot: int) -> None:
|
||||||
|
"""Test user step replaces an ignored entry."""
|
||||||
|
entry = MockConfigEntry(
|
||||||
|
domain=DOMAIN,
|
||||||
|
data={},
|
||||||
|
unique_id=YALE_ACCESS_LOCK_DISCOVERY_INFO.address,
|
||||||
|
source=config_entries.SOURCE_IGNORE,
|
||||||
|
)
|
||||||
|
entry.add_to_hass(hass)
|
||||||
|
with patch(
|
||||||
|
"homeassistant.components.yalexs_ble.config_flow.async_discovered_service_info",
|
||||||
|
return_value=[NOT_YALE_DISCOVERY_INFO, YALE_ACCESS_LOCK_DISCOVERY_INFO],
|
||||||
|
):
|
||||||
|
result = await hass.config_entries.flow.async_init(
|
||||||
|
DOMAIN, context={"source": config_entries.SOURCE_USER}
|
||||||
|
)
|
||||||
|
assert result["type"] is FlowResultType.FORM
|
||||||
|
assert result["step_id"] == "user"
|
||||||
|
assert result["errors"] == {}
|
||||||
|
|
||||||
|
with (
|
||||||
|
patch(
|
||||||
|
"homeassistant.components.yalexs_ble.config_flow.PushLock.validate",
|
||||||
|
),
|
||||||
|
patch(
|
||||||
|
"homeassistant.components.yalexs_ble.async_setup_entry",
|
||||||
|
return_value=True,
|
||||||
|
) as mock_setup_entry,
|
||||||
|
):
|
||||||
|
result2 = await hass.config_entries.flow.async_configure(
|
||||||
|
result["flow_id"],
|
||||||
|
{
|
||||||
|
CONF_ADDRESS: YALE_ACCESS_LOCK_DISCOVERY_INFO.address,
|
||||||
|
CONF_KEY: "2fd51b8621c6a139eaffbedcb846b60f",
|
||||||
|
CONF_SLOT: slot,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
await hass.async_block_till_done()
|
||||||
|
|
||||||
|
assert result2["type"] is FlowResultType.CREATE_ENTRY
|
||||||
|
assert result2["title"] == YALE_ACCESS_LOCK_DISCOVERY_INFO.name
|
||||||
|
assert result2["data"] == {
|
||||||
|
CONF_LOCAL_NAME: YALE_ACCESS_LOCK_DISCOVERY_INFO.name,
|
||||||
|
CONF_ADDRESS: YALE_ACCESS_LOCK_DISCOVERY_INFO.address,
|
||||||
|
CONF_KEY: "2fd51b8621c6a139eaffbedcb846b60f",
|
||||||
|
CONF_SLOT: slot,
|
||||||
|
}
|
||||||
|
assert result2["result"].unique_id == YALE_ACCESS_LOCK_DISCOVERY_INFO.address
|
||||||
|
assert len(mock_setup_entry.mock_calls) == 1
|
||||||
|
|
||||||
|
|
||||||
async def test_user_step_no_devices_found(hass: HomeAssistant) -> None:
|
async def test_user_step_no_devices_found(hass: HomeAssistant) -> None:
|
||||||
"""Test user step with no devices found."""
|
"""Test user step with no devices found."""
|
||||||
with patch(
|
with patch(
|
||||||
|
Loading…
x
Reference in New Issue
Block a user