Remove yaml in tests for Telegram webhook bot (home-assistant#157091)

Author: hanwg

tests/components/telegram_bot/conftest.py

@@ -307,20 +307,36 @@ def mock_webhooks_config_entry() -> MockConfigEntry:
             CONF_PLATFORM: PLATFORM_WEBHOOKS,
             CONF_API_KEY: "mock api key",
             CONF_URL: "https://test",
-            CONF_TRUSTED_NETWORKS: ["149.154.160.0/20", "91.108.4.0/22"],
+            CONF_TRUSTED_NETWORKS: ["127.0.0.1"],
         },
         options={ATTR_PARSER: PARSER_MD},
         subentries_data=[
             ConfigSubentryData(
-                unique_id="1234567890",
-                data={CONF_CHAT_ID: 1234567890},
+                unique_id="12345678",
+                data={CONF_CHAT_ID: 12345678},
                 subentry_type=CONF_ALLOWED_CHAT_IDS,
                 title="mock chat",
             )
         ],
     )
 
 
+@pytest.fixture
+async def webhook_bot(
+    hass: HomeAssistant,
+    mock_webhooks_config_entry: MockConfigEntry,
+    mock_register_webhook: None,
+    mock_external_calls: None,
+    mock_generate_secret_token: str,
+) -> AsyncGenerator[None]:
+    """Fixture for setting up a webhook telegram bot."""
+    mock_webhooks_config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(mock_webhooks_config_entry.entry_id)
+    await hass.async_block_till_done()
+    yield
+    await hass.async_stop()
+
+
 @pytest.fixture
 async def webhook_platform(
     hass: HomeAssistant,

tests/components/telegram_bot/snapshots/test_diagnostics.ambr

@@ -4,15 +4,14 @@
     'data': dict({
       'api_key': '**REDACTED**',
       'platform': 'webhooks',
-      'proxy_url': None,
       'trusted_networks': list([
-        '127.0.0.1/32',
+        '127.0.0.1',
       ]),
       'url': 'https://**redacted**/',
     }),
     'options': dict({
       'parse_mode': 'markdown',
     }),
-    'subentries_count': 2,
+    'subentries_count': 1,
   })
 # ---

tests/components/telegram_bot/test_broadcast.py

@@ -1,22 +1,16 @@
 """Test Telegram broadcast."""
 
 from homeassistant.core import HomeAssistant
-from homeassistant.setup import async_setup_component
 
+from tests.common import MockConfigEntry
 
-async def test_setup(hass: HomeAssistant, mock_external_calls: None) -> None:
+
+async def test_setup(
+    hass: HomeAssistant, mock_broadcast_config_entry: MockConfigEntry
+) -> None:
     """Test setting up Telegram broadcast."""
-    assert await async_setup_component(
-        hass,
-        "telegram_bot",
-        {
-            "telegram_bot": {
-                "platform": "broadcast",
-                "api_key": "1234567890:ABC",
-                "allowed_chat_ids": [1],
-            }
-        },
-    )
+    mock_broadcast_config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(mock_broadcast_config_entry.entry_id)
     await hass.async_block_till_done()
 
     assert hass.services.has_service("telegram_bot", "send_message") is True

tests/components/telegram_bot/test_diagnostics.py

@@ -12,9 +12,7 @@
 async def test_diagnostics(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
-    webhook_platform,
-    mock_external_calls: None,
-    mock_generate_secret_token,
+    webhook_bot,
     snapshot: SnapshotAssertion,
 ) -> None:
     """Test diagnostics."""

tests/components/telegram_bot/test_notify.py

@@ -22,9 +22,9 @@
 @pytest.mark.freeze_time("2025-01-09T12:00:00+00:00")
 async def test_send_message(
     hass: HomeAssistant,
-    webhook_platform: None,
+    webhook_bot: None,
 ) -> None:
-    """Test publishing ntfy message."""
+    """Test send message."""
 
     context = Context()
     events = async_capture_events(hass, "telegram_sent")
@@ -35,15 +35,15 @@ async def test_send_message(
             return_value=Message(
                 message_id=12345,
                 date=datetime.now(),
-                chat=Chat(id=123456, type=ChatType.PRIVATE),
+                chat=Chat(id=12345678, type=ChatType.PRIVATE),
             )
         ),
     ) as mock_send_message:
         await hass.services.async_call(
             NOTIFY_DOMAIN,
             SERVICE_SEND_MESSAGE,
             {
-                ATTR_ENTITY_ID: "notify.testbot_mock_last_name_mock_title_12345678",
+                ATTR_ENTITY_ID: "notify.mock_title_mock_chat",
                 ATTR_MESSAGE: "mock message",
                 ATTR_TITLE: "mock title",
             },
@@ -64,7 +64,7 @@ async def test_send_message(
             message_thread_id=None,
         )
 
-    state = hass.states.get("notify.testbot_mock_last_name_mock_title_12345678")
+    state = hass.states.get("notify.mock_title_mock_chat")
     assert state
     assert state.state == "2025-01-09T12:00:00+00:00"