evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add devices check to iCloud config flow (#31950)

Browse source 
* Add devices check to iCloud config flow

* Some test rename

* Bump pyicloud to catch KeyError
This commit is contained in:
Quentame 2020-03-10 11:42:04 +01:00 • committed by GitHub
parent 8c52e2c923
commit 2e802c88f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 64 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

41
tests/components/icloud/test_config_flow.py
View file

@ -46,8 +46,8 @@ def mock_controller_service():
yield service_mock
@pytest.fixture(name="service_with_cookie")
def mock_controller_service_with_cookie():
@pytest.fixture(name="service_authenticated")
def mock_controller_service_authenticated():
"""Mock a successful service while already authenticate."""
with patch(
"homeassistant.components.icloud.config_flow.PyiCloudService"
@ -59,6 +59,20 @@ def mock_controller_service_with_cookie():
yield service_mock
@pytest.fixture(name="service_authenticated_no_device")
def mock_controller_service_authenticated_no_device():
"""Mock a successful service while already authenticate, but without device."""
with patch(
"homeassistant.components.icloud.config_flow.PyiCloudService"
) as service_mock:
service_mock.return_value.requires_2sa = False
service_mock.return_value.trusted_devices = TRUSTED_DEVICES
service_mock.return_value.send_verification_code = Mock(return_value=True)
service_mock.return_value.validate_verification_code = Mock(return_value=True)
service_mock.return_value.devices = {}
yield service_mock
@pytest.fixture(name="service_send_verification_code_failed")
def mock_controller_service_send_verification_code_failed():
"""Mock a failed service during sending verification code step."""
@ -103,7 +117,7 @@ async def test_user(hass: HomeAssistantType, service: MagicMock):
async def test_user_with_cookie(
hass: HomeAssistantType, service_with_cookie: MagicMock
hass: HomeAssistantType, service_authenticated: MagicMock
):
"""Test user config with presence of a cookie."""
# test with all provided
@ -148,7 +162,7 @@ async def test_import(hass: HomeAssistantType, service: MagicMock):
async def test_import_with_cookie(
hass: HomeAssistantType, service_with_cookie: MagicMock
hass: HomeAssistantType, service_authenticated: MagicMock
):
"""Test import step with presence of a cookie."""
# import with username and password
@ -186,7 +200,7 @@ async def test_import_with_cookie(
async def test_two_accounts_setup(
hass: HomeAssistantType, service_with_cookie: MagicMock
hass: HomeAssistantType, service_authenticated: MagicMock
):
"""Test to setup two accounts."""
MockConfigEntry(
@ -210,7 +224,7 @@ async def test_two_accounts_setup(
assert result["data"][CONF_GPS_ACCURACY_THRESHOLD] == DEFAULT_GPS_ACCURACY_THRESHOLD
async def test_abort_if_already_setup(hass: HomeAssistantType):
async def test_already_setup(hass: HomeAssistantType):
"""Test we abort if the account is already setup."""
MockConfigEntry(
domain=DOMAIN,
@ -240,7 +254,7 @@ async def test_abort_if_already_setup(hass: HomeAssistantType):
async def test_login_failed(hass: HomeAssistantType):
"""Test when we have errors during login."""
with patch(
"pyicloud.base.PyiCloudService.authenticate",
"homeassistant.components.icloud.config_flow.PyiCloudService.authenticate",
side_effect=PyiCloudFailedLoginException(),
):
result = await hass.config_entries.flow.async_init(
@ -252,6 +266,19 @@ async def test_login_failed(hass: HomeAssistantType):
assert result["errors"] == {CONF_USERNAME: "login"}
async def test_no_device(
hass: HomeAssistantType, service_authenticated_no_device: MagicMock
):
"""Test when we have no devices."""
result = await hass.config_entries.flow.async_init(
DOMAIN,
context={"source": SOURCE_USER},
data={CONF_USERNAME: USERNAME, CONF_PASSWORD: PASSWORD},
)
assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
assert result["reason"] == "no_device"
async def test_trusted_device(hass: HomeAssistantType, service: MagicMock):
"""Test trusted_device step."""
result = await hass.config_entries.flow.async_init(