paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 22:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

webhook: Rename FIXTURE_DIR_NAME to WEBHOOK_DIR_NAME.

Browse Source 
Since FIXTURE_DIR_NAME is the name of the folder that contains the view
and tests modules of the webhook and another folder called "fixtures" that
store the fixtures, it is more appropriate to call it WEBHOOK_DIR_NAME,
especially when we want to refer to the view module using this variable.
This commit is contained in:
PIG208
2021-06-26 15:18:33 +08:00
committed by Tim Abbott
parent b720e10d88
commit 5ecbfecd77
81 changed files with 89 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
zerver/lib/test_classes.py
View File

@@ -1374,7 +1374,7 @@ class WebhookTestCase(ZulipTestCase):
STREAM_NAME: Optional[str] = None
TEST_USER_EMAIL = "webhook-bot@zulip.com"
URL_TEMPLATE: str
FIXTURE_DIR_NAME: Optional[str] = None
WEBHOOK_DIR_NAME: Optional[str] = None
@property
def test_user(self) -> UserProfile:
@@ -1420,8 +1420,8 @@ class WebhookTestCase(ZulipTestCase):
payload = self.get_payload(fixture_name)
if content_type is not None:
kwargs["content_type"] = content_type
if self.FIXTURE_DIR_NAME is not None:
headers = get_fixture_http_headers(self.FIXTURE_DIR_NAME, fixture_name)
if self.WEBHOOK_DIR_NAME is not None:
headers = get_fixture_http_headers(self.WEBHOOK_DIR_NAME, fixture_name)
headers = standardize_headers(headers)
kwargs.update(headers)
@@ -1467,8 +1467,8 @@ class WebhookTestCase(ZulipTestCase):
payload = self.get_payload(fixture_name)
kwargs["content_type"] = content_type
if self.FIXTURE_DIR_NAME is not None:
headers = get_fixture_http_headers(self.FIXTURE_DIR_NAME, fixture_name)
if self.WEBHOOK_DIR_NAME is not None:
headers = get_fixture_http_headers(self.WEBHOOK_DIR_NAME, fixture_name)
headers = standardize_headers(headers)
kwargs.update(headers)
# The sender profile shouldn't be passed any further in kwargs, so we pop it.
@@ -1512,8 +1512,8 @@ class WebhookTestCase(ZulipTestCase):
return self.get_body(fixture_name)
def get_body(self, fixture_name: str) -> str:
assert self.FIXTURE_DIR_NAME is not None
body = self.webhook_fixture_data(self.FIXTURE_DIR_NAME, fixture_name)
assert self.WEBHOOK_DIR_NAME is not None
body = self.webhook_fixture_data(self.WEBHOOK_DIR_NAME, fixture_name)
# fail fast if we don't have valid json
orjson.loads(body)
return body