paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-06 15:03:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

webhooks: Rename *topic local variables to *topic_name.

Browse Source 
This is preparatory work towards adding a Topic model.
We plan to use the local variable name as 'topic' for
the Topic model objects.

Currently, we use *topic as the local variable name for
topic names.

We rename local variables of the form *topic to *topic_name
so that we don't need to think about type collisions in
individual code paths where we might want to talk about both
Topic objects and strings for the topic name.
This commit is contained in:
Prakhar Pratyush
2024-01-17 20:23:30 +05:30
committed by Tim Abbott
parent 030f899195
commit 3afc8ed7ae
163 changed files with 1725 additions and 1619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
zerver/webhooks/rhodecode/tests.py
View File

@@ -10,15 +10,15 @@ class RhodecodeHookTests(WebhookTestCase):
WEBHOOK_DIR_NAME = "rhodecode"
def test_push_event_message(self) -> None:
expected_topic = "u/yuroitaki/zulip-testing / master"
expected_topic_name = "u/yuroitaki/zulip-testing / master"
expected_message = "yuroitaki pushed 1 commit to branch master. Commits by Yuro Itaki <yuroitaki@email.com> (1).\n\n* Modify README ([2b8c0ebf507](https://code.rhodecode.com/u/yuroitaki/zulip-testing/changeset/2b8c0ebf50710bc2e1cdb6a33071dd2435ad667c))"
self.check_webhook("push", expected_topic, expected_message)
self.check_webhook("push", expected_topic_name, expected_message)
def test_push_event_message_filtered_by_branches(self) -> None:
self.url = self.build_webhook_url(branches="master,dev")
expected_topic = "u/yuroitaki/zulip-testing / master"
expected_topic_name = "u/yuroitaki/zulip-testing / master"
expected_message = "yuroitaki pushed 1 commit to branch master. Commits by Yuro Itaki <yuroitaki@email.com> (1).\n\n* Modify README ([2b8c0ebf507](https://code.rhodecode.com/u/yuroitaki/zulip-testing/changeset/2b8c0ebf50710bc2e1cdb6a33071dd2435ad667c))"
self.check_webhook("push", expected_topic, expected_message)
self.check_webhook("push", expected_topic_name, expected_message)
@patch("zerver.lib.webhooks.common.check_send_webhook_message")
def test_push_event_message_filtered_by_branches_ignore(
@@ -31,30 +31,32 @@ class RhodecodeHookTests(WebhookTestCase):
self.assert_json_success(result)
def test_push_local_branch_without_commits(self) -> None:
expected_topic = "u/yuroitaki/zulip-testing / dev"
expected_topic_name = "u/yuroitaki/zulip-testing / dev"
expected_message = "yuroitaki pushed the branch dev."
self.check_webhook("push__local_branch_without_commits", expected_topic, expected_message)
self.check_webhook(
"push__local_branch_without_commits", expected_topic_name, expected_message
)
def test_push_multiple_committers(self) -> None:
expected_topic = "u/yuroitaki/zulip-testing / master"
expected_topic_name = "u/yuroitaki/zulip-testing / master"
expected_message = "yuroitaki pushed 2 commits to branch master. Commits by Itachi Sensei <itachisensei@email.com> (1) and Yuro Itaki <yuroitaki@email.com> (1).\n\n* Add test.py ([b0d892e1cdd](https://code.rhodecode.com/u/yuroitaki/zulip-testing/changeset/b0d892e1cdd4236b1f74debca1772ea330ff5acd))\n* Modify test.py ([6dbae5f842f](https://code.rhodecode.com/u/yuroitaki/zulip-testing/changeset/6dbae5f842f80ccb05508a1de7aace9d0f327473))"
self.check_webhook("push__multiple_committers", expected_topic, expected_message)
self.check_webhook("push__multiple_committers", expected_topic_name, expected_message)
def test_push_multiple_committers_with_others(self) -> None:
expected_topic = "u/yuroitaki/zulip-testing / master"
expected_topic_name = "u/yuroitaki/zulip-testing / master"
commits_info = "* Modify test.py ([6dbae5f842f](https://code.rhodecode.com/u/yuroitaki/zulip-testing/changeset/6dbae5f842f80ccb05508a1de7aace9d0f327473))\n"
expected_message = f"yuroitaki pushed 6 commits to branch master. Commits by Itachi Sensei <itachisensei@email.com> (2), Yuro Itaki <yuroitaki@email.com> (2), Jonas Nielsen <jonasnielsen@email.com> (1) and others (1).\n\n* Add test.py ([b0d892e1cdd](https://code.rhodecode.com/u/yuroitaki/zulip-testing/changeset/b0d892e1cdd4236b1f74debca1772ea330ff5acd))\n{commits_info * 4}* Add test.py ([b0d892e1cdd](https://code.rhodecode.com/u/yuroitaki/zulip-testing/changeset/b0d892e1cdd4236b1f74debca1772ea330ff5acd))"
self.check_webhook(
"push__multiple_committers_with_others", expected_topic, expected_message
"push__multiple_committers_with_others", expected_topic_name, expected_message
)
def test_push_commits_more_than_limit(self) -> None:
expected_topic = "u/yuroitaki/zulip-testing / master"
expected_topic_name = "u/yuroitaki/zulip-testing / master"
commits_info = "* Modify README ([2b8c0ebf507](https://code.rhodecode.com/u/yuroitaki/zulip-testing/changeset/2b8c0ebf50710bc2e1cdb6a33071dd2435ad667c))\n"
expected_message = f"yuroitaki pushed 50 commits to branch master. Commits by Yuro Itaki <yuroitaki@email.com> (50).\n\n{commits_info * COMMITS_LIMIT}[and {50 - COMMITS_LIMIT} more commit(s)]"
self.check_webhook("push__commits_more_than_limit", expected_topic, expected_message)
self.check_webhook("push__commits_more_than_limit", expected_topic_name, expected_message)
def test_push_remove_branch(self) -> None:
expected_topic = "u/yuroitaki/zulip-testing / dev"
expected_topic_name = "u/yuroitaki/zulip-testing / dev"
expected_message = "yuroitaki pushed 1 commit to branch dev. Commits by Yuro Itaki <yuroitaki@email.com> (1).\n\n* Deleted branch dev ([delete_bran](https://code.rhodecode.com/u/yuroitaki/zulip-testing/changeset/delete_branch=%3Edev))"
self.check_webhook("push__remove_branch", expected_topic, expected_message)
self.check_webhook("push__remove_branch", expected_topic_name, expected_message)