2020-06-11 00:54:34 +02:00
|
|
|
from typing import Any, Dict, List
|
2020-05-26 07:16:25 +02:00
|
|
|
from unittest import mock
|
2018-02-12 10:53:36 +01:00
|
|
|
|
2020-06-11 00:54:34 +02:00
|
|
|
from zerver.lib.message import MessageDict
|
2018-02-11 14:08:01 +01:00
|
|
|
from zerver.lib.test_classes import ZulipTestCase
|
2020-06-11 00:54:34 +02:00
|
|
|
from zerver.models import Message, SubMessage
|
2018-02-11 14:08:01 +01:00
|
|
|
|
|
|
|
|
|
|
|
class TestBasics(ZulipTestCase):
|
|
|
|
def test_get_raw_db_rows(self) -> None:
|
2021-02-12 08:20:45 +01:00
|
|
|
cordelia = self.example_user("cordelia")
|
|
|
|
hamlet = self.example_user("hamlet")
|
|
|
|
stream_name = "Verona"
|
2018-02-11 14:08:01 +01:00
|
|
|
|
|
|
|
message_id = self.send_stream_message(
|
2020-03-07 11:43:05 +01:00
|
|
|
sender=cordelia,
|
2018-02-11 14:08:01 +01:00
|
|
|
stream_name=stream_name,
|
|
|
|
)
|
|
|
|
|
|
|
|
def get_raw_rows() -> List[Dict[str, Any]]:
|
|
|
|
query = SubMessage.get_raw_db_rows([message_id])
|
|
|
|
rows = list(query)
|
|
|
|
return rows
|
|
|
|
|
|
|
|
rows = get_raw_rows()
|
|
|
|
self.assertEqual(rows, [])
|
|
|
|
|
|
|
|
sm1 = SubMessage.objects.create(
|
2021-02-12 08:20:45 +01:00
|
|
|
msg_type="whatever",
|
|
|
|
content="stuff1",
|
2018-02-11 14:08:01 +01:00
|
|
|
message_id=message_id,
|
|
|
|
sender=cordelia,
|
|
|
|
)
|
|
|
|
|
|
|
|
sm2 = SubMessage.objects.create(
|
2021-02-12 08:20:45 +01:00
|
|
|
msg_type="whatever",
|
|
|
|
content="stuff2",
|
2018-02-11 14:08:01 +01:00
|
|
|
message_id=message_id,
|
|
|
|
sender=hamlet,
|
|
|
|
)
|
|
|
|
|
|
|
|
expected_data = [
|
|
|
|
dict(
|
|
|
|
id=sm1.id,
|
|
|
|
message_id=message_id,
|
|
|
|
sender_id=cordelia.id,
|
2021-02-12 08:20:45 +01:00
|
|
|
msg_type="whatever",
|
|
|
|
content="stuff1",
|
2018-02-11 14:08:01 +01:00
|
|
|
),
|
|
|
|
dict(
|
|
|
|
id=sm2.id,
|
|
|
|
message_id=message_id,
|
|
|
|
sender_id=hamlet.id,
|
2021-02-12 08:20:45 +01:00
|
|
|
msg_type="whatever",
|
|
|
|
content="stuff2",
|
2018-02-11 14:08:01 +01:00
|
|
|
),
|
|
|
|
]
|
|
|
|
|
|
|
|
self.assertEqual(get_raw_rows(), expected_data)
|
2018-02-11 14:09:17 +01:00
|
|
|
|
|
|
|
message = Message.objects.get(id=message_id)
|
|
|
|
message_json = MessageDict.wide_dict(message)
|
2021-02-12 08:20:45 +01:00
|
|
|
rows = message_json["submessages"]
|
|
|
|
rows.sort(key=lambda r: r["id"])
|
2018-02-11 14:09:17 +01:00
|
|
|
self.assertEqual(rows, expected_data)
|
|
|
|
|
|
|
|
msg_rows = MessageDict.get_raw_db_rows([message_id])
|
2021-02-12 08:20:45 +01:00
|
|
|
rows = msg_rows[0]["submessages"]
|
|
|
|
rows.sort(key=lambda r: r["id"])
|
2018-02-11 14:09:17 +01:00
|
|
|
self.assertEqual(rows, expected_data)
|
2018-02-12 10:53:36 +01:00
|
|
|
|
|
|
|
def test_endpoint_errors(self) -> None:
|
2021-02-12 08:20:45 +01:00
|
|
|
cordelia = self.example_user("cordelia")
|
|
|
|
stream_name = "Verona"
|
2018-02-12 10:53:36 +01:00
|
|
|
message_id = self.send_stream_message(
|
2020-03-07 11:43:05 +01:00
|
|
|
sender=cordelia,
|
2018-02-12 10:53:36 +01:00
|
|
|
stream_name=stream_name,
|
|
|
|
)
|
2020-03-06 18:40:46 +01:00
|
|
|
self.login_user(cordelia)
|
2018-02-12 10:53:36 +01:00
|
|
|
|
|
|
|
payload = dict(
|
|
|
|
message_id=message_id,
|
2021-02-12 08:20:45 +01:00
|
|
|
msg_type="whatever",
|
|
|
|
content="not json",
|
2018-02-12 10:53:36 +01:00
|
|
|
)
|
2021-02-12 08:20:45 +01:00
|
|
|
result = self.client_post("/json/submessage", payload)
|
|
|
|
self.assert_json_error(result, "Invalid json for submessage")
|
2018-02-12 10:53:36 +01:00
|
|
|
|
2021-02-12 08:20:45 +01:00
|
|
|
hamlet = self.example_user("hamlet")
|
2018-02-12 10:53:36 +01:00
|
|
|
bad_message_id = self.send_personal_message(
|
2020-03-07 11:43:05 +01:00
|
|
|
from_user=hamlet,
|
|
|
|
to_user=hamlet,
|
2018-02-12 10:53:36 +01:00
|
|
|
)
|
|
|
|
payload = dict(
|
|
|
|
message_id=bad_message_id,
|
2021-02-12 08:20:45 +01:00
|
|
|
msg_type="whatever",
|
|
|
|
content="does not matter",
|
2018-02-12 10:53:36 +01:00
|
|
|
)
|
2021-02-12 08:20:45 +01:00
|
|
|
result = self.client_post("/json/submessage", payload)
|
|
|
|
self.assert_json_error(result, "Invalid message(s)")
|
2018-02-12 10:53:36 +01:00
|
|
|
|
|
|
|
def test_endpoint_success(self) -> None:
|
2021-02-12 08:20:45 +01:00
|
|
|
cordelia = self.example_user("cordelia")
|
|
|
|
hamlet = self.example_user("hamlet")
|
|
|
|
stream_name = "Verona"
|
2018-02-12 10:53:36 +01:00
|
|
|
message_id = self.send_stream_message(
|
2020-03-07 11:43:05 +01:00
|
|
|
sender=cordelia,
|
2018-02-12 10:53:36 +01:00
|
|
|
stream_name=stream_name,
|
|
|
|
)
|
2020-03-06 18:40:46 +01:00
|
|
|
self.login_user(cordelia)
|
2018-02-12 10:53:36 +01:00
|
|
|
|
|
|
|
payload = dict(
|
|
|
|
message_id=message_id,
|
2021-02-12 08:20:45 +01:00
|
|
|
msg_type="whatever",
|
python: Use trailing commas consistently.
Automatically generated by the following script, based on the output
of lint with flake8-comma:
import re
import sys
last_filename = None
last_row = None
lines = []
for msg in sys.stdin:
m = re.match(
r"\x1b\[35mflake8 \|\x1b\[0m \x1b\[1;31m(.+):(\d+):(\d+): (\w+)", msg
)
if m:
filename, row_str, col_str, err = m.groups()
row, col = int(row_str), int(col_str)
if filename == last_filename:
assert last_row != row
else:
if last_filename is not None:
with open(last_filename, "w") as f:
f.writelines(lines)
with open(filename) as f:
lines = f.readlines()
last_filename = filename
last_row = row
line = lines[row - 1]
if err in ["C812", "C815"]:
lines[row - 1] = line[: col - 1] + "," + line[col - 1 :]
elif err in ["C819"]:
assert line[col - 2] == ","
lines[row - 1] = line[: col - 2] + line[col - 1 :].lstrip(" ")
if last_filename is not None:
with open(last_filename, "w") as f:
f.writelines(lines)
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-10 05:23:40 +02:00
|
|
|
content='{"name": "alice", "salary": 20}',
|
2018-02-12 10:53:36 +01:00
|
|
|
)
|
2021-02-12 08:20:45 +01:00
|
|
|
with mock.patch("zerver.lib.actions.send_event") as m:
|
|
|
|
result = self.client_post("/json/submessage", payload)
|
2018-02-12 10:53:36 +01:00
|
|
|
self.assert_json_success(result)
|
|
|
|
|
2018-05-30 22:41:15 +02:00
|
|
|
submessage = SubMessage.objects.get(message_id=message_id)
|
|
|
|
|
2018-02-12 10:53:36 +01:00
|
|
|
expected_data = dict(
|
|
|
|
message_id=message_id,
|
2018-05-30 22:41:15 +02:00
|
|
|
submessage_id=submessage.id,
|
2021-02-12 08:20:45 +01:00
|
|
|
content=payload["content"],
|
|
|
|
msg_type="whatever",
|
2018-02-12 10:53:36 +01:00
|
|
|
sender_id=cordelia.id,
|
2021-02-12 08:20:45 +01:00
|
|
|
type="submessage",
|
2018-02-12 10:53:36 +01:00
|
|
|
)
|
|
|
|
|
|
|
|
self.assertEqual(m.call_count, 1)
|
2018-11-02 23:33:54 +01:00
|
|
|
data = m.call_args[0][1]
|
2018-02-12 10:53:36 +01:00
|
|
|
self.assertEqual(data, expected_data)
|
2018-11-02 23:33:54 +01:00
|
|
|
users = m.call_args[0][2]
|
2018-02-12 10:53:36 +01:00
|
|
|
self.assertIn(cordelia.id, users)
|
|
|
|
self.assertIn(hamlet.id, users)
|
|
|
|
|
|
|
|
rows = SubMessage.get_raw_db_rows([message_id])
|
|
|
|
self.assertEqual(len(rows), 1)
|
|
|
|
row = rows[0]
|
|
|
|
|
|
|
|
expected_data = dict(
|
2021-02-12 08:20:45 +01:00
|
|
|
id=row["id"],
|
2018-02-12 10:53:36 +01:00
|
|
|
message_id=message_id,
|
|
|
|
content='{"name": "alice", "salary": 20}',
|
2021-02-12 08:20:45 +01:00
|
|
|
msg_type="whatever",
|
2018-02-12 10:53:36 +01:00
|
|
|
sender_id=cordelia.id,
|
|
|
|
)
|
|
|
|
self.assertEqual(row, expected_data)
|