diff --git a/src/sentry/tasks/integrations/github/pr_comment.py b/src/sentry/tasks/integrations/github/pr_comment.py index a27f483fb3d50d..61548064592b34 100644 --- a/src/sentry/tasks/integrations/github/pr_comment.py +++ b/src/sentry/tasks/integrations/github/pr_comment.py @@ -41,7 +41,7 @@ class PullRequestIssue: COMMENT_BODY_TEMPLATE = """## Suspect Issues -This pull request has been deployed and Sentry has observed the following issues: +This pull request has been deployed and Sentry observed the following issues: {issue_list} diff --git a/tests/sentry/tasks/integrations/github/test_pr_comment.py b/tests/sentry/tasks/integrations/github/test_pr_comment.py index d8fc77c031624f..c0c41ca5d1c948 100644 --- a/tests/sentry/tasks/integrations/github/test_pr_comment.py +++ b/tests/sentry/tasks/integrations/github/test_pr_comment.py @@ -315,7 +315,7 @@ def test_format_comment(self): ] formatted_comment = format_comment(issues) - expected_comment = "## Suspect Issues\nThis pull request has been deployed and Sentry has observed the following issues:\n\n- ‼️ **TypeError** `sentry.tasks.derive_code_mappings.derive_code_m...` [View Issue](https://sentry.sentry.io/issues/?referrer=github-pr-bot)\n- ‼️ **KafkaException** `query_subscription_consumer_process_message` [View Issue](https://sentry.sentry.io/stats/?referrer=github-pr-bot)\n\nDid you find this useful? React with a 👍 or 👎" + expected_comment = "## Suspect Issues\nThis pull request has been deployed and Sentry observed the following issues:\n\n- ‼️ **TypeError** `sentry.tasks.derive_code_mappings.derive_code_m...` [View Issue](https://sentry.sentry.io/issues/?referrer=github-pr-bot)\n- ‼️ **KafkaException** `query_subscription_consumer_process_message` [View Issue](https://sentry.sentry.io/stats/?referrer=github-pr-bot)\n\nDid you find this useful? React with a 👍 or 👎" assert formatted_comment == expected_comment @@ -357,7 +357,7 @@ def test_comment_workflow(self, mock_metrics, get_jwt, mock_issues): assert ( responses.calls[1].request.body - == f'{{"body": "## Suspect Issues\\nThis pull request has been deployed and Sentry has observed the following issues:\\n\\n- \\u203c\\ufe0f **issue 1** `issue1` [View Issue](http://testserver/organizations/foo/issues/{groups[0]}/?referrer=github-pr-bot)\\n- \\u203c\\ufe0f **issue 2** `issue2` [View Issue](http://testserver/organizations/foobar/issues/{groups[1]}/?referrer=github-pr-bot)\\n\\nDid you find this useful? React with a \\ud83d\\udc4d or \\ud83d\\udc4e"}}'.encode() + == f'{{"body": "## Suspect Issues\\nThis pull request has been deployed and Sentry observed the following issues:\\n\\n- \\u203c\\ufe0f **issue 1** `issue1` [View Issue](http://testserver/organizations/foo/issues/{groups[0]}/?referrer=github-pr-bot)\\n- \\u203c\\ufe0f **issue 2** `issue2` [View Issue](http://testserver/organizations/foobar/issues/{groups[1]}/?referrer=github-pr-bot)\\n\\nDid you find this useful? React with a \\ud83d\\udc4d or \\ud83d\\udc4e"}}'.encode() ) pull_request_comment_query = PullRequestComment.objects.all() assert len(pull_request_comment_query) == 1 @@ -407,7 +407,7 @@ def test_comment_workflow_updates_comment(self, mock_metrics, get_jwt, mock_issu assert ( responses.calls[1].request.body - == f'{{"body": "## Suspect Issues\\nThis pull request has been deployed and Sentry has observed the following issues:\\n\\n- \\u203c\\ufe0f **issue 1** `issue1` [View Issue](http://testserver/organizations/foo/issues/{groups[0]}/?referrer=github-pr-bot)\\n- \\u203c\\ufe0f **issue 2** `issue2` [View Issue](http://testserver/organizations/foobar/issues/{groups[1]}/?referrer=github-pr-bot)\\n\\nDid you find this useful? React with a \\ud83d\\udc4d or \\ud83d\\udc4e"}}'.encode() + == f'{{"body": "## Suspect Issues\\nThis pull request has been deployed and Sentry observed the following issues:\\n\\n- \\u203c\\ufe0f **issue 1** `issue1` [View Issue](http://testserver/organizations/foo/issues/{groups[0]}/?referrer=github-pr-bot)\\n- \\u203c\\ufe0f **issue 2** `issue2` [View Issue](http://testserver/organizations/foobar/issues/{groups[1]}/?referrer=github-pr-bot)\\n\\nDid you find this useful? React with a \\ud83d\\udc4d or \\ud83d\\udc4e"}}'.encode() ) pull_request_comment.refresh_from_db() assert pull_request_comment.group_ids == [g.id for g in Group.objects.all()]