From 4e4608183e1a2618c1f997f4376a2ca8cf58735f Mon Sep 17 00:00:00 2001
From: epenet <6771947+epenet@users.noreply.github.com>
Date: Thu, 9 Mar 2023 19:04:07 +0100
Subject: [PATCH] Add missing mock in fibaro config flow tests (#89440)

---
 tests/components/fibaro/conftest.py         | 14 ++++++++++++++
 tests/components/fibaro/test_config_flow.py |  8 ++------
 2 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 tests/components/fibaro/conftest.py

diff --git a/tests/components/fibaro/conftest.py b/tests/components/fibaro/conftest.py
new file mode 100644
index 00000000000..9f1c87c1d98
--- /dev/null
+++ b/tests/components/fibaro/conftest.py
@@ -0,0 +1,14 @@
+"""Test helpers."""
+from collections.abc import Generator
+from unittest.mock import AsyncMock, patch
+
+import pytest
+
+
+@pytest.fixture
+def mock_setup_entry() -> Generator[AsyncMock, None, None]:
+    """Override async_setup_entry."""
+    with patch(
+        "homeassistant.components.fibaro.async_setup_entry", return_value=True
+    ) as mock_setup_entry:
+        yield mock_setup_entry
diff --git a/tests/components/fibaro/test_config_flow.py b/tests/components/fibaro/test_config_flow.py
index 0854bb532e4..cb3d35d6f43 100644
--- a/tests/components/fibaro/test_config_flow.py
+++ b/tests/components/fibaro/test_config_flow.py
@@ -20,6 +20,8 @@ TEST_USERNAME = "user"
 TEST_PASSWORD = "password"
 TEST_VERSION = "4.360"
 
+pytestmark = pytest.mark.usefixtures("mock_setup_entry")
+
 
 @pytest.fixture(name="fibaro_client", autouse=True)
 def fibaro_client_fixture():
@@ -69,9 +71,6 @@ async def test_config_flow_user_initiated_success(hass: HomeAssistant) -> None:
     with patch(
         "homeassistant.components.fibaro.FibaroClient.connect",
         return_value=True,
-    ), patch(
-        "homeassistant.components.fibaro.async_setup_entry",
-        return_value=True,
     ):
         result = await hass.config_entries.flow.async_configure(
             result["flow_id"],
@@ -239,9 +238,6 @@ async def test_reauth_success(hass: HomeAssistant) -> None:
 
     with patch(
         "homeassistant.components.fibaro.FibaroClient.connect", return_value=True
-    ), patch(
-        "homeassistant.components.fibaro.async_setup_entry",
-        return_value=True,
     ):
         result = await hass.config_entries.flow.async_configure(
             result["flow_id"],