From 55d1be6c8c7aaedb75e32a946f8196d23839cd2d Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Mon, 23 Jun 2025 16:17:09 +0200
Subject: [PATCH] fixes

---
 tests/components/esphome/test_manager.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/tests/components/esphome/test_manager.py b/tests/components/esphome/test_manager.py
index b0bbea03fe6..492a576cf3d 100644
--- a/tests/components/esphome/test_manager.py
+++ b/tests/components/esphome/test_manager.py
@@ -1181,6 +1181,29 @@ async def test_esphome_device_with_suggested_area(
     assert dev.suggested_area == "kitchen"
 
 
+async def test_esphome_device_area_priority(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    mock_client: APIClient,
+    mock_esphome_device: MockESPHomeDeviceType,
+) -> None:
+    """Test that device_info.area takes priority over suggested_area."""
+    device = await mock_esphome_device(
+        mock_client=mock_client,
+        device_info={
+            "suggested_area": "kitchen",
+            "area": AreaInfo(area_id=0, name="Living Room"),
+        },
+    )
+    await hass.async_block_till_done()
+    entry = device.entry
+    dev = device_registry.async_get_device(
+        connections={(dr.CONNECTION_NETWORK_MAC, entry.unique_id)}
+    )
+    # Should use device_info.area.name instead of suggested_area
+    assert dev.suggested_area == "Living Room"
+
+
 async def test_esphome_device_with_project(
     hass: HomeAssistant,
     device_registry: dr.DeviceRegistry,