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

Use common Strings for Ambiclimate config flow (#41100)

Browse Source
This commit is contained in:
Spartan-II-117 2020-10-03 04:43:34 -07:00 committed by GitHub
parent 01e47a977b
commit 4c00ff98ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
homeassistant/components/ambiclimate/config_flow.py
View File

@ -53,20 +53,20 @@ class AmbiclimateFlowHandler(config_entries.ConfigFlow):
async def async_step_user(self, user_input=None): async def async_step_user(self, user_input=None):
"""Handle external yaml configuration.""" """Handle external yaml configuration."""
if self.hass.config_entries.async_entries(DOMAIN): if self.hass.config_entries.async_entries(DOMAIN):
return self.async_abort(reason="already_setup") return self.async_abort(reason="already_configured_account")
config = self.hass.data.get(DATA_AMBICLIMATE_IMPL, {}) config = self.hass.data.get(DATA_AMBICLIMATE_IMPL, {})
if not config: if not config:
_LOGGER.debug("No config") _LOGGER.debug("No config")
return self.async_abort(reason="no_config") return self.async_abort(reason="oauth2_missing_configuration")
return await self.async_step_auth() return await self.async_step_auth()
async def async_step_auth(self, user_input=None): async def async_step_auth(self, user_input=None):
"""Handle a flow start.""" """Handle a flow start."""
if self.hass.config_entries.async_entries(DOMAIN): if self.hass.config_entries.async_entries(DOMAIN):
return self.async_abort(reason="already_setup") return self.async_abort(reason="already_configured_account")
errors = {} errors = {}
@ -88,7 +88,7 @@ class AmbiclimateFlowHandler(config_entries.ConfigFlow):
async def async_step_code(self, code=None): async def async_step_code(self, code=None):
"""Received code for authentication.""" """Received code for authentication."""
if self.hass.config_entries.async_entries(DOMAIN): if self.hass.config_entries.async_entries(DOMAIN):
return self.async_abort(reason="already_setup") return self.async_abort(reason="already_configured_account")
token_info = await self._get_token_info(code) token_info = await self._get_token_info(code)

4
homeassistant/components/ambiclimate/strings.json
View File

@ -14,8 +14,8 @@
"follow_link": "Please follow the link and authenticate before pressing Submit" "follow_link": "Please follow the link and authenticate before pressing Submit"
}, },
"abort": { "abort": {
"already_setup": "The Ambiclimate account is configured.", "already_configured_account": "[%key:common::config_flow::abort::already_configured_account%]",
"no_config": "You need to configure Ambiclimate before being able to authenticate with it. [Please read the instructions](https://www.home-assistant.io/components/ambiclimate/).", "oauth2_missing_configuration": "[%key:common::config_flow::abort::oauth2_missing_configuration%]",
"access_token": "Unknown error generating an access token." "access_token": "Unknown error generating an access token."
} }
} }

8
tests/components/ambiclimate/test_config_flow.py
View File

@ -30,7 +30,7 @@ async def test_abort_if_no_implementation_registered(hass):
result = await flow.async_step_user() result = await flow.async_step_user()
assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
assert result["reason"] == "no_config" assert result["reason"] == "oauth2_missing_configuration"
async def test_abort_if_already_setup(hass): async def test_abort_if_already_setup(hass):
@ -40,12 +40,12 @@ async def test_abort_if_already_setup(hass):
with patch.object(hass.config_entries, "async_entries", return_value=[{}]): with patch.object(hass.config_entries, "async_entries", return_value=[{}]):
result = await flow.async_step_user() result = await flow.async_step_user()
assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
assert result["reason"] == "already_setup" assert result["reason"] == "already_configured_account"
with patch.object(hass.config_entries, "async_entries", return_value=[{}]): with patch.object(hass.config_entries, "async_entries", return_value=[{}]):
result = await flow.async_step_code() result = await flow.async_step_code()
assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
assert result["reason"] == "already_setup" assert result["reason"] == "already_configured_account"
async def test_full_flow_implementation(hass): async def test_full_flow_implementation(hass):
@ -107,7 +107,7 @@ async def test_already_setup(hass):
result = await flow.async_step_user() result = await flow.async_step_user()
assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
assert result["reason"] == "already_setup" assert result["reason"] == "already_configured_account"
async def test_view(hass): async def test_view(hass):