Added possibility to reply into webhook with files (#1120)

tests/test_dispatcher/test_dispatcher.py

@@ -12,7 +12,7 @@ from aiogram import Bot
 from aiogram.dispatcher.dispatcher import Dispatcher
 from aiogram.dispatcher.event.bases import UNHANDLED, SkipHandler
 from aiogram.dispatcher.router import Router
-from aiogram.methods import GetMe, GetUpdates, SendMessage
+from aiogram.methods import GetMe, GetUpdates, Request, SendMessage
 from aiogram.types import (
     CallbackQuery,
     Chat,
@@ -703,9 +703,9 @@ class TestDispatcher:
         dispatcher.message.register(simple_message_handler)
 
         response = await dispatcher.feed_webhook_update(bot, RAW_UPDATE, _timeout=0.3)
-        assert isinstance(response, dict)
-        assert response["method"] == "sendMessage"
-        assert response["text"] == "ok"
+        assert isinstance(response, Request)
+        assert response.method == "sendMessage"
+        assert response.data["text"] == "ok"
 
     async def test_feed_webhook_update_slow_process(self, bot: MockedBot, recwarn):
         warnings.simplefilter("always")

tests/test_webhook/test_aiohtt_server.py

@@ -6,13 +6,13 @@ from typing import Any, Dict
 from unittest.mock import AsyncMock, patch
 
 import pytest
-from aiohttp import web
+from aiohttp import MultipartReader, web
 from aiohttp.test_utils import TestClient
 from aiohttp.web_app import Application
 
 from aiogram import Dispatcher, F
 from aiogram.methods import GetMe, Request
-from aiogram.types import Message, User
+from aiogram.types import BufferedInputFile, Message, User
 from aiogram.webhook.aiohttp_server import (
     SimpleRequestHandler,
     TokenBasedRequestHandler,
@@ -73,16 +73,16 @@ class TestSimpleRequestHandler:
             },
         )
 
-    async def test(self, bot: MockedBot, aiohttp_client):
+    async def test_reply_into_webhook_file(self, bot: MockedBot, aiohttp_client):
         app = Application()
         dp = Dispatcher()
 
-        handler_event = Event()
-
         @dp.message(F.text == "test")
         def handle_message(msg: Message):
-            handler_event.set()
-            return msg.answer("PASS")
+            return msg.answer_document(
+                caption="PASS",
+                document=BufferedInputFile(b"test", filename="test.txt"),
+            )
 
         handler = SimpleRequestHandler(
             dispatcher=dp,
@@ -94,15 +94,88 @@ class TestSimpleRequestHandler:
 
         resp = await self.make_reqest(client=client)
         assert resp.status == 200
-        result = await resp.json()
+        assert resp.content_type == "multipart/form-data"
+        result = {}
+        reader = MultipartReader.from_response(resp)
+        while part := await reader.next():
+            value = await part.read()
+            result[part.name] = value.decode()
+        assert result["method"] == "sendDocument"
+        assert result["caption"] == "PASS"
+        assert result["document"] == "test"
+
+    async def test_reply_into_webhook_text(self, bot: MockedBot, aiohttp_client):
+        app = Application()
+        dp = Dispatcher()
+
+        @dp.message(F.text == "test")
+        def handle_message(msg: Message):
+            return msg.answer(text="PASS")
+
+        handler = SimpleRequestHandler(
+            dispatcher=dp,
+            bot=bot,
+            handle_in_background=False,
+        )
+        handler.register(app, path="/webhook")
+        client: TestClient = await aiohttp_client(app)
+
+        resp = await self.make_reqest(client=client)
+        assert resp.status == 200
+        assert resp.content_type == "multipart/form-data"
+        result = {}
+        reader = MultipartReader.from_response(resp)
+        while part := await reader.next():
+            value = await part.read()
+            result[part.name] = value.decode()
         assert result["method"] == "sendMessage"
+        assert result["text"] == "PASS"
+
+    async def test_reply_into_webhook_unhandled(self, bot: MockedBot, aiohttp_client):
+        app = Application()
+        dp = Dispatcher()
+
+        @dp.message(F.text == "test")
+        def handle_message(msg: Message):
+            return msg.answer(text="PASS")
+
+        handler = SimpleRequestHandler(
+            dispatcher=dp,
+            bot=bot,
+            handle_in_background=False,
+        )
+        handler.register(app, path="/webhook")
+        client: TestClient = await aiohttp_client(app)
 
         resp = await self.make_reqest(client=client, text="spam")
         assert resp.status == 200
-        result = await resp.json()
+        assert resp.content_type == "multipart/form-data"
+        result = {}
+        reader = MultipartReader.from_response(resp)
+        while part := await reader.next():
+            value = await part.read()
+            result[part.name] = value.decode()
         assert not result
 
-        handler.handle_in_background = True
+    async def test_reply_into_webhook_background(self, bot: MockedBot, aiohttp_client):
+        app = Application()
+        dp = Dispatcher()
+
+        handler_event = Event()
+
+        @dp.message(F.text == "test")
+        def handle_message(msg: Message):
+            handler_event.set()
+            return msg.answer(text="PASS")
+
+        handler = SimpleRequestHandler(
+            dispatcher=dp,
+            bot=bot,
+            handle_in_background=True,
+        )
+        handler.register(app, path="/webhook")
+        client: TestClient = await aiohttp_client(app)
+
         with patch(
             "aiogram.dispatcher.dispatcher.Dispatcher.silent_call_request",
             new_callable=AsyncMock,