diff --git a/zerver/webhooks/github/fixtures/discussion_comment__edited.json b/zerver/webhooks/github/fixtures/discussion_comment__edited.json new file mode 100644 index 0000000000..a1958ae917 --- /dev/null +++ b/zerver/webhooks/github/fixtures/discussion_comment__edited.json @@ -0,0 +1,238 @@ +{ + "action": "edited", + "comment": { + "id": 6332416, + "node_id": "DC_kwDOJRp_V84AYKAA", + "html_url": "https://github.com/sbansal1999/testing-gh/discussions/20#discussioncomment-6332416", + "parent_id": null, + "child_comment_count": 0, + "repository_url": "sbansal1999/testing-gh", + "discussion_id": 5357975, + "author_association": "OWNER", + "user": { + "login": "sbansal1999", + "id": 35286603, + "node_id": "MDQ6VXNlcjM1Mjg2NjAz", + "avatar_url": "https://avatars.githubusercontent.com/u/35286603?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/sbansal1999", + "html_url": "https://github.com/sbansal1999", + "followers_url": "https://api.github.com/users/sbansal1999/followers", + "following_url": "https://api.github.com/users/sbansal1999/following{/other_user}", + "gists_url": "https://api.github.com/users/sbansal1999/gists{/gist_id}", + "starred_url": "https://api.github.com/users/sbansal1999/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/sbansal1999/subscriptions", + "organizations_url": "https://api.github.com/users/sbansal1999/orgs", + "repos_url": "https://api.github.com/users/sbansal1999/repos", + "events_url": "https://api.github.com/users/sbansal1999/events{/privacy}", + "received_events_url": "https://api.github.com/users/sbansal1999/received_events", + "type": "User", + "site_admin": false + }, + "created_at": "2023-07-01T13:22:24Z", + "updated_at": "2023-07-02T17:33:33Z", + "body": "some random comment edited", + "reactions": { + "url": "https://api.github.com/repos/sbansal1999/testing-gh/issues/comments/6332416/reactions", + "total_count": 0, + "+1": 0, + "-1": 0, + "laugh": 0, + "hooray": 0, + "confused": 0, + "heart": 0, + "rocket": 0, + "eyes": 0 + } + }, + "discussion": { + "repository_url": "https://api.github.com/repos/sbansal1999/testing-gh", + "category": { + "id": 39681816, + "node_id": "DIC_kwDOJRp_V84CXX8Y", + "repository_id": 622493527, + "emoji": ":mega:", + "name": "Announcements", + "description": "Updates from maintainers", + "created_at": "2023-06-21T23:02:39.000+05:30", + "updated_at": "2023-06-21T23:02:39.000+05:30", + "slug": "announcements", + "is_answerable": false + }, + "answer_html_url": null, + "answer_chosen_at": null, + "answer_chosen_by": null, + "html_url": "https://github.com/sbansal1999/testing-gh/discussions/20", + "id": 5357975, + "node_id": "D_kwDOJRp_V84AUcGX", + "number": 20, + "title": "Lets discuss", + "user": { + "login": "sbansal1999", + "id": 35286603, + "node_id": "MDQ6VXNlcjM1Mjg2NjAz", + "avatar_url": "https://avatars.githubusercontent.com/u/35286603?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/sbansal1999", + "html_url": "https://github.com/sbansal1999", + "followers_url": "https://api.github.com/users/sbansal1999/followers", + "following_url": "https://api.github.com/users/sbansal1999/following{/other_user}", + "gists_url": "https://api.github.com/users/sbansal1999/gists{/gist_id}", + "starred_url": "https://api.github.com/users/sbansal1999/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/sbansal1999/subscriptions", + "organizations_url": "https://api.github.com/users/sbansal1999/orgs", + "repos_url": "https://api.github.com/users/sbansal1999/repos", + "events_url": "https://api.github.com/users/sbansal1999/events{/privacy}", + "received_events_url": "https://api.github.com/users/sbansal1999/received_events", + "type": "User", + "site_admin": false + }, + "state": "open", + "state_reason": null, + "locked": false, + "comments": 1, + "created_at": "2023-07-01T13:21:16Z", + "updated_at": "2023-07-01T13:22:24Z", + "author_association": "OWNER", + "active_lock_reason": null, + "body": "Some random text about which no one cares.\r\n", + "reactions": { + "url": "https://api.github.com/repos/sbansal1999/testing-gh/discussions/20/reactions", + "total_count": 0, + "+1": 0, + "-1": 0, + "laugh": 0, + "hooray": 0, + "confused": 0, + "heart": 0, + "rocket": 0, + "eyes": 0 + }, + "timeline_url": "https://api.github.com/repos/sbansal1999/testing-gh/discussions/20/timeline" + }, + "changes": { + "body": { + "from": "some random comment" + } + }, + "repository": { + "id": 622493527, + "node_id": "R_kgDOJRp_Vw", + "name": "testing-gh", + "full_name": "sbansal1999/testing-gh", + "private": false, + "owner": { + "login": "sbansal1999", + "id": 35286603, + "node_id": "MDQ6VXNlcjM1Mjg2NjAz", + "avatar_url": "https://avatars.githubusercontent.com/u/35286603?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/sbansal1999", + "html_url": "https://github.com/sbansal1999", + "followers_url": "https://api.github.com/users/sbansal1999/followers", + "following_url": "https://api.github.com/users/sbansal1999/following{/other_user}", + "gists_url": "https://api.github.com/users/sbansal1999/gists{/gist_id}", + "starred_url": "https://api.github.com/users/sbansal1999/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/sbansal1999/subscriptions", + "organizations_url": "https://api.github.com/users/sbansal1999/orgs", + "repos_url": "https://api.github.com/users/sbansal1999/repos", + "events_url": "https://api.github.com/users/sbansal1999/events{/privacy}", + "received_events_url": "https://api.github.com/users/sbansal1999/received_events", + "type": "User", + "site_admin": false + }, + "html_url": "https://github.com/sbansal1999/testing-gh", + "description": null, + "fork": false, + "url": "https://api.github.com/repos/sbansal1999/testing-gh", + "forks_url": "https://api.github.com/repos/sbansal1999/testing-gh/forks", + "keys_url": "https://api.github.com/repos/sbansal1999/testing-gh/keys{/key_id}", + "collaborators_url": "https://api.github.com/repos/sbansal1999/testing-gh/collaborators{/collaborator}", + "teams_url": "https://api.github.com/repos/sbansal1999/testing-gh/teams", + "hooks_url": "https://api.github.com/repos/sbansal1999/testing-gh/hooks", + "issue_events_url": "https://api.github.com/repos/sbansal1999/testing-gh/issues/events{/number}", + "events_url": "https://api.github.com/repos/sbansal1999/testing-gh/events", + "assignees_url": "https://api.github.com/repos/sbansal1999/testing-gh/assignees{/user}", + "branches_url": "https://api.github.com/repos/sbansal1999/testing-gh/branches{/branch}", + "tags_url": "https://api.github.com/repos/sbansal1999/testing-gh/tags", + "blobs_url": "https://api.github.com/repos/sbansal1999/testing-gh/git/blobs{/sha}", + "git_tags_url": "https://api.github.com/repos/sbansal1999/testing-gh/git/tags{/sha}", + "git_refs_url": "https://api.github.com/repos/sbansal1999/testing-gh/git/refs{/sha}", + "trees_url": "https://api.github.com/repos/sbansal1999/testing-gh/git/trees{/sha}", + "statuses_url": "https://api.github.com/repos/sbansal1999/testing-gh/statuses/{sha}", + "languages_url": "https://api.github.com/repos/sbansal1999/testing-gh/languages", + "stargazers_url": "https://api.github.com/repos/sbansal1999/testing-gh/stargazers", + "contributors_url": "https://api.github.com/repos/sbansal1999/testing-gh/contributors", + "subscribers_url": "https://api.github.com/repos/sbansal1999/testing-gh/subscribers", + "subscription_url": "https://api.github.com/repos/sbansal1999/testing-gh/subscription", + "commits_url": "https://api.github.com/repos/sbansal1999/testing-gh/commits{/sha}", + "git_commits_url": "https://api.github.com/repos/sbansal1999/testing-gh/git/commits{/sha}", + "comments_url": "https://api.github.com/repos/sbansal1999/testing-gh/comments{/number}", + "issue_comment_url": "https://api.github.com/repos/sbansal1999/testing-gh/issues/comments{/number}", + "contents_url": "https://api.github.com/repos/sbansal1999/testing-gh/contents/{+path}", + "compare_url": "https://api.github.com/repos/sbansal1999/testing-gh/compare/{base}...{head}", + "merges_url": "https://api.github.com/repos/sbansal1999/testing-gh/merges", + "archive_url": "https://api.github.com/repos/sbansal1999/testing-gh/{archive_format}{/ref}", + "downloads_url": "https://api.github.com/repos/sbansal1999/testing-gh/downloads", + "issues_url": "https://api.github.com/repos/sbansal1999/testing-gh/issues{/number}", + "pulls_url": "https://api.github.com/repos/sbansal1999/testing-gh/pulls{/number}", + "milestones_url": "https://api.github.com/repos/sbansal1999/testing-gh/milestones{/number}", + "notifications_url": "https://api.github.com/repos/sbansal1999/testing-gh/notifications{?since,all,participating}", + "labels_url": "https://api.github.com/repos/sbansal1999/testing-gh/labels{/name}", + "releases_url": "https://api.github.com/repos/sbansal1999/testing-gh/releases{/id}", + "deployments_url": "https://api.github.com/repos/sbansal1999/testing-gh/deployments", + "created_at": "2023-04-02T09:31:40Z", + "updated_at": "2023-04-02T09:31:40Z", + "pushed_at": "2023-06-28T17:27:54Z", + "git_url": "git://github.com/sbansal1999/testing-gh.git", + "ssh_url": "git@github.com:sbansal1999/testing-gh.git", + "clone_url": "https://github.com/sbansal1999/testing-gh.git", + "svn_url": "https://github.com/sbansal1999/testing-gh", + "homepage": null, + "size": 2, + "stargazers_count": 0, + "watchers_count": 0, + "language": null, + "has_issues": true, + "has_projects": true, + "has_downloads": true, + "has_wiki": true, + "has_pages": false, + "has_discussions": true, + "forks_count": 0, + "mirror_url": null, + "archived": false, + "disabled": false, + "open_issues_count": 9, + "license": null, + "allow_forking": true, + "is_template": false, + "web_commit_signoff_required": false, + "topics": [], + "visibility": "public", + "forks": 0, + "open_issues": 9, + "watchers": 0, + "default_branch": "fixing-typo" + }, + "sender": { + "login": "sbansal1999", + "id": 35286603, + "node_id": "MDQ6VXNlcjM1Mjg2NjAz", + "avatar_url": "https://avatars.githubusercontent.com/u/35286603?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/sbansal1999", + "html_url": "https://github.com/sbansal1999", + "followers_url": "https://api.github.com/users/sbansal1999/followers", + "following_url": "https://api.github.com/users/sbansal1999/following{/other_user}", + "gists_url": "https://api.github.com/users/sbansal1999/gists{/gist_id}", + "starred_url": "https://api.github.com/users/sbansal1999/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/sbansal1999/subscriptions", + "organizations_url": "https://api.github.com/users/sbansal1999/orgs", + "repos_url": "https://api.github.com/users/sbansal1999/repos", + "events_url": "https://api.github.com/users/sbansal1999/events{/privacy}", + "received_events_url": "https://api.github.com/users/sbansal1999/received_events", + "type": "User", + "site_admin": false + } +} diff --git a/zerver/webhooks/github/tests.py b/zerver/webhooks/github/tests.py index cd3e9349ca..c56668d55d 100644 --- a/zerver/webhooks/github/tests.py +++ b/zerver/webhooks/github/tests.py @@ -581,3 +581,7 @@ A temporary team so that I can get some webhook fixtures! def test_discussion_comment_msg(self) -> None: expected_message = "sbansal1999 [commented](https://github.com/sbansal1999/testing-gh/discussions/20#discussioncomment-6332416) on [discussion #20](https://github.com/sbansal1999/testing-gh/discussions/20):\n\n~~~ quote\nsome random comment\n~~~" self.check_webhook("discussion_comment", TOPIC_DISCUSSION, expected_message) + + def test_discussion_comment_edited_msg(self) -> None: + expected_message = "sbansal1999 [commented](https://github.com/sbansal1999/testing-gh/discussions/20#discussioncomment-6332416) on [discussion #20](https://github.com/sbansal1999/testing-gh/discussions/20):\n\n~~~ quote\nsome random comment edited\n~~~" + self.check_webhook("discussion_comment__edited", TOPIC_DISCUSSION, expected_message)