From e168f9938c4f372323244a2abaadf23f991e8819 Mon Sep 17 00:00:00 2001 From: Preston Hansen Date: Thu, 19 Apr 2018 20:57:21 -0500 Subject: [PATCH] tests: Refactor use of test and webhook data fixtures. --- templates/zerver/api/webhook-walkthrough.md | 6 +++--- zerver/lib/test_classes.py | 11 +++++++++-- zerver/tests/test_decorators.py | 4 ++-- zerver/tests/test_email_mirror.py | 14 +++----------- zerver/tests/test_notifications.py | 4 +--- zerver/tests/test_push_notifications.py | 4 +--- zerver/tests/test_report.py | 7 ++----- zerver/tests/test_slack_importer.py | 5 ++--- zerver/webhooks/appfollow/tests.py | 2 +- zerver/webhooks/beanstalk/tests.py | 2 +- zerver/webhooks/beeminder/tests.py | 2 +- zerver/webhooks/bitbucket/tests.py | 2 +- zerver/webhooks/delighted/tests.py | 2 +- zerver/webhooks/deskdotcom/tests.py | 2 +- zerver/webhooks/dialogflow/tests.py | 6 +++--- zerver/webhooks/dropbox/tests.py | 2 +- zerver/webhooks/flock/tests.py | 2 +- zerver/webhooks/freshdesk/tests.py | 2 +- zerver/webhooks/front/tests.py | 2 +- zerver/webhooks/github_legacy/tests.py | 4 ++-- zerver/webhooks/gocd/tests.py | 2 +- zerver/webhooks/gosquared/tests.py | 2 +- zerver/webhooks/greenhouse/tests.py | 2 +- zerver/webhooks/groove/tests.py | 2 +- zerver/webhooks/hellosign/tests.py | 2 +- zerver/webhooks/helloworld/tests.py | 2 +- zerver/webhooks/heroku/tests.py | 2 +- zerver/webhooks/homeassistant/tests.py | 2 +- zerver/webhooks/insping/tests.py | 2 +- zerver/webhooks/intercom/tests.py | 2 +- zerver/webhooks/jira/tests.py | 2 +- zerver/webhooks/librato/tests.py | 4 ++-- zerver/webhooks/mention/tests.py | 2 +- zerver/webhooks/newrelic/tests.py | 2 +- zerver/webhooks/opsgenie/tests.py | 2 +- zerver/webhooks/papertrail/tests.py | 2 +- zerver/webhooks/pivotal/tests.py | 4 ++-- zerver/webhooks/raygun/tests.py | 2 +- zerver/webhooks/semaphore/tests.py | 2 +- zerver/webhooks/slack/tests.py | 2 +- zerver/webhooks/solano/tests.py | 2 +- zerver/webhooks/splunk/tests.py | 2 +- zerver/webhooks/statuspage/tests.py | 2 +- zerver/webhooks/stripe/tests.py | 2 +- zerver/webhooks/teamcity/tests.py | 2 +- zerver/webhooks/travis/tests.py | 2 +- zerver/webhooks/wordpress/tests.py | 2 +- 47 files changed, 67 insertions(+), 76 deletions(-) diff --git a/templates/zerver/api/webhook-walkthrough.md b/templates/zerver/api/webhook-walkthrough.md index 5a43979f0e..2dd8ba0ed3 100644 --- a/templates/zerver/api/webhook-walkthrough.md +++ b/templates/zerver/api/webhook-walkthrough.md @@ -241,7 +241,7 @@ class HelloWorldHookTests(WebhookTestCase): content_type="application/x-www-form-urlencoded") def get_body(self, fixture_name: Text) -> Text: - return self.fixture_data("helloworld", fixture_name, file_type="json") + return self.webhook_fixture_data("helloworld", fixture_name, file_type="json") ``` @@ -260,7 +260,7 @@ value from the fixture. If these don't match, the test will fail. you would provide a webhook URL to the 3rd party service. `api_key={api_key}` says that an API key is expected. -In `get_body`, the first argument in the call to `self.fixture_data` specifies the +In `get_body`, the first argument in the call to `self.webhook_fixture_data` specifies the prefix of your fixture file names, and `file_type` their type. Common types are `json` and `txt`. @@ -504,7 +504,7 @@ class QuerytestHookTests(WebhookTestCase): content_type="application/x-www-form-urlencoded") def get_body(self, fixture_name: Text) -> Text: - return self.fixture_data("querytest", fixture_name, file_type="json") + return self.webhook_fixture_data("querytest", fixture_name, file_type="json") ``` You can also override `get_body` if your test data needs to be constructed in diff --git a/zerver/lib/test_classes.py b/zerver/lib/test_classes.py index bb94d46035..a9c9843a0b 100644 --- a/zerver/lib/test_classes.py +++ b/zerver/lib/test_classes.py @@ -509,13 +509,20 @@ class ZulipTestCase(TestCase): for substring in substrings: self.assertNotIn(substring, decoded) - def fixture_data(self, type: Text, action: Text, file_type: Text='json') -> Text: + def webhook_fixture_data(self, type: Text, action: Text, file_type: Text='json') -> Text: fn = os.path.join( os.path.dirname(__file__), "../webhooks/%s/fixtures/%s.%s" % (type, action, file_type) ) return open(fn).read() + def fixture_data(self, file_name: Text, type: Text='') -> Text: + fn = os.path.join( + os.path.dirname(__file__), + "../tests/fixtures/%s/%s" % (type, file_name) + ) + return open(fn).read() + def make_stream(self, stream_name: Text, realm: Optional[Realm]=None, invite_only: Optional[bool]=False) -> Stream: if realm is None: @@ -685,7 +692,7 @@ class WebhookTestCase(ZulipTestCase): def get_body(self, fixture_name: Text) -> Union[Text, Dict[str, Text]]: """Can be implemented either as returning a dictionary containing the post parameters or as string containing the body of the request.""" - return ujson.dumps(ujson.loads(self.fixture_data(self.FIXTURE_DIR_NAME, fixture_name))) + return ujson.dumps(ujson.loads(self.webhook_fixture_data(self.FIXTURE_DIR_NAME, fixture_name))) def do_test_subject(self, msg: Message, expected_subject: Optional[Text]) -> None: if expected_subject is not None: diff --git a/zerver/tests/test_decorators.py b/zerver/tests/test_decorators.py index b8677c8b74..bd5648fa20 100644 --- a/zerver/tests/test_decorators.py +++ b/zerver/tests/test_decorators.py @@ -713,7 +713,7 @@ class DeactivatedRealmTest(ZulipTestCase): user_profile = self.example_user("hamlet") url = "/api/v1/external/jira?api_key=%s&stream=jira_custom" % ( user_profile.api_key,) - data = self.fixture_data('jira', "created_v2") + data = self.webhook_fixture_data('jira', 'created_v2') result = self.client_post(url, data, content_type="application/json") self.assert_json_error_contains(result, "has been deactivated", status_code=400) @@ -886,7 +886,7 @@ class InactiveUserTest(ZulipTestCase): url = "/api/v1/external/jira?api_key=%s&stream=jira_custom" % ( user_profile.api_key,) - data = self.fixture_data('jira', "created_v2") + data = self.webhook_fixture_data('jira', 'created_v2') result = self.client_post(url, data, content_type="application/json") self.assert_json_error_contains(result, "Account not active", status_code=400) diff --git a/zerver/tests/test_email_mirror.py b/zerver/tests/test_email_mirror.py index 9c20c48171..71e7a9538c 100644 --- a/zerver/tests/test_email_mirror.py +++ b/zerver/tests/test_email_mirror.py @@ -325,8 +325,6 @@ class TestReplyExtraction(ZulipTestCase): self.assertEqual(message.content, 'Reply') -MAILS_DIR = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "tests", "fixtures", "email") - class TestScriptMTA(ZulipTestCase): @@ -338,9 +336,7 @@ class TestScriptMTA(ZulipTestCase): stream = get_stream("Denmark", get_realm("zulip")) stream_to_address = encode_email_address(stream) - template_path = os.path.join(MAILS_DIR, "simple.txt") - with open(template_path) as template_file: - mail_template = template_file.read() + mail_template = self.fixture_data('simple.txt', type='email') mail = mail_template.format(stream_to_address=stream_to_address, sender=sender) read_pipe, write_pipe = os.pipe() os.write(write_pipe, mail.encode()) @@ -356,9 +352,7 @@ class TestScriptMTA(ZulipTestCase): sender = self.example_email('hamlet') stream = get_stream("Denmark", get_realm("zulip")) stream_to_address = encode_email_address(stream) - template_path = os.path.join(MAILS_DIR, "simple.txt") - with open(template_path) as template_file: - mail_template = template_file.read() + mail_template = self.fixture_data('simple.txt', type='email') mail = mail_template.format(stream_to_address=stream_to_address, sender=sender) read_pipe, write_pipe = os.pipe() os.write(write_pipe, mail.encode()) @@ -399,9 +393,7 @@ class TestEmailMirrorTornadoView(ZulipTestCase): @mock.patch('zerver.lib.email_mirror.queue_json_publish') def send_offline_message(self, to_address: str, sender: str, mock_queue_json_publish: mock.Mock) -> HttpResponse: - template_path = os.path.join(MAILS_DIR, "simple.txt") - with open(template_path) as template_file: - mail_template = template_file.read() + mail_template = self.fixture_data('simple.txt', type='email') mail = mail_template.format(stream_to_address=to_address, sender=sender) def check_queue_json_publish(queue_name: str, diff --git a/zerver/tests/test_notifications.py b/zerver/tests/test_notifications.py index 775748f400..1edf623ea7 100644 --- a/zerver/tests/test_notifications.py +++ b/zerver/tests/test_notifications.py @@ -484,9 +484,7 @@ class TestMissedMessages(ZulipTestCase): # Run `relative_to_full_url()` function over test fixtures present in # 'markdown_test_cases.json' and check that it converts all the relative # URLs to absolute URLs. - fixtures_file = os.path.join(settings.DEPLOY_ROOT, "zerver", "tests", - "fixtures", "markdown_test_cases.json") - fixtures = ujson.load(open(fixtures_file)) + fixtures = ujson.loads(self.fixture_data("markdown_test_cases.json")) test_fixtures = {} for test in fixtures['regular_tests']: test_fixtures[test['name']] = test diff --git a/zerver/tests/test_push_notifications.py b/zerver/tests/test_push_notifications.py index e3730c8b2f..f979c2341b 100644 --- a/zerver/tests/test_push_notifications.py +++ b/zerver/tests/test_push_notifications.py @@ -43,7 +43,6 @@ from zilencer.models import RemoteZulipServer, RemotePushDeviceToken from django.utils.timezone import now ZERVER_DIR = os.path.dirname(os.path.dirname(__file__)) -FIXTURES_FILE_PATH = os.path.join(ZERVER_DIR, "tests", "fixtures", "markdown_test_cases.json") class BouncerTestCase(ZulipTestCase): def setUp(self) -> None: @@ -1245,8 +1244,7 @@ class TestReceivesNotificationsFunctions(ZulipTestCase): class TestPushNotificationsContent(ZulipTestCase): def test_fixtures(self) -> None: - with open(FIXTURES_FILE_PATH) as fp: - fixtures = ujson.load(fp) + fixtures = ujson.loads(self.fixture_data("markdown_test_cases.json")) tests = fixtures["regular_tests"] for test in tests: if "text_content" in test: diff --git a/zerver/tests/test_report.py b/zerver/tests/test_report.py index 1bb6c8d5fa..3577a272e2 100644 --- a/zerver/tests/test_report.py +++ b/zerver/tests/test_report.py @@ -153,9 +153,6 @@ class TestReport(ZulipTestCase): annotate.assert_called_once_with('"trace"') def test_report_csp_violations(self) -> None: - fixture_data_file = open(os.path.join(os.path.dirname(__file__), - 'fixtures/csp_report.json'), 'r') - fixture_data = ujson.load(fixture_data_file) - params = ujson.dumps(fixture_data) - result = self.client_post("/report/csp_violations", params, content_type="application/json") + fixture_data = self.fixture_data('csp_report.json') + result = self.client_post("/report/csp_violations", fixture_data, content_type="application/json") self.assert_json_success(result) diff --git a/zerver/tests/test_slack_importer.py b/zerver/tests/test_slack_importer.py index a07ebf0fe8..55c1d9b5d3 100644 --- a/zerver/tests/test_slack_importer.py +++ b/zerver/tests/test_slack_importer.py @@ -489,9 +489,8 @@ class SlackImporter(ZulipTestCase): # Also the unzipped data file should be removed if the test fails at 'do_convert_data' rm_tree(test_slack_unzipped_file) - user_data_fixture = os.path.join(settings.DEPLOY_ROOT, "zerver", "tests", "fixtures", - "slack_fixtures", "user_data.json") - mock_get_slack_api_data.side_effect = [ujson.load(open(user_data_fixture))['members'], {}] + user_data_fixture = ujson.loads(self.fixture_data('user_data.json', type='slack_fixtures')) + mock_get_slack_api_data.side_effect = [user_data_fixture['members'], {}] do_convert_data(test_slack_zip_file, output_dir, token) self.assertTrue(os.path.exists(output_dir)) diff --git a/zerver/webhooks/appfollow/tests.py b/zerver/webhooks/appfollow/tests.py index f54feae631..379ff45aa9 100644 --- a/zerver/webhooks/appfollow/tests.py +++ b/zerver/webhooks/appfollow/tests.py @@ -48,7 +48,7 @@ Acme enables me to manage the flow of information quite well. I only wish I coul self.URL_TEMPLATE = original_url_template def get_body(self, fixture_name: Text) -> Text: - return self.fixture_data("appfollow", fixture_name, file_type="json") + return self.webhook_fixture_data("appfollow", fixture_name, file_type="json") class ConvertMarkdownTest(TestCase): def test_convert_bold(self) -> None: diff --git a/zerver/webhooks/beanstalk/tests.py b/zerver/webhooks/beanstalk/tests.py index 732a8045e2..6da22a72dd 100644 --- a/zerver/webhooks/beanstalk/tests.py +++ b/zerver/webhooks/beanstalk/tests.py @@ -140,4 +140,4 @@ class BeanstalkHookTests(WebhookTestCase): content_type=None) def get_body(self, fixture_name: Text) -> Dict[str, Text]: - return {'payload': self.fixture_data('beanstalk', fixture_name)} + return {'payload': self.webhook_fixture_data('beanstalk', fixture_name)} diff --git a/zerver/webhooks/beeminder/tests.py b/zerver/webhooks/beeminder/tests.py index 87fb3af18b..bd63ef1f35 100644 --- a/zerver/webhooks/beeminder/tests.py +++ b/zerver/webhooks/beeminder/tests.py @@ -37,4 +37,4 @@ class BeeminderHookTests(WebhookTestCase): content_type="application/json") def get_body(self, fixture_name: Text) -> Text: - return self.fixture_data("beeminder", fixture_name, file_type="json") + return self.webhook_fixture_data("beeminder", fixture_name, file_type="json") diff --git a/zerver/webhooks/bitbucket/tests.py b/zerver/webhooks/bitbucket/tests.py index f64359a1b2..7864555cf9 100644 --- a/zerver/webhooks/bitbucket/tests.py +++ b/zerver/webhooks/bitbucket/tests.py @@ -75,4 +75,4 @@ class BitbucketHookTests(WebhookTestCase): self.assert_json_success(result) def get_body(self, fixture_name: Text) -> Union[Text, Dict[str, Text]]: - return self.fixture_data(self.FIXTURE_DIR_NAME, fixture_name) + return self.webhook_fixture_data(self.FIXTURE_DIR_NAME, fixture_name) diff --git a/zerver/webhooks/delighted/tests.py b/zerver/webhooks/delighted/tests.py index 1709c77c4d..ab3ebb64fa 100644 --- a/zerver/webhooks/delighted/tests.py +++ b/zerver/webhooks/delighted/tests.py @@ -32,4 +32,4 @@ class DelightedHookTests(WebhookTestCase): content_type="application/x-www-form-urlencoded") def get_body(self, fixture_name: Text) -> Text: - return self.fixture_data("delighted", fixture_name, file_type="json") + return self.webhook_fixture_data("delighted", fixture_name, file_type="json") diff --git a/zerver/webhooks/deskdotcom/tests.py b/zerver/webhooks/deskdotcom/tests.py index 0413edce4e..20aa28f5bd 100644 --- a/zerver/webhooks/deskdotcom/tests.py +++ b/zerver/webhooks/deskdotcom/tests.py @@ -56,4 +56,4 @@ class DeskDotComHookTests(WebhookTestCase): content_type="application/x-www-form-urlencoded") def get_body(self, fixture_name: Text) -> Text: - return self.fixture_data("deskdotcom", fixture_name, file_type="txt") + return self.webhook_fixture_data("deskdotcom", fixture_name, file_type="txt") diff --git a/zerver/webhooks/dialogflow/tests.py b/zerver/webhooks/dialogflow/tests.py index e248f443d7..cdddf2f7f7 100644 --- a/zerver/webhooks/dialogflow/tests.py +++ b/zerver/webhooks/dialogflow/tests.py @@ -61,6 +61,6 @@ class DialogflowHookTests(WebhookTestCase): content_type="application/json") def get_body(self, fixture_name: Text) -> Text: - return self.fixture_data("dialogflow", - fixture_name, - file_type="json") + return self.webhook_fixture_data("dialogflow", + fixture_name, + file_type="json") diff --git a/zerver/webhooks/dropbox/tests.py b/zerver/webhooks/dropbox/tests.py index 790ffe614e..196b97713a 100644 --- a/zerver/webhooks/dropbox/tests.py +++ b/zerver/webhooks/dropbox/tests.py @@ -16,7 +16,7 @@ class DropboxHookTests(WebhookTestCase): content_type="application/x-www-form-urlencoded") def get_body(self, fixture_name: Text) -> Text: - return self.fixture_data("dropbox", fixture_name, file_type="json") + return self.webhook_fixture_data("dropbox", fixture_name, file_type="json") def test_verification_request(self) -> None: self.subscribe(self.test_user, self.STREAM_NAME) diff --git a/zerver/webhooks/flock/tests.py b/zerver/webhooks/flock/tests.py index 168b9812ec..6b12668603 100644 --- a/zerver/webhooks/flock/tests.py +++ b/zerver/webhooks/flock/tests.py @@ -87,4 +87,4 @@ class FlockHookTests(WebhookTestCase): content_type="application/json") def get_body(self, fixture_name: Text) -> Text: - return self.fixture_data("flock", fixture_name, file_type="json") + return self.webhook_fixture_data("flock", fixture_name, file_type="json") diff --git a/zerver/webhooks/freshdesk/tests.py b/zerver/webhooks/freshdesk/tests.py index 435b83b38b..6fdab2ee85 100644 --- a/zerver/webhooks/freshdesk/tests.py +++ b/zerver/webhooks/freshdesk/tests.py @@ -77,4 +77,4 @@ Priority: **High** => **Low**""" content_type="application/x-www-form-urlencoded") def get_body(self, fixture_name: Text) -> Text: - return self.fixture_data("freshdesk", fixture_name, file_type="json") + return self.webhook_fixture_data("freshdesk", fixture_name, file_type="json") diff --git a/zerver/webhooks/front/tests.py b/zerver/webhooks/front/tests.py index f364612739..7ac3afd715 100644 --- a/zerver/webhooks/front/tests.py +++ b/zerver/webhooks/front/tests.py @@ -180,4 +180,4 @@ class FrontHookTests(WebhookTestCase): self.assert_json_error(result, "Unknown webhook request") def get_body(self, fixture_name: Text) -> Text: - return self.fixture_data('front', fixture_name, file_type="json") + return self.webhook_fixture_data('front', fixture_name, file_type="json") diff --git a/zerver/webhooks/github_legacy/tests.py b/zerver/webhooks/github_legacy/tests.py index 744f1f9781..c8d641d90a 100644 --- a/zerver/webhooks/github_legacy/tests.py +++ b/zerver/webhooks/github_legacy/tests.py @@ -40,7 +40,7 @@ class GithubV1HookTests(WebhookTestCase): def get_body(self, fixture_name: Text) -> Dict[str, Text]: api_key = self.test_user.api_key - data = ujson.loads(self.fixture_data(self.FIXTURE_DIR_NAME, 'v1_' + fixture_name)) + data = ujson.loads(self.webhook_fixture_data(self.FIXTURE_DIR_NAME, 'v1_' + fixture_name)) data.update({'email': self.TEST_USER_EMAIL, 'api-key': api_key, 'payload': ujson.dumps(data['payload'])}) @@ -165,7 +165,7 @@ class GithubV2HookTests(WebhookTestCase): def get_body(self, fixture_name: Text) -> Dict[str, Text]: api_key = self.test_user.api_key - data = ujson.loads(self.fixture_data(self.FIXTURE_DIR_NAME, 'v2_' + fixture_name)) + data = ujson.loads(self.webhook_fixture_data(self.FIXTURE_DIR_NAME, 'v2_' + fixture_name)) data.update({'email': self.TEST_USER_EMAIL, 'api-key': api_key, 'payload': ujson.dumps(data['payload'])}) diff --git a/zerver/webhooks/gocd/tests.py b/zerver/webhooks/gocd/tests.py index f2da248295..5b3ae02c2d 100644 --- a/zerver/webhooks/gocd/tests.py +++ b/zerver/webhooks/gocd/tests.py @@ -40,4 +40,4 @@ class GocdHookTests(WebhookTestCase): ) def get_body(self, fixture_name: Text) -> Text: - return self.fixture_data("gocd", fixture_name, file_type="json") + return self.webhook_fixture_data("gocd", fixture_name, file_type="json") diff --git a/zerver/webhooks/gosquared/tests.py b/zerver/webhooks/gosquared/tests.py index 3b38808843..bd34439fd2 100644 --- a/zerver/webhooks/gosquared/tests.py +++ b/zerver/webhooks/gosquared/tests.py @@ -17,4 +17,4 @@ class GoSquaredHookTests(WebhookTestCase): content_type="application/x-www-form-urlencoded") def get_body(self, fixture_name: Text) -> Text: - return self.fixture_data("gosquared", fixture_name, file_type="json") + return self.webhook_fixture_data("gosquared", fixture_name, file_type="json") diff --git a/zerver/webhooks/greenhouse/tests.py b/zerver/webhooks/greenhouse/tests.py index addad0722c..87d5ff34b3 100644 --- a/zerver/webhooks/greenhouse/tests.py +++ b/zerver/webhooks/greenhouse/tests.py @@ -63,4 +63,4 @@ class GreenhouseHookTests(WebhookTestCase): content_type=self.CONTENT_TYPE) def get_body(self, fixture_name: Text) -> Text: - return self.fixture_data("greenhouse", fixture_name, file_type="json") + return self.webhook_fixture_data("greenhouse", fixture_name, file_type="json") diff --git a/zerver/webhooks/groove/tests.py b/zerver/webhooks/groove/tests.py index 26bcf94fd0..2540b7dc47 100644 --- a/zerver/webhooks/groove/tests.py +++ b/zerver/webhooks/groove/tests.py @@ -122,4 +122,4 @@ class GrooveHookTests(WebhookTestCase): self.assert_json_error(result, 'Missing required data') def get_body(self, fixture_name: Text) -> Text: - return self.fixture_data("groove", fixture_name, file_type="json") + return self.webhook_fixture_data("groove", fixture_name, file_type="json") diff --git a/zerver/webhooks/hellosign/tests.py b/zerver/webhooks/hellosign/tests.py index a5a29d51de..6cdceac0fc 100644 --- a/zerver/webhooks/hellosign/tests.py +++ b/zerver/webhooks/hellosign/tests.py @@ -24,4 +24,4 @@ class HelloSignHookTests(WebhookTestCase): content_type="application/x-www-form-urlencoded", topic=expected_subject) def get_body(self, fixture_name: Text) -> Text: - return self.fixture_data("hellosign", fixture_name, file_type="json") + return self.webhook_fixture_data("hellosign", fixture_name, file_type="json") diff --git a/zerver/webhooks/helloworld/tests.py b/zerver/webhooks/helloworld/tests.py index 0067e173f9..cea465f0e6 100644 --- a/zerver/webhooks/helloworld/tests.py +++ b/zerver/webhooks/helloworld/tests.py @@ -57,4 +57,4 @@ class HelloWorldHookTests(WebhookTestCase): content_type="application/x-www-form-urlencoded") def get_body(self, fixture_name: Text) -> Text: - return self.fixture_data("helloworld", fixture_name, file_type="json") + return self.webhook_fixture_data("helloworld", fixture_name, file_type="json") diff --git a/zerver/webhooks/heroku/tests.py b/zerver/webhooks/heroku/tests.py index 7030954833..b9e7bf0767 100644 --- a/zerver/webhooks/heroku/tests.py +++ b/zerver/webhooks/heroku/tests.py @@ -16,4 +16,4 @@ class HerokuHookTests(WebhookTestCase): content_type="application/x-www-form-urlencoded") def get_body(self, fixture_name: Text) -> Text: - return self.fixture_data("heroku", fixture_name, file_type="txt") + return self.webhook_fixture_data("heroku", fixture_name, file_type="txt") diff --git a/zerver/webhooks/homeassistant/tests.py b/zerver/webhooks/homeassistant/tests.py index 56b149b5f6..4c311f48c5 100644 --- a/zerver/webhooks/homeassistant/tests.py +++ b/zerver/webhooks/homeassistant/tests.py @@ -22,4 +22,4 @@ class HomeAssistantHookTests(WebhookTestCase): content_type="application/x-www-form-urlencoded") def get_body(self, fixture_name: Text) -> Text: - return self.fixture_data("homeassistant", fixture_name, file_type="json") + return self.webhook_fixture_data("homeassistant", fixture_name, file_type="json") diff --git a/zerver/webhooks/insping/tests.py b/zerver/webhooks/insping/tests.py index e33bd56cd7..f237270bf7 100644 --- a/zerver/webhooks/insping/tests.py +++ b/zerver/webhooks/insping/tests.py @@ -32,4 +32,4 @@ class InspingHookTests(WebhookTestCase): content_type="application/x-www-form-urlencoded") def get_body(self, fixture_name: Text) -> Text: - return self.fixture_data("insping", fixture_name, file_type="json") + return self.webhook_fixture_data("insping", fixture_name, file_type="json") diff --git a/zerver/webhooks/intercom/tests.py b/zerver/webhooks/intercom/tests.py index be7926aa30..d8c0e680fe 100644 --- a/zerver/webhooks/intercom/tests.py +++ b/zerver/webhooks/intercom/tests.py @@ -18,4 +18,4 @@ class IntercomWebHookTests(WebhookTestCase): content_type="application/x-www-form-urlencoded") def get_body(self, fixture_name: Text) -> Text: - return self.fixture_data('intercom', fixture_name, file_type="json") + return self.webhook_fixture_data('intercom', fixture_name, file_type="json") diff --git a/zerver/webhooks/jira/tests.py b/zerver/webhooks/jira/tests.py index 0fba9e51c6..9ca11c70c9 100644 --- a/zerver/webhooks/jira/tests.py +++ b/zerver/webhooks/jira/tests.py @@ -120,4 +120,4 @@ Adding a comment. Oh, what a comment it is!""" self.send_and_test_stream_message('change_status_v2', expected_subject, expected_message) def get_body(self, fixture_name: Text) -> Text: - return self.fixture_data('jira', fixture_name) + return self.webhook_fixture_data('jira', fixture_name) diff --git a/zerver/webhooks/librato/tests.py b/zerver/webhooks/librato/tests.py index ec74eefbe3..5cb518f015 100644 --- a/zerver/webhooks/librato/tests.py +++ b/zerver/webhooks/librato/tests.py @@ -12,8 +12,8 @@ class LibratoHookTests(WebhookTestCase): def get_body(self, fixture_name: Text) -> Text: if self.IS_ATTACHMENT: - return self.fixture_data("librato", fixture_name, file_type='json') - return urllib.parse.urlencode({'payload': self.fixture_data("librato", fixture_name, file_type='json')}) + return self.webhook_fixture_data("librato", fixture_name, file_type='json') + return urllib.parse.urlencode({'payload': self.webhook_fixture_data("librato", fixture_name, file_type='json')}) def test_alert_message_with_default_topic(self) -> None: expected_subject = 'Alert alert.name' diff --git a/zerver/webhooks/mention/tests.py b/zerver/webhooks/mention/tests.py index e9229d19ef..a6b91bb8c3 100644 --- a/zerver/webhooks/mention/tests.py +++ b/zerver/webhooks/mention/tests.py @@ -22,4 +22,4 @@ class MentionHookTests(WebhookTestCase): content_type="application/x-www-form-urlencoded") def get_body(self, fixture_name: Text) -> Text: - return self.fixture_data("mention", fixture_name, file_type="json") + return self.webhook_fixture_data("mention", fixture_name, file_type="json") diff --git a/zerver/webhooks/newrelic/tests.py b/zerver/webhooks/newrelic/tests.py index af3c7d6207..364fc22a88 100644 --- a/zerver/webhooks/newrelic/tests.py +++ b/zerver/webhooks/newrelic/tests.py @@ -23,4 +23,4 @@ Description sent via curl\n\nChangelog string' content_type="application/x-www-form-urlencoded") def get_body(self, fixture_name: Text) -> Text: - return self.fixture_data("newrelic", fixture_name, file_type="txt") + return self.webhook_fixture_data("newrelic", fixture_name, file_type="txt") diff --git a/zerver/webhooks/opsgenie/tests.py b/zerver/webhooks/opsgenie/tests.py index 01293895f4..d40a57734d 100644 --- a/zerver/webhooks/opsgenie/tests.py +++ b/zerver/webhooks/opsgenie/tests.py @@ -153,4 +153,4 @@ class OpsGenieHookTests(WebhookTestCase): content_type="application/x-www-form-urlencoded") def get_body(self, fixture_name: Text) -> Text: - return self.fixture_data("opsgenie", fixture_name, file_type="json") + return self.webhook_fixture_data("opsgenie", fixture_name, file_type="json") diff --git a/zerver/webhooks/papertrail/tests.py b/zerver/webhooks/papertrail/tests.py index 0156c31527..fdd0053415 100644 --- a/zerver/webhooks/papertrail/tests.py +++ b/zerver/webhooks/papertrail/tests.py @@ -41,4 +41,4 @@ May 18 20:30:02 abc cron OR server1: content_type="application/x-www-form-urlencoded") def get_body(self, fixture_name: Text) -> Text: - return self.fixture_data("papertrail", fixture_name, file_type="json") + return self.webhook_fixture_data("papertrail", fixture_name, file_type="json") diff --git a/zerver/webhooks/pivotal/tests.py b/zerver/webhooks/pivotal/tests.py index 0f54b7f72d..e3f6952ee3 100644 --- a/zerver/webhooks/pivotal/tests.py +++ b/zerver/webhooks/pivotal/tests.py @@ -70,7 +70,7 @@ class PivotalV3HookTests(WebhookTestCase): self.send_and_test_stream_message('type_changed', expected_subject, expected_message, content_type="application/xml") def get_body(self, fixture_name: Text) -> Text: - return self.fixture_data('pivotal', fixture_name, file_type='xml') + return self.webhook_fixture_data('pivotal', fixture_name, file_type='xml') class PivotalV5HookTests(WebhookTestCase): STREAM_NAME = 'pivotal' @@ -146,4 +146,4 @@ Try again next time self.send_and_test_stream_message('type_changed', expected_subject, expected_message, content_type="application/xml") def get_body(self, fixture_name: Text) -> Text: - return self.fixture_data('pivotal', "v5_{}".format(fixture_name), file_type='json') + return self.webhook_fixture_data('pivotal', "v5_{}".format(fixture_name), file_type='json') diff --git a/zerver/webhooks/raygun/tests.py b/zerver/webhooks/raygun/tests.py index 2539c5f56f..938fb8587a 100644 --- a/zerver/webhooks/raygun/tests.py +++ b/zerver/webhooks/raygun/tests.py @@ -164,4 +164,4 @@ class RaygunHookTests(WebhookTestCase): "application/x-www-form-urlencoded") def get_body(self, fixture_name: Text) -> Text: - return self.fixture_data("raygun", fixture_name, file_type="json") + return self.webhook_fixture_data("raygun", fixture_name, file_type="json") diff --git a/zerver/webhooks/semaphore/tests.py b/zerver/webhooks/semaphore/tests.py index c3223d90cf..0876a3282c 100644 --- a/zerver/webhooks/semaphore/tests.py +++ b/zerver/webhooks/semaphore/tests.py @@ -26,4 +26,4 @@ class SemaphoreHookTests(WebhookTestCase): content_type="application/x-www-form-urlencoded") def get_body(self, fixture_name: Text) -> Text: - return self.fixture_data("semaphore", fixture_name, file_type="json") + return self.webhook_fixture_data("semaphore", fixture_name, file_type="json") diff --git a/zerver/webhooks/slack/tests.py b/zerver/webhooks/slack/tests.py index 3b472f3270..e581e70821 100644 --- a/zerver/webhooks/slack/tests.py +++ b/zerver/webhooks/slack/tests.py @@ -52,4 +52,4 @@ class SlackWebhookTests(WebhookTestCase): def get_body(self, fixture_name: str) -> str: - return self.fixture_data("slack", fixture_name, file_type="txt") + return self.webhook_fixture_data("slack", fixture_name, file_type="txt") diff --git a/zerver/webhooks/solano/tests.py b/zerver/webhooks/solano/tests.py index 6be6414078..cfac49b878 100644 --- a/zerver/webhooks/solano/tests.py +++ b/zerver/webhooks/solano/tests.py @@ -58,4 +58,4 @@ class SolanoHookTests(WebhookTestCase): content_type="application/x-www-form-urlencoded") def get_body(self, fixture_name: Text) -> Text: - return self.fixture_data(self.FIXTURE_DIR_NAME, fixture_name, file_type="json") + return self.webhook_fixture_data(self.FIXTURE_DIR_NAME, fixture_name, file_type="json") diff --git a/zerver/webhooks/splunk/tests.py b/zerver/webhooks/splunk/tests.py index 20953ce1b6..78b150bff8 100644 --- a/zerver/webhooks/splunk/tests.py +++ b/zerver/webhooks/splunk/tests.py @@ -105,4 +105,4 @@ class SplunkHookTests(WebhookTestCase): content_type="application/x-www-form-urlencoded") def get_body(self, fixture_name: Text) -> Text: - return self.fixture_data("splunk", fixture_name, file_type="json") + return self.webhook_fixture_data("splunk", fixture_name, file_type="json") diff --git a/zerver/webhooks/statuspage/tests.py b/zerver/webhooks/statuspage/tests.py index 4f870570cc..c5e80bdd9b 100644 --- a/zerver/webhooks/statuspage/tests.py +++ b/zerver/webhooks/statuspage/tests.py @@ -35,4 +35,4 @@ from **operational** to **under_maintenance**" content_type="application/x-www-form-urlencoded") def get_body(self, fixture_name: Text) -> Text: - return self.fixture_data("statuspage", fixture_name, file_type="json") + return self.webhook_fixture_data("statuspage", fixture_name, file_type="json") diff --git a/zerver/webhooks/stripe/tests.py b/zerver/webhooks/stripe/tests.py index 0264662617..08d4d7f956 100644 --- a/zerver/webhooks/stripe/tests.py +++ b/zerver/webhooks/stripe/tests.py @@ -142,4 +142,4 @@ class StripeHookTests(WebhookTestCase): content_type="application/x-www-form-urlencoded") def get_body(self, fixture_name: Text) -> Text: - return self.fixture_data("stripe", fixture_name, file_type="json") + return self.webhook_fixture_data("stripe", fixture_name, file_type="json") diff --git a/zerver/webhooks/teamcity/tests.py b/zerver/webhooks/teamcity/tests.py index 932fdef883..f23a049828 100644 --- a/zerver/webhooks/teamcity/tests.py +++ b/zerver/webhooks/teamcity/tests.py @@ -28,7 +28,7 @@ class TeamcityHookTests(WebhookTestCase): def test_teamcity_personal(self) -> None: expected_message = u"Your personal build of Project :: Compile build 5535 - CL 123456 is broken with status Exit code 1 (new)! :thumbs_down:\nDetails: [changes](http://teamcity/viewLog.html?buildTypeId=Project_Compile&buildId=19952&tab=buildChangesDiv), [build log](http://teamcity/viewLog.html?buildTypeId=Project_Compile&buildId=19952)" - payload = ujson.dumps(ujson.loads(self.fixture_data(self.FIXTURE_DIR_NAME, 'personal'))) + payload = ujson.dumps(ujson.loads(self.webhook_fixture_data(self.FIXTURE_DIR_NAME, 'personal'))) self.client_post(self.url, payload, content_type="application/json") msg = self.get_last_message() diff --git a/zerver/webhooks/travis/tests.py b/zerver/webhooks/travis/tests.py index f45af6e593..e05f6c9d9a 100644 --- a/zerver/webhooks/travis/tests.py +++ b/zerver/webhooks/travis/tests.py @@ -56,4 +56,4 @@ class TravisHookTests(WebhookTestCase): ) def get_body(self, fixture_name: Text) -> Text: - return urllib.parse.urlencode({'payload': self.fixture_data("travis", fixture_name, file_type="json")}) + return urllib.parse.urlencode({'payload': self.webhook_fixture_data("travis", fixture_name, file_type="json")}) diff --git a/zerver/webhooks/wordpress/tests.py b/zerver/webhooks/wordpress/tests.py index c8c3ea5995..e04ab3795c 100644 --- a/zerver/webhooks/wordpress/tests.py +++ b/zerver/webhooks/wordpress/tests.py @@ -89,4 +89,4 @@ class WordPressHookTests(WebhookTestCase): self.assert_json_error(result, "Unknown WordPress webhook action: WordPress Action") def get_body(self, fixture_name: str) -> str: - return self.fixture_data("wordpress", fixture_name, file_type="txt") + return self.webhook_fixture_data("wordpress", fixture_name, file_type="txt")