From 87deb2344c6537d5db1dd3d9f69da8e266101e37 Mon Sep 17 00:00:00 2001 From: Ronaldo Lima <4389565+ronal2do@users.noreply.github.com> Date: Sat, 17 Oct 2020 01:27:44 +0200 Subject: [PATCH] Use common strings in Azure DevOps config flow (#41974) --- homeassistant/components/azure_devops/config_flow.py | 4 ++-- homeassistant/components/azure_devops/strings.json | 4 ++-- tests/components/azure_devops/test_config_flow.py | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/homeassistant/components/azure_devops/config_flow.py b/homeassistant/components/azure_devops/config_flow.py index 94235acbba6..e1e7d833926 100644 --- a/homeassistant/components/azure_devops/config_flow.py +++ b/homeassistant/components/azure_devops/config_flow.py @@ -60,14 +60,14 @@ class AzureDevOpsFlowHandler(ConfigFlow, domain=DOMAIN): if self._pat is not None: await client.authorize(self._pat, self._organization) if not client.authorized: - errors["base"] = "authorization_error" + errors["base"] = "invalid_auth" return errors project_info = await client.get_project(self._organization, self._project) if project_info is None: errors["base"] = "project_error" return errors except aiohttp.ClientError: - errors["base"] = "connection_error" + errors["base"] = "cannot_connect" return errors return None diff --git a/homeassistant/components/azure_devops/strings.json b/homeassistant/components/azure_devops/strings.json index 64ad79c7698..6c274404612 100644 --- a/homeassistant/components/azure_devops/strings.json +++ b/homeassistant/components/azure_devops/strings.json @@ -2,8 +2,8 @@ "config": { "flow_title": "Azure DevOps: {project_url}", "error": { - "authorization_error": "Authorization error. Check you have access to the project and have the correct credentials.", - "connection_error": "Could not connect to Azure DevOps.", + "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]", + "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]", "project_error": "Could not get project info." }, "step": { diff --git a/tests/components/azure_devops/test_config_flow.py b/tests/components/azure_devops/test_config_flow.py index fce4c6f5df3..daad5992350 100644 --- a/tests/components/azure_devops/test_config_flow.py +++ b/tests/components/azure_devops/test_config_flow.py @@ -51,7 +51,7 @@ async def test_authorization_error(hass: HomeAssistant) -> None: assert result2["type"] == data_entry_flow.RESULT_TYPE_FORM assert result2["step_id"] == "user" - assert result2["errors"] == {"base": "authorization_error"} + assert result2["errors"] == {"base": "invalid_auth"} async def test_reauth_authorization_error(hass: HomeAssistant) -> None: @@ -75,7 +75,7 @@ async def test_reauth_authorization_error(hass: HomeAssistant) -> None: assert result2["type"] == data_entry_flow.RESULT_TYPE_FORM assert result2["step_id"] == "reauth" - assert result2["errors"] == {"base": "authorization_error"} + assert result2["errors"] == {"base": "invalid_auth"} async def test_connection_error(hass: HomeAssistant) -> None: @@ -99,7 +99,7 @@ async def test_connection_error(hass: HomeAssistant) -> None: assert result2["type"] == data_entry_flow.RESULT_TYPE_FORM assert result2["step_id"] == "user" - assert result2["errors"] == {"base": "connection_error"} + assert result2["errors"] == {"base": "cannot_connect"} async def test_reauth_connection_error(hass: HomeAssistant) -> None: @@ -123,7 +123,7 @@ async def test_reauth_connection_error(hass: HomeAssistant) -> None: assert result2["type"] == data_entry_flow.RESULT_TYPE_FORM assert result2["step_id"] == "reauth" - assert result2["errors"] == {"base": "connection_error"} + assert result2["errors"] == {"base": "cannot_connect"} async def test_project_error(hass: HomeAssistant) -> None: @@ -201,7 +201,7 @@ async def test_reauth_flow(hass: HomeAssistant) -> None: assert result["type"] == data_entry_flow.RESULT_TYPE_FORM assert result["step_id"] == "reauth" - assert result["errors"] == {"base": "authorization_error"} + assert result["errors"] == {"base": "invalid_auth"} with patch( "homeassistant.components.azure_devops.config_flow.DevOpsClient.authorize",