From 7efc581a4801b59dca59bb0c2040683905ca5b9f Mon Sep 17 00:00:00 2001
From: Jan-Philipp Benecke <jan-philipp@bnck.me>
Date: Mon, 27 Nov 2023 21:35:13 +0100
Subject: [PATCH] Remove duplicate fixture from bsblan (#104612)

---
 tests/components/bsblan/conftest.py         | 20 +++++---------------
 tests/components/bsblan/test_config_flow.py | 10 +++++-----
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/tests/components/bsblan/conftest.py b/tests/components/bsblan/conftest.py
index 44d87745b3f..b7939e4cb50 100644
--- a/tests/components/bsblan/conftest.py
+++ b/tests/components/bsblan/conftest.py
@@ -38,25 +38,15 @@ def mock_setup_entry() -> Generator[AsyncMock, None, None]:
         yield mock_setup
 
 
-@pytest.fixture
-def mock_bsblan_config_flow() -> Generator[None, MagicMock, None]:
-    """Return a mocked BSBLAN client."""
-    with patch(
-        "homeassistant.components.bsblan.config_flow.BSBLAN", autospec=True
-    ) as bsblan_mock:
-        bsblan = bsblan_mock.return_value
-        bsblan.device.return_value = Device.parse_raw(
-            load_fixture("device.json", DOMAIN)
-        )
-        bsblan.info.return_value = Info.parse_raw(load_fixture("info.json", DOMAIN))
-        yield bsblan
-
-
 @pytest.fixture
 def mock_bsblan(request: pytest.FixtureRequest) -> Generator[None, MagicMock, None]:
     """Return a mocked BSBLAN client."""
 
-    with patch("homeassistant.components.bsblan.BSBLAN", autospec=True) as bsblan_mock:
+    with patch(
+        "homeassistant.components.bsblan.BSBLAN", autospec=True
+    ) as bsblan_mock, patch(
+        "homeassistant.components.bsblan.config_flow.BSBLAN", new=bsblan_mock
+    ):
         bsblan = bsblan_mock.return_value
         bsblan.info.return_value = Info.parse_raw(load_fixture("info.json", DOMAIN))
         bsblan.device.return_value = Device.parse_raw(
diff --git a/tests/components/bsblan/test_config_flow.py b/tests/components/bsblan/test_config_flow.py
index dce881f2f7d..d82c32463d8 100644
--- a/tests/components/bsblan/test_config_flow.py
+++ b/tests/components/bsblan/test_config_flow.py
@@ -16,7 +16,7 @@ from tests.common import MockConfigEntry
 
 async def test_full_user_flow_implementation(
     hass: HomeAssistant,
-    mock_bsblan_config_flow: MagicMock,
+    mock_bsblan: MagicMock,
     mock_setup_entry: AsyncMock,
 ) -> None:
     """Test the full manual user flow from start to finish."""
@@ -52,7 +52,7 @@ async def test_full_user_flow_implementation(
     assert result2["result"].unique_id == format_mac("00:80:41:19:69:90")
 
     assert len(mock_setup_entry.mock_calls) == 1
-    assert len(mock_bsblan_config_flow.device.mock_calls) == 1
+    assert len(mock_bsblan.device.mock_calls) == 1
 
 
 async def test_show_user_form(hass: HomeAssistant) -> None:
@@ -68,10 +68,10 @@ async def test_show_user_form(hass: HomeAssistant) -> None:
 
 async def test_connection_error(
     hass: HomeAssistant,
-    mock_bsblan_config_flow: MagicMock,
+    mock_bsblan: MagicMock,
 ) -> None:
     """Test we show user form on BSBLan connection error."""
-    mock_bsblan_config_flow.device.side_effect = BSBLANConnectionError
+    mock_bsblan.device.side_effect = BSBLANConnectionError
 
     result = await hass.config_entries.flow.async_init(
         DOMAIN,
@@ -92,7 +92,7 @@ async def test_connection_error(
 
 async def test_user_device_exists_abort(
     hass: HomeAssistant,
-    mock_bsblan_config_flow: MagicMock,
+    mock_bsblan: MagicMock,
     mock_config_entry: MockConfigEntry,
 ) -> None:
     """Test we abort flow if BSBLAN device already configured."""