Zulip server and web application. Open-source team chat that helps teams stay productive and focused.
webhooks/tests: Stop passing check_webhook's default content_type.
Niloth P8bf4fb8a0d21
diff --git a/zerver/webhooks/beeminder/tests.py b/zerver/webhooks/beeminder/tests.pyindex 483e071d2b4..5e3f5805b01 100644--- a/zerver/webhooks/beeminder/tests.py+++ b/zerver/webhooks/beeminder/tests.py@@ -29,6 +29,4 @@ You are going to derail from goal **gainweight** in **5.6 hours**. You need **+2* Pledge: **$5** :worried:""".strip()- self.check_webhook(- "derail_worried", expected_topic_name, expected_message, content_type="application/json"- )+ self.check_webhook("derail_worried", expected_topic_name, expected_message)diff --git a/zerver/webhooks/flock/tests.py b/zerver/webhooks/flock/tests.pyindex 3cb7b9f6f76..bf90b102c79 100644--- a/zerver/webhooks/flock/tests.py+++ b/zerver/webhooks/flock/tests.py@@ -5,69 +5,49 @@ class FlockHookTests(WebhookTestCase):def test_flock_message(self) -> None:expected_topic_name = "Flock notifications"expected_message = "This is the welcome message!"- self.check_webhook(- "messages", expected_topic_name, expected_message, content_type="application/json"- )+ self.check_webhook("messages", expected_topic_name, expected_message)def test_flock_reply(self) -> None:expected_topic_name = "Flock notifications"expected_message = "It's interesting how high productivity will go..."- self.check_webhook(- "reply", expected_topic_name, expected_message, content_type="application/json"- )+ self.check_webhook("reply", expected_topic_name, expected_message)def test_flock_note(self) -> None:expected_topic_name = "Flock notifications"expected_message = "Shared a note"- self.check_webhook(- "note", expected_topic_name, expected_message, content_type="application/json"- )+ self.check_webhook("note", expected_topic_name, expected_message)def test_flock_reply_note(self) -> None:expected_topic_name = "Flock notifications"expected_message = "This is reply to Note."- self.check_webhook(- "reply_note", expected_topic_name, expected_message, content_type="application/json"- )+ self.check_webhook("reply_note", expected_topic_name, expected_message)def test_flock_reply_pinned(self) -> None:expected_topic_name = "Flock notifications"expected_message = "This is reply to pinned message."- self.check_webhook(- "reply_pinned", expected_topic_name, expected_message, content_type="application/json"- )+ self.check_webhook("reply_pinned", expected_topic_name, expected_message)def test_flock_reply_reminder(self) -> None:expected_topic_name = "Flock notifications"expected_message = "This is a reply to Reminder."- self.check_webhook(- "reply_reminder", expected_topic_name, expected_message, content_type="application/json"- )+ self.check_webhook("reply_reminder", expected_topic_name, expected_message)def test_flock_reply_todo(self) -> None:expected_topic_name = "Flock notifications"expected_message = "This is a reply to Todo notification."- self.check_webhook(- "reply_todo", expected_topic_name, expected_message, content_type="application/json"- )+ self.check_webhook("reply_todo", expected_topic_name, expected_message)def test_flock_pinned(self) -> None:expected_topic_name = "Flock notifications"expected_message = "Rishabh rawat pinned an item to the conversation"- self.check_webhook(- "pinned", expected_topic_name, expected_message, content_type="application/json"- )+ self.check_webhook("pinned", expected_topic_name, expected_message)def test_flock_reminder(self) -> None:expected_topic_name = "Flock notifications"expected_message = "Rishabh rawat wanted me to remind All"- self.check_webhook(- "reminder", expected_topic_name, expected_message, content_type="application/json"- )+ self.check_webhook("reminder", expected_topic_name, expected_message)def test_flock_todo(self) -> None:expected_topic_name = "Flock notifications"expected_message = "Rishabh rawat added a to-do in New List 1 list"- self.check_webhook(- "todo", expected_topic_name, expected_message, content_type="application/json"- )+ self.check_webhook("todo", expected_topic_name, expected_message)diff --git a/zerver/webhooks/gong/tests.py b/zerver/webhooks/gong/tests.pyindex 1c442d74f61..bbeee6675d3 100644--- a/zerver/webhooks/gong/tests.py+++ b/zerver/webhooks/gong/tests.py@@ -39,7 +39,6 @@ class GongHookTests(WebhookTestCase):"call_completed",self.EXPECTED_TOPIC,self.EXPECTED_CALL_MESSAGE.format(title=self.CALL_TITLE),- content_type="application/json",)def test_gong_test_call(self) -> None:@@ -49,7 +48,6 @@ class GongHookTests(WebhookTestCase):"call_completed","Gong Test",f"Gong webhook has been successfully configured.\n\n{self.EXPECTED_CALL_MESSAGE.format(title=self.CALL_TITLE)}",- content_type="application/json",custom_payload=payload,)@@ -60,7 +58,6 @@ class GongHookTests(WebhookTestCase):"call_completed","Gong call (ID: 5599332235511222779)",self.EXPECTED_CALL_MESSAGE.format(title="Gong call"),- content_type="application/json",custom_payload=payload,)@@ -72,7 +69,6 @@ class GongHookTests(WebhookTestCase):"call_completed",self.EXPECTED_TOPIC,f"{intro}\n\n{self.TRACKERS_SECTION}\n\n{self.TOPICS_SECTION}",- content_type="application/json",custom_payload=payload,)@@ -84,7 +80,6 @@ class GongHookTests(WebhookTestCase):"call_completed",self.EXPECTED_TOPIC,f"{intro}\n\n{self.PARTICIPANTS_SECTION}\n\n{self.TOPICS_SECTION}",- content_type="application/json",custom_payload=payload,)@@ -96,7 +91,6 @@ class GongHookTests(WebhookTestCase):"call_completed",self.EXPECTED_TOPIC,f"{intro}\n\n{self.PARTICIPANTS_SECTION}\n\n{self.TRACKERS_SECTION}",- content_type="application/json",custom_payload=payload,)@@ -107,7 +101,6 @@ class GongHookTests(WebhookTestCase):"call_completed",self.EXPECTED_TOPIC,f"{intro}\n\n{self.PARTICIPANTS_SECTION}\n\n{self.TOPICS_SECTION}",- content_type="application/json",)def test_call_with_top_topics_disabled(self) -> None:@@ -117,7 +110,6 @@ class GongHookTests(WebhookTestCase):"call_completed",self.EXPECTED_TOPIC,f"{intro}\n\n{self.PARTICIPANTS_SECTION}\n\n{self.TRACKERS_SECTION}",- content_type="application/json",)def test_call_with_participants_disabled(self) -> None:@@ -127,7 +119,6 @@ class GongHookTests(WebhookTestCase):"call_completed",self.EXPECTED_TOPIC,f"{intro}\n\n{self.TRACKERS_SECTION}\n\n{self.TOPICS_SECTION}",- content_type="application/json",)def test_call_with_participant_contacts_disabled(self) -> None:@@ -142,7 +133,6 @@ class GongHookTests(WebhookTestCase):"call_completed",self.EXPECTED_TOPIC,f"{intro}\n\n{participants}\n\n{self.TRACKERS_SECTION}\n\n{self.TOPICS_SECTION}",- content_type="application/json",)def test_call_with_participants_off_but_contacts_on(self) -> None:@@ -154,7 +144,6 @@ class GongHookTests(WebhookTestCase):"call_completed",self.EXPECTED_TOPIC,f"{intro}\n\n{self.TRACKERS_SECTION}\n\n{self.TOPICS_SECTION}",- content_type="application/json",)def test_call_with_public_comments_enabled(self) -> None:@@ -166,7 +155,6 @@ class GongHookTests(WebhookTestCase):"call_completed",self.EXPECTED_TOPIC,f"{self.EXPECTED_CALL_MESSAGE.format(title=self.CALL_TITLE)}\n\n{comments}",- content_type="application/json",)def test_get_participants(self) -> None:diff --git a/zerver/webhooks/librato/tests.py b/zerver/webhooks/librato/tests.pyindex 053699285a1..8e808a08a68 100644--- a/zerver/webhooks/librato/tests.py+++ b/zerver/webhooks/librato/tests.py@@ -71,12 +71,7 @@ class LibratoHookTests(WebhookTestCase):def test_bad_request(self) -> None:with self.assertRaises(AssertionError) as e:- self.check_webhook(- "bad",- "",- "",- content_type="application/json",- )+ self.check_webhook("bad", "", "")self.assertIn("Malformed JSON input", e.exception.args[0])def test_bad_msg_type(self) -> None:diff --git a/zerver/webhooks/netlify/tests.py b/zerver/webhooks/netlify/tests.pyindex bb541d0b3cd..e1bb8b4dad4 100644--- a/zerver/webhooks/netlify/tests.py+++ b/zerver/webhooks/netlify/tests.py@@ -6,20 +6,13 @@ class NetlifyHookTests(WebhookTestCase):expected_topic_name = "master"expected_message = "The build [objective-jepsen-35fbb2](http://objective-jepsen-35fbb2.netlify.com) on branch master is now building."- self.check_webhook(- "deploy_building",- expected_topic_name,- expected_message,- content_type="application/json",- )+ self.check_webhook("deploy_building", expected_topic_name, expected_message)def test_created_message(self) -> None:expected_topic_name = "master"expected_message = "The build [objective-jepsen-35fbb2](http://objective-jepsen-35fbb2.netlify.com) on branch master is now ready."- self.check_webhook(- "deploy_created", expected_topic_name, expected_message, content_type="application/json"- )+ self.check_webhook("deploy_created", expected_topic_name, expected_message)def test_failed_message(self) -> None:expected_topic_name = "master"@@ -28,9 +21,7 @@ class NetlifyHookTests(WebhookTestCase):"on branch master failed during stage 'building site': Build script returned non-zero exit code: 127")- self.check_webhook(- "deploy_failed", expected_topic_name, expected_message, content_type="application/json"- )+ self.check_webhook("deploy_failed", expected_topic_name, expected_message)def test_locked_message(self) -> None:expected_topic_name = "master"@@ -39,9 +30,7 @@ class NetlifyHookTests(WebhookTestCase):"on branch master is now locked.")- self.check_webhook(- "deploy_locked", expected_topic_name, expected_message, content_type="application/json"- )+ self.check_webhook("deploy_locked", expected_topic_name, expected_message)def test_unlocked_message(self) -> None:expected_topic_name = "master"@@ -50,9 +39,4 @@ class NetlifyHookTests(WebhookTestCase):"on branch master is now unlocked.")- self.check_webhook(- "deploy_unlocked",- expected_topic_name,- expected_message,- content_type="application/json",- )+ self.check_webhook("deploy_unlocked", expected_topic_name, expected_message)diff --git a/zerver/webhooks/newrelic/tests.py b/zerver/webhooks/newrelic/tests.pyindex 80c925b68be..c10519375d3 100644--- a/zerver/webhooks/newrelic/tests.py+++ b/zerver/webhooks/newrelic/tests.py@@ -28,7 +28,6 @@ class NewRelicHookTests(WebhookTestCase):"incident_activated_new_default_payload",expected_topic_name,expected_message,- content_type="application/json",)def test_incident_activated_new_provided_base_payload(self) -> None:@@ -58,7 +57,6 @@ class NewRelicHookTests(WebhookTestCase):"incident_activated_new_provided_base_payload",expected_topic_name,expected_message,- content_type="application/json",)def test_incident_closed_default_payload(self) -> None:@@ -87,7 +85,6 @@ class NewRelicHookTests(WebhookTestCase):"incident_closed_default_payload",expected_topic_name,expected_message,- content_type="application/json",)def test_incident_closed_provided_base_payload(self) -> None:@@ -117,7 +114,6 @@ class NewRelicHookTests(WebhookTestCase):"incident_closed_provided_base_payload",expected_topic_name,expected_message,- content_type="application/json",)def test_incident_acknowledged_default_payload(self) -> None:@@ -146,7 +142,6 @@ class NewRelicHookTests(WebhookTestCase):"incident_acknowledged_default_payload",expected_topic_name,expected_message,- content_type="application/json",)def test_incident_acknowledged_provided_base_payload(self) -> None:@@ -175,7 +170,6 @@ class NewRelicHookTests(WebhookTestCase):"incident_acknowledged_provided_base_payload",expected_topic_name,expected_message,- content_type="application/json",)def test_incident_created_default_payload(self) -> None:@@ -204,7 +198,6 @@ class NewRelicHookTests(WebhookTestCase):"incident_created_default_payload",expected_topic_name,expected_message,- content_type="application/json",)def test_incident_created_provided_base_payload(self) -> None:@@ -233,7 +226,6 @@ class NewRelicHookTests(WebhookTestCase):"incident_created_provided_base_payload",expected_topic_name,expected_message,- content_type="application/json",)def test_incident_default_base_with_zulip_custom_fields(self) -> None:@@ -267,7 +259,6 @@ class NewRelicHookTests(WebhookTestCase):"incident_default_base_with_zulip_custom_fields",expected_topic_name,expected_message,- content_type="application/json",)def test_incident_provided_base_with_zulip_custom_fields(self) -> None:@@ -301,7 +292,6 @@ class NewRelicHookTests(WebhookTestCase):"incident_provided_base_with_zulip_custom_fields",expected_topic_name,expected_message,- content_type="application/json",)def test_incident_with_invalid_zulip_custom_fields(self) -> None:@@ -333,7 +323,6 @@ class NewRelicHookTests(WebhookTestCase):"incident_with_invalid_zulip_custom_fields",expected_topic_name,expected_message,- content_type="application/json",)def test_missing_essential_fields_default_payload(self) -> None:@@ -350,5 +339,4 @@ class NewRelicHookTests(WebhookTestCase):"missing_essential_fields_default_payload",expected_topic_name,expected_message,- content_type="application/json",)diff --git a/zerver/webhooks/semaphore/tests.py b/zerver/webhooks/semaphore/tests.pyindex 1ec43eb9901..d326cb2e01a 100644--- a/zerver/webhooks/semaphore/tests.py+++ b/zerver/webhooks/semaphore/tests.py@@ -50,9 +50,7 @@ class SemaphoreHookTests(WebhookTestCase):* **Branch**: rw/webhook_impl* **Author**: [radwo](https://github.com/radwo)""".strip()- self.check_webhook(- "push", expected_topic_name, expected_message, content_type="application/json"- )+ self.check_webhook("push", expected_topic_name, expected_message)def test_semaphore2_push_non_gh_repo(self) -> None:expected_topic_name = "notifications/rw/webhook_impl" # repo/branch@@ -63,9 +61,7 @@ class SemaphoreHookTests(WebhookTestCase):* **Author**: radwo""".strip()with patch("zerver.webhooks.semaphore.view.is_github_repo", return_value=False):- self.check_webhook(- "push", expected_topic_name, expected_message, content_type="application/json"- )+ self.check_webhook("push", expected_topic_name, expected_message)def test_semaphore_pull_request(self) -> None:expected_topic_name = "notifications/test-notifications"@@ -75,9 +71,7 @@ class SemaphoreHookTests(WebhookTestCase):* **Branch**: test-notifications* **Author**: [radwo](https://github.com/radwo)""".strip()- self.check_webhook(- "pull_request", expected_topic_name, expected_message, content_type="application/json"- )+ self.check_webhook("pull_request", expected_topic_name, expected_message)def test_semaphore_pull_request_non_gh_repo(self) -> None:expected_topic_name = "notifications/test-notifications"@@ -88,12 +82,7 @@ class SemaphoreHookTests(WebhookTestCase):* **Author**: radwo""".strip()with patch("zerver.webhooks.semaphore.view.is_github_repo", return_value=False):- self.check_webhook(- "pull_request",- expected_topic_name,- expected_message,- content_type="application/json",- )+ self.check_webhook("pull_request", expected_topic_name, expected_message)def test_semaphore_tag(self) -> None:expected_topic_name = "notifications"@@ -102,9 +91,7 @@ class SemaphoreHookTests(WebhookTestCase):* **Tag**: [v1.0.1](https://github.com/renderedtext/notifications/tree/v1.0.1)* **Author**: [radwo](https://github.com/radwo)""".strip()- self.check_webhook(- "tag", expected_topic_name, expected_message, content_type="application/json"- )+ self.check_webhook("tag", expected_topic_name, expected_message)def test_semaphore_tag_non_gh_repo(self) -> None:expected_topic_name = "notifications"@@ -114,9 +101,7 @@ class SemaphoreHookTests(WebhookTestCase):* **Author**: radwo""".strip()with patch("zerver.webhooks.semaphore.view.is_github_repo", return_value=False):- self.check_webhook(- "tag", expected_topic_name, expected_message, content_type="application/json"- )+ self.check_webhook("tag", expected_topic_name, expected_message)def test_semaphore_unknown(self) -> None:expected_topic_name = "knighthood/master"@@ -136,9 +121,7 @@ class SemaphoreHookTests(WebhookTestCase):with patch("zerver.webhooks.semaphore.tests.SemaphoreHookTests.get_body", self.get_unknown_event):- self.check_webhook(- "tag", expected_topic_name, expected_message, content_type="application/json"- )+ self.check_webhook("tag", expected_topic_name, expected_message)def get_unknown_event(self, fixture_name: str) -> str:"""Return modified payload with revision.reference_type changed"""diff --git a/zerver/webhooks/slack/tests.py b/zerver/webhooks/slack/tests.pyindex b3fd6b17ca3..f08dfbd290c 100644--- a/zerver/webhooks/slack/tests.py+++ b/zerver/webhooks/slack/tests.py@@ -56,7 +56,6 @@ class SlackWebhookTests(WebhookTestCase):"message_with_normal_text",EXPECTED_TOPIC,expected_message,- content_type="application/json",)@mock_slack_api_calls@@ -68,7 +67,6 @@ class SlackWebhookTests(WebhookTestCase):"message_with_normal_text",expected_topic_name,expected_message,- content_type="application/json",)@mock_slack_api_calls@@ -80,7 +78,6 @@ class SlackWebhookTests(WebhookTestCase):"message_with_normal_text",expected_topic_name,expected_message,- content_type="application/json",)@mock_slack_api_calls@@ -92,7 +89,6 @@ class SlackWebhookTests(WebhookTestCase):"message_with_normal_text",expected_topic_name,expected_message,- content_type="application/json",)@mock_slack_api_calls@@ -104,7 +100,6 @@ class SlackWebhookTests(WebhookTestCase):"message_with_normal_text",EXPECTED_TOPIC,expected_message,- content_type="application/json",)@mock_slack_api_calls@@ -117,7 +112,6 @@ class SlackWebhookTests(WebhookTestCase):"message_with_normal_text",expected_topic_name,expected_message,- content_type="application/json",)@mock_slack_api_calls@@ -130,7 +124,6 @@ class SlackWebhookTests(WebhookTestCase):"message_with_normal_text",expected_topic_name,expected_message,- content_type="application/json",)@mock_slack_api_calls@@ -143,7 +136,6 @@ class SlackWebhookTests(WebhookTestCase):"message_with_normal_text",expected_topic_name,expected_message,- content_type="application/json",)@mock_slack_api_calls@@ -192,7 +184,6 @@ class SlackWebhookTests(WebhookTestCase):"message_from_slack_bridge_bot","","",- content_type="application/json",expect_noop=True,)@@ -204,7 +195,6 @@ class SlackWebhookTests(WebhookTestCase):"message_with_bullet_points",EXPECTED_TOPIC,expected_message,- content_type="application/json",)@mock_slack_api_calls@@ -215,7 +205,6 @@ class SlackWebhookTests(WebhookTestCase):"message_with_channel_and_user_mentions",EXPECTED_TOPIC,expected_message,- content_type="application/json",)@mock_slack_api_calls@@ -226,7 +215,6 @@ class SlackWebhookTests(WebhookTestCase):"message_with_channel_mentions",EXPECTED_TOPIC,expected_message,- content_type="application/json",)@mock_slack_api_calls@@ -237,7 +225,6 @@ class SlackWebhookTests(WebhookTestCase):"message_with_formatted_texts",EXPECTED_TOPIC,expected_message,- content_type="application/json",)@mock_slack_api_calls@@ -251,7 +238,6 @@ class SlackWebhookTests(WebhookTestCase):"message_with_image_files",EXPECTED_TOPIC,expected_message,- content_type="application/json",)@mock_slack_api_calls@@ -269,7 +255,6 @@ class SlackWebhookTests(WebhookTestCase):"message_with_inline_code",EXPECTED_TOPIC,expected_message,- content_type="application/json",)@mock_slack_api_calls@@ -280,7 +265,6 @@ class SlackWebhookTests(WebhookTestCase):"message_with_ordered_list",EXPECTED_TOPIC,expected_message,- content_type="application/json",)@mock_slack_api_calls@@ -293,7 +277,6 @@ class SlackWebhookTests(WebhookTestCase):"message_with_user_mentions",EXPECTED_TOPIC,expected_message,- content_type="application/json",)@mock_slack_api_calls@@ -310,7 +293,6 @@ class SlackWebhookTests(WebhookTestCase):"message_with_variety_files",EXPECTED_TOPIC,expected_message,- content_type="application/json",)@mock_slack_api_calls@@ -321,7 +303,6 @@ class SlackWebhookTests(WebhookTestCase):"message_with_workspace_mentions",EXPECTED_TOPIC,expected_message,- content_type="application/json",)@mock_slack_api_calls@@ -344,7 +325,6 @@ To Do""".strip()"message_from_slack_integration_bot",EXPECTED_TOPIC,expected_message,- content_type="application/json",)@mock_slack_api_calls@@ -355,7 +335,6 @@ To Do""".strip()"message_with_code_block",EXPECTED_TOPIC,expected_message,- content_type="application/json",)@mock_slack_api_calls@@ -366,7 +345,6 @@ To Do""".strip()"message_with_complex_formatted_texts",EXPECTED_TOPIC,expected_message,- content_type="application/json",)@mock_slack_api_calls@@ -377,7 +355,6 @@ To Do""".strip()"message_with_complex_formatted_mentions",EXPECTED_TOPIC,expected_message,- content_type="application/json",)@mock_slack_api_calls@@ -388,7 +365,6 @@ To Do""".strip()"message_with_quote_block",EXPECTED_TOPIC,expected_message,- content_type="application/json",)@mock_slack_api_calls@@ -419,7 +395,6 @@ To Do""".strip()self.check_webhook("challenge_handshake_payload",expect_noop=True,- content_type="application/json",)s.assert_called_once()@@ -438,7 +413,6 @@ To Do""".strip()self.check_webhook("challenge_handshake_payload",expect_noop=True,- content_type="application/json",)s.assert_called_once()@@ -469,7 +443,6 @@ To Do""".strip()"message_with_normal_text",EXPECTED_TOPIC,expected_message,- content_type="application/json",)@responses.activate@@ -500,7 +473,6 @@ To Do""".strip()"message_with_normal_text",EXPECTED_TOPIC,expected_message,- content_type="application/json",)