2018-08-01 00:18:04 +02:00
|
|
|
from zerver.data_import.slack_message_conversion import (
|
2018-01-15 13:29:33 +01:00
|
|
|
convert_to_zulip_markdown,
|
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
|
|
|
get_user_full_name,
|
2018-01-15 13:29:33 +01:00
|
|
|
)
|
|
|
|
from zerver.lib.test_classes import (
|
|
|
|
ZulipTestCase,
|
|
|
|
)
|
|
|
|
from zerver.lib.test_runner import slow
|
|
|
|
from zerver.lib import mdiff
|
|
|
|
import ujson
|
|
|
|
|
|
|
|
import os
|
2019-02-02 23:53:44 +01:00
|
|
|
from typing import Any, Dict, List, Tuple
|
2018-01-15 13:29:33 +01:00
|
|
|
|
|
|
|
class SlackMessageConversion(ZulipTestCase):
|
2018-05-10 19:00:29 +02:00
|
|
|
def assertEqual(self, first: Any, second: Any, msg: str="") -> None:
|
|
|
|
if isinstance(first, str) and isinstance(second, str):
|
2018-01-15 13:29:33 +01:00
|
|
|
if first != second:
|
|
|
|
raise AssertionError("Actual and expected outputs do not match; showing diff.\n" +
|
|
|
|
mdiff.diff_strings(first, second) + msg)
|
|
|
|
else:
|
|
|
|
super().assertEqual(first, second)
|
|
|
|
|
|
|
|
def load_slack_message_conversion_tests(self) -> Dict[Any, Any]:
|
|
|
|
test_fixtures = {}
|
2019-07-14 21:37:08 +02:00
|
|
|
with open(os.path.join(os.path.dirname(__file__),
|
2020-04-09 21:51:58 +02:00
|
|
|
'fixtures/slack_message_conversion.json')) as f:
|
2020-03-20 02:12:02 +01:00
|
|
|
data = ujson.load(f)
|
2018-01-15 13:29:33 +01:00
|
|
|
for test in data['regular_tests']:
|
|
|
|
test_fixtures[test['name']] = test
|
|
|
|
|
|
|
|
return test_fixtures
|
|
|
|
|
|
|
|
@slow("Aggregate of runs of individual slack message conversion tests")
|
|
|
|
def test_message_conversion_fixtures(self) -> None:
|
|
|
|
format_tests = self.load_slack_message_conversion_tests()
|
2020-04-09 21:51:58 +02:00
|
|
|
valid_keys = {'name', "input", "conversion_output"}
|
2018-01-15 13:29:33 +01:00
|
|
|
|
|
|
|
for name, test in format_tests.items():
|
|
|
|
# Check that there aren't any unexpected keys as those are often typos
|
|
|
|
self.assertEqual(len(set(test.keys()) - valid_keys), 0)
|
python: Convert assignment type annotations to Python 3.6 style.
This commit was split by tabbott; this piece covers the vast majority
of files in Zulip, but excludes scripts/, tools/, and puppet/ to help
ensure we at least show the right error messages for Xenial systems.
We can likely further refine the remaining pieces with some testing.
Generated by com2ann, with whitespace fixes and various manual fixes
for runtime issues:
- invoiced_through: Optional[LicenseLedger] = models.ForeignKey(
+ invoiced_through: Optional["LicenseLedger"] = models.ForeignKey(
-_apns_client: Optional[APNsClient] = None
+_apns_client: Optional["APNsClient"] = None
- notifications_stream: Optional[Stream] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
- signup_notifications_stream: Optional[Stream] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
+ notifications_stream: Optional["Stream"] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
+ signup_notifications_stream: Optional["Stream"] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
- author: Optional[UserProfile] = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
+ author: Optional["UserProfile"] = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
- bot_owner: Optional[UserProfile] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
+ bot_owner: Optional["UserProfile"] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
- default_sending_stream: Optional[Stream] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
- default_events_register_stream: Optional[Stream] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
+ default_sending_stream: Optional["Stream"] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
+ default_events_register_stream: Optional["Stream"] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
-descriptors_by_handler_id: Dict[int, ClientDescriptor] = {}
+descriptors_by_handler_id: Dict[int, "ClientDescriptor"] = {}
-worker_classes: Dict[str, Type[QueueProcessingWorker]] = {}
-queues: Dict[str, Dict[str, Type[QueueProcessingWorker]]] = {}
+worker_classes: Dict[str, Type["QueueProcessingWorker"]] = {}
+queues: Dict[str, Dict[str, Type["QueueProcessingWorker"]]] = {}
-AUTH_LDAP_REVERSE_EMAIL_SEARCH: Optional[LDAPSearch] = None
+AUTH_LDAP_REVERSE_EMAIL_SEARCH: Optional["LDAPSearch"] = None
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-22 01:09:50 +02:00
|
|
|
slack_user_map: Dict[str, int] = {}
|
|
|
|
users: List[Dict[str, Any]] = [{}]
|
|
|
|
channel_map: Dict[str, Tuple[str, int]] = {}
|
2018-04-07 00:27:48 +02:00
|
|
|
converted = convert_to_zulip_markdown(test['input'], users, channel_map, slack_user_map)
|
2018-01-15 13:29:33 +01:00
|
|
|
converted_text = converted[0]
|
2019-09-13 08:11:25 +02:00
|
|
|
with self.subTest(slack_message_conversion=name):
|
|
|
|
self.assertEqual(converted_text, test['conversion_output'])
|
2018-01-15 13:29:33 +01:00
|
|
|
|
|
|
|
def test_mentioned_data(self) -> None:
|
|
|
|
slack_user_map = {'U08RGD1RD': 540,
|
|
|
|
'U0CBK5KAT': 554,
|
|
|
|
'U09TYF5SK': 571}
|
|
|
|
# For this test, only relevant keys are 'id', 'name', 'deleted'
|
|
|
|
# and 'real_name'
|
|
|
|
users = [{"id": "U0CBK5KAT",
|
|
|
|
"name": "aaron.anzalone",
|
|
|
|
"deleted": False,
|
2019-08-08 19:39:26 +02:00
|
|
|
"is_mirror_dummy": False,
|
2018-01-15 13:29:33 +01:00
|
|
|
"real_name": ""},
|
|
|
|
{"id": "U08RGD1RD",
|
|
|
|
"name": "john",
|
|
|
|
"deleted": False,
|
2019-08-08 19:39:26 +02:00
|
|
|
"is_mirror_dummy": False,
|
2018-01-15 13:29:33 +01:00
|
|
|
"real_name": "John Doe"},
|
|
|
|
{"id": "U09TYF5Sk",
|
|
|
|
"name": "Jane",
|
2019-08-08 19:39:26 +02:00
|
|
|
"is_mirror_dummy": False,
|
2018-01-15 13:29:33 +01:00
|
|
|
"deleted": True}] # Deleted users don't have 'real_name' key in Slack
|
2018-04-07 00:27:48 +02:00
|
|
|
channel_map = {'general': ('C5Z73A7RA', 137)}
|
|
|
|
message = 'Hi <@U08RGD1RD|john>: How are you? <#C5Z73A7RA|general>'
|
|
|
|
text, mentioned_users, has_link = convert_to_zulip_markdown(message, users, channel_map, slack_user_map)
|
2018-01-15 13:29:33 +01:00
|
|
|
full_name = get_user_full_name(users[1])
|
|
|
|
self.assertEqual(full_name, 'John Doe')
|
|
|
|
self.assertEqual(get_user_full_name(users[2]), 'Jane')
|
|
|
|
|
2020-06-10 06:41:04 +02:00
|
|
|
self.assertEqual(text, f'Hi @**{full_name}**: How are you? #**general**')
|
2018-01-15 13:29:33 +01:00
|
|
|
self.assertEqual(mentioned_users, [540])
|
|
|
|
|
|
|
|
# multiple mentioning
|
|
|
|
message = 'Hi <@U08RGD1RD|john>: How are you?<@U0CBK5KAT> asked.'
|
2018-04-07 00:27:48 +02:00
|
|
|
text, mentioned_users, has_link = convert_to_zulip_markdown(message, users, channel_map, slack_user_map)
|
2018-01-15 13:29:33 +01:00
|
|
|
self.assertEqual(text, 'Hi @**%s**: How are you?@**%s** asked.' %
|
|
|
|
('John Doe', 'aaron.anzalone'))
|
|
|
|
self.assertEqual(mentioned_users, [540, 554])
|
|
|
|
|
|
|
|
# Check wrong mentioning
|
|
|
|
message = 'Hi <@U08RGD1RD|jon>: How are you?'
|
2018-04-07 00:27:48 +02:00
|
|
|
text, mentioned_users, has_link = convert_to_zulip_markdown(message, users, channel_map, slack_user_map)
|
2018-01-15 13:29:33 +01:00
|
|
|
self.assertEqual(text, message)
|
|
|
|
self.assertEqual(mentioned_users, [])
|
2018-01-28 14:37:35 +01:00
|
|
|
|
|
|
|
def test_has_link(self) -> None:
|
python: Convert assignment type annotations to Python 3.6 style.
This commit was split by tabbott; this piece covers the vast majority
of files in Zulip, but excludes scripts/, tools/, and puppet/ to help
ensure we at least show the right error messages for Xenial systems.
We can likely further refine the remaining pieces with some testing.
Generated by com2ann, with whitespace fixes and various manual fixes
for runtime issues:
- invoiced_through: Optional[LicenseLedger] = models.ForeignKey(
+ invoiced_through: Optional["LicenseLedger"] = models.ForeignKey(
-_apns_client: Optional[APNsClient] = None
+_apns_client: Optional["APNsClient"] = None
- notifications_stream: Optional[Stream] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
- signup_notifications_stream: Optional[Stream] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
+ notifications_stream: Optional["Stream"] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
+ signup_notifications_stream: Optional["Stream"] = models.ForeignKey('Stream', related_name='+', null=True, blank=True, on_delete=CASCADE)
- author: Optional[UserProfile] = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
+ author: Optional["UserProfile"] = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
- bot_owner: Optional[UserProfile] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
+ bot_owner: Optional["UserProfile"] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
- default_sending_stream: Optional[Stream] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
- default_events_register_stream: Optional[Stream] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
+ default_sending_stream: Optional["Stream"] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
+ default_events_register_stream: Optional["Stream"] = models.ForeignKey('zerver.Stream', null=True, related_name='+', on_delete=CASCADE)
-descriptors_by_handler_id: Dict[int, ClientDescriptor] = {}
+descriptors_by_handler_id: Dict[int, "ClientDescriptor"] = {}
-worker_classes: Dict[str, Type[QueueProcessingWorker]] = {}
-queues: Dict[str, Dict[str, Type[QueueProcessingWorker]]] = {}
+worker_classes: Dict[str, Type["QueueProcessingWorker"]] = {}
+queues: Dict[str, Dict[str, Type["QueueProcessingWorker"]]] = {}
-AUTH_LDAP_REVERSE_EMAIL_SEARCH: Optional[LDAPSearch] = None
+AUTH_LDAP_REVERSE_EMAIL_SEARCH: Optional["LDAPSearch"] = None
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-22 01:09:50 +02:00
|
|
|
slack_user_map: Dict[str, int] = {}
|
2018-01-28 14:37:35 +01:00
|
|
|
|
|
|
|
message = '<http://journals.plos.org/plosone/article>'
|
2018-04-07 00:27:48 +02:00
|
|
|
text, mentioned_users, has_link = convert_to_zulip_markdown(message, [], {}, slack_user_map)
|
2018-01-28 14:37:35 +01:00
|
|
|
self.assertEqual(text, 'http://journals.plos.org/plosone/article')
|
|
|
|
self.assertEqual(has_link, True)
|
|
|
|
|
|
|
|
message = '<mailto:foo@foo.com>'
|
2018-04-07 00:27:48 +02:00
|
|
|
text, mentioned_users, has_link = convert_to_zulip_markdown(message, [], {}, slack_user_map)
|
2018-01-28 14:37:35 +01:00
|
|
|
self.assertEqual(text, 'mailto:foo@foo.com')
|
|
|
|
self.assertEqual(has_link, True)
|
|
|
|
|
|
|
|
message = 'random message'
|
2018-04-07 00:27:48 +02:00
|
|
|
text, mentioned_users, has_link = convert_to_zulip_markdown(message, [], {}, slack_user_map)
|
2018-01-28 14:37:35 +01:00
|
|
|
self.assertEqual(has_link, False)
|