update "text" key to "body"

This commit is contained in:
Guilhem Saurel 2021-07-31 11:21:29 +02:00
parent 8b32c972b8
commit 292d77274d
5 changed files with 39 additions and 11 deletions

View file

@ -88,7 +88,7 @@ def run_and_test():
srv.terminate()
# TODO Check what the bot says when the server is offline
# print(bot_req({'text': 'bye'}, KEY), {'status': 200, 'ret': 'OK'})
# print(bot_req({'data': 'bye'}, KEY), {'status': 200, 'ret': 'OK'})
LOGGER.info("Stopping the bot")
bot.terminate()

View file

@ -15,19 +15,19 @@ class BotTest(unittest.IsolatedAsyncioTestCase):
self.assertEqual(bot_req(), {"status": 400, "ret": "Invalid JSON"})
self.assertEqual(
bot_req({"toto": 3}),
{"status": 400, "ret": "Missing text and/or API key property"},
{"status": 400, "ret": "Missing body and/or API key property"},
)
self.assertEqual(
bot_req({"text": 3, "key": None}), {"status": 401, "ret": "Invalid API key"}
bot_req({"body": 3, "key": None}), {"status": 401, "ret": "Invalid API key"}
)
# TODO: if the client from matrix_webhook has olm support, this won't be a 403 from synapse,
# but a LocalProtocolError from matrix_webhook
self.assertEqual(
bot_req({"text": 3}, KEY), {"status": 403, "ret": "Unknown room"}
bot_req({"body": 3}, KEY), {"status": 403, "ret": "Unknown room"}
)
async def test_message(self):
"""Send a markdown message, and check the result."""
"""Send a markdown message with the old format, and check the result."""
text = "# Hello"
messages = []
client = nio.AsyncClient(MATRIX_URL, MATRIX_ID)
@ -48,6 +48,28 @@ class BotTest(unittest.IsolatedAsyncioTestCase):
self.assertEqual(message.body, text)
self.assertEqual(message.formatted_body, "<h1>Hello</h1>")
async def test_markdown_body(self):
"""Send a markdown message, and check the result."""
body = "# Hello"
messages = []
client = nio.AsyncClient(MATRIX_URL, MATRIX_ID)
await client.login(MATRIX_PW)
room = await client.room_create()
self.assertEqual(
bot_req({"body": body}, KEY, room.room_id), {"status": 200, "ret": "OK"}
)
sync = await client.sync()
messages = await client.room_messages(room.room_id, sync.next_batch)
await client.close()
message = messages.chunk[0]
self.assertEqual(message.sender, FULL_ID)
self.assertEqual(message.body, body)
self.assertEqual(message.formatted_body, "<h1>Hello</h1>")
async def test_reconnect(self):
"""Check the reconnecting path."""
client = nio.AsyncClient(MATRIX_URL, MATRIX_ID)
@ -56,6 +78,6 @@ class BotTest(unittest.IsolatedAsyncioTestCase):
await client.logout(all_devices=True)
await client.close()
self.assertEqual(
bot_req({"text": "Re"}, KEY, room.room_id),
bot_req({"body": "Re"}, KEY, room.room_id),
{"status": 200, "ret": "OK"},
)