diff --git a/zerver/webhooks/trello/tests.py b/zerver/webhooks/trello/tests.py index d2d5a21a40..f43b4d4de9 100644 --- a/zerver/webhooks/trello/tests.py +++ b/zerver/webhooks/trello/tests.py @@ -89,7 +89,7 @@ class TrelloHookTests(WebhookTestCase): self.send_and_test_stream_message('adding_new_list_to_board', u"Welcome Board", expected_message) def test_trello_webhook_when_comment_was_added_to_card(self) -> None: - expected_message = u"TomaszKolek commented on [New card](https://trello.com/c/xPKXoSTQ)\n~~~ quote\nNew comment\n~~~" + expected_message = u"TomaszKolek commented on [New card](https://trello.com/c/xPKXoSTQ):\n~~~ quote\nNew comment\n~~~" self.send_and_test_stream_message('adding_comment_to_card', u"Welcome Board", expected_message) def test_trello_webhook_when_board_was_renamed(self) -> None: @@ -121,7 +121,7 @@ class TrelloHookTests(WebhookTestCase): self.assert_json_success(result) def test_trello_webhook_when_description_was_added_to_card(self) -> None: - expected_message = u"Marco Matarazzo set description for [New Card](https://trello.com/c/P2r0z66z) to\n~~~ quote\nNew Description\n~~~" + expected_message = u"Marco Matarazzo set description for [New Card](https://trello.com/c/P2r0z66z) to:\n~~~ quote\nNew Description\n~~~" self.send_and_test_stream_message('adding_description_to_card', u"Welcome Board", expected_message) def test_trello_webhook_when_description_was_removed_from_card(self) -> None: diff --git a/zerver/webhooks/trello/view/card_actions.py b/zerver/webhooks/trello/view/card_actions.py index d58a842d78..a3a4a46e5f 100644 --- a/zerver/webhooks/trello/view/card_actions.py +++ b/zerver/webhooks/trello/view/card_actions.py @@ -45,7 +45,7 @@ ACTIONS_TO_MESSAGE_MAPPER = { CREATE: u'created {card_url_template}.', CHANGE_LIST: u'moved {card_url_template} from {old_list} to {new_list}.', CHANGE_NAME: u'renamed the card from "{old_name}" to {card_url_template}.', - SET_DESC: u'set description for {card_url_template} to\n~~~ quote\n{desc}\n~~~\n', + SET_DESC: u'set description for {card_url_template} to:\n~~~ quote\n{desc}\n~~~\n', CHANGE_DESC: (u'changed description for {card_url_template} from\n' + '~~~ quote\n{old_desc}\n~~~\nto\n~~~ quote\n{desc}\n~~~\n'), REMOVE_DESC: u'removed description from {card_url_template}.', @@ -60,7 +60,7 @@ ACTIONS_TO_MESSAGE_MAPPER = { REMOVE_MEMBER: u'removed {member_name} from {card_url_template}.', ADD_ATTACHMENT: u'added [{attachment_name}]({attachment_url}) to {card_url_template}.', ADD_CHECKLIST: u'added the {checklist_name} checklist to {card_url_template}.', - COMMENT: u'commented on {card_url_template}\n~~~ quote\n{text}\n~~~\n', + COMMENT: u'commented on {card_url_template}:\n~~~ quote\n{text}\n~~~\n', UPDATE_CHECK_ITEM_STATE: u'{action} **{item_name}** in **{checklist_name}** ({card_url_template}).' }