jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-22 20:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move HomeKit autostart to advanced options flow (#44599)

Browse Source
This commit is contained in:
J. Nick Koston 2020-12-29 02:54:24 -10:00 committed by GitHub
parent c756457aa1
commit 4905be0c40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
homeassistant/components/homekit/config_flow.py
View File

@ -128,7 +128,6 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
default_domains = [] if self._async_current_names() else DEFAULT_DOMAINS
setup_schema = vol.Schema(
{
vol.Optional(CONF_AUTO_START, default=DEFAULT_AUTO_START): bool,
vol.Required(
CONF_INCLUDE_DOMAINS, default=default_domains
): cv.multi_select(SUPPORTED_DOMAINS),

3
homeassistant/components/homekit/strings.json
View File

@ -30,7 +30,7 @@
},
"advanced": {
"data": {
"auto_start": "[%key:component::homekit::config::step::user::data::auto_start%]",
"auto_start": "Autostart (disable if you are calling the homekit.start service manually)",
"safe_mode": "Safe Mode (enable only if pairing fails)"
},
"description": "These settings only need to be adjusted if HomeKit is not functional.",
@ -42,7 +42,6 @@
"step": {
"user": {
"data": {
"auto_start": "Autostart (disable if using Z-Wave or other delayed start system)",
"include_domains": "Domains to include"
},
"description": "The HomeKit integration will allow you to access your Home Assistant entities in HomeKit. In bridge mode, HomeKit Bridges are limited to 150 accessories per instance including the bridge itself. If you wish to bridge more than the maximum number of accessories, it is recommended that you use multiple HomeKit bridges for different domains. Detailed entity configuration is only available via YAML for the primary bridge.",

27
tests/components/homekit/test_config_flow.py
View File

@ -1,4 +1,6 @@
"""Test the HomeKit config flow."""
import pytest
from homeassistant import config_entries, data_entry_flow, setup
from homeassistant.components.homekit.const import DOMAIN
from homeassistant.config_entries import SOURCE_IMPORT
@ -25,7 +27,6 @@ def _mock_config_entry_with_options_populated():
],
"exclude_entities": ["climate.front_gate"],
},
"auto_start": False,
"safe_mode": False,
},
)
@ -46,7 +47,7 @@ async def test_user_form(hass):
):
result2 = await hass.config_entries.flow.async_configure(
result["flow_id"],
{"auto_start": True, "include_domains": ["light"]},
{"include_domains": ["light"]},
)
assert result2["type"] == data_entry_flow.RESULT_TYPE_FORM
@ -68,7 +69,6 @@ async def test_user_form(hass):
assert result3["title"][:11] == "HASS Bridge"
bridge_name = (result3["title"].split(":"))[0]
assert result3["data"] == {
"auto_start": True,
"filter": {
"exclude_domains": [],
"exclude_entities": [],
@ -123,7 +123,8 @@ async def test_import(hass):
assert len(mock_setup_entry.mock_calls) == 2
async def test_options_flow_exclude_mode_advanced(hass):
@pytest.mark.parametrize("auto_start", [True, False])
async def test_options_flow_exclude_mode_advanced(auto_start, hass):
"""Test config flow options in exclude mode with advanced options."""
config_entry = _mock_config_entry_with_options_populated()
@ -157,12 +158,12 @@ async def test_options_flow_exclude_mode_advanced(hass):
with patch("homeassistant.components.homekit.async_setup_entry", return_value=True):
result3 = await hass.config_entries.options.async_configure(
result2["flow_id"],
user_input={"auto_start": True, "safe_mode": True},
user_input={"auto_start": auto_start, "safe_mode": True},
)
assert result3["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
assert config_entry.options == {
"auto_start": True,
"auto_start": auto_start,
"mode": "bridge",
"filter": {
"exclude_domains": [],
@ -213,7 +214,7 @@ async def test_options_flow_exclude_mode_basic(hass):
assert result3["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
assert config_entry.options == {
"auto_start": False,
"auto_start": True,
"mode": "bridge",
"filter": {
"exclude_domains": [],
@ -266,7 +267,7 @@ async def test_options_flow_include_mode_basic(hass):
assert result3["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
assert config_entry.options == {
"auto_start": False,
"auto_start": True,
"mode": "bridge",
"filter": {
"exclude_domains": [],
@ -332,7 +333,7 @@ async def test_options_flow_exclude_mode_with_cameras(hass):
assert result4["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
assert config_entry.options == {
"auto_start": False,
"auto_start": True,
"mode": "bridge",
"filter": {
"exclude_domains": [],
@ -387,7 +388,7 @@ async def test_options_flow_exclude_mode_with_cameras(hass):
assert result4["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
assert config_entry.options == {
"auto_start": False,
"auto_start": True,
"mode": "bridge",
"filter": {
"exclude_domains": [],
@ -454,7 +455,7 @@ async def test_options_flow_include_mode_with_cameras(hass):
assert result4["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
assert config_entry.options == {
"auto_start": False,
"auto_start": True,
"mode": "bridge",
"filter": {
"exclude_domains": [],
@ -509,7 +510,7 @@ async def test_options_flow_include_mode_with_cameras(hass):
assert result4["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
assert config_entry.options == {
"auto_start": False,
"auto_start": True,
"mode": "bridge",
"filter": {
"exclude_domains": [],
@ -603,7 +604,7 @@ async def test_options_flow_include_mode_basic_accessory(hass):
assert result3["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
assert config_entry.options == {
"auto_start": False,
"auto_start": True,
"mode": "accessory",
"filter": {
"exclude_domains": [],