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

tests: Add subdomain option to client_get and friends.

Browse Source 
This should help make it easy to set the domain explicitly in tests
where that's important.
This commit is contained in:
Tim Abbott
2017-08-25 15:02:02 -07:00
parent d449346bb5
commit b0c8404622
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
zerver/lib/test_classes.py
View File

@@ -109,6 +109,15 @@ class ZulipTestCase(TestCase):
''' '''
DEFAULT_REALM = Realm.objects.get(string_id='zulip') DEFAULT_REALM = Realm.objects.get(string_id='zulip')
def set_http_host(self, kwargs):
# type: (Dict[str, Any]) -> None
if 'subdomain' in kwargs:
if kwargs['subdomain'] != "":
kwargs["HTTP_HOST"] = "%s.%s" % (kwargs["subdomain"], settings.EXTERNAL_HOST)
else:
kwargs["HTTP_HOST"] = settings.EXTERNAL_HOST
del kwargs["subdomain"]
@instrument_url @instrument_url
def client_patch(self, url, info={}, **kwargs): def client_patch(self, url, info={}, **kwargs):
# type: (Text, Dict[str, Any], **Any) -> HttpResponse # type: (Text, Dict[str, Any], **Any) -> HttpResponse
@@ -117,6 +126,7 @@ class ZulipTestCase(TestCase):
""" """
encoded = urllib.parse.urlencode(info) encoded = urllib.parse.urlencode(info)
django_client = self.client # see WRAPPER_COMMENT django_client = self.client # see WRAPPER_COMMENT
self.set_http_host(kwargs)
return django_client.patch(url, encoded, **kwargs) return django_client.patch(url, encoded, **kwargs)
@instrument_url @instrument_url
@@ -132,6 +142,7 @@ class ZulipTestCase(TestCase):
""" """
encoded = encode_multipart(BOUNDARY, info) encoded = encode_multipart(BOUNDARY, info)
django_client = self.client # see WRAPPER_COMMENT django_client = self.client # see WRAPPER_COMMENT
self.set_http_host(kwargs)
return django_client.patch( return django_client.patch(
url, url,
encoded, encoded,
@@ -143,6 +154,7 @@ class ZulipTestCase(TestCase):
# type: (Text, Dict[str, Any], **Any) -> HttpResponse # type: (Text, Dict[str, Any], **Any) -> HttpResponse
encoded = urllib.parse.urlencode(info) encoded = urllib.parse.urlencode(info)
django_client = self.client # see WRAPPER_COMMENT django_client = self.client # see WRAPPER_COMMENT
self.set_http_host(kwargs)
return django_client.put(url, encoded, **kwargs) return django_client.put(url, encoded, **kwargs)
@instrument_url @instrument_url
@@ -150,6 +162,7 @@ class ZulipTestCase(TestCase):
# type: (Text, Dict[str, Any], **Any) -> HttpResponse # type: (Text, Dict[str, Any], **Any) -> HttpResponse
encoded = urllib.parse.urlencode(info) encoded = urllib.parse.urlencode(info)
django_client = self.client # see WRAPPER_COMMENT django_client = self.client # see WRAPPER_COMMENT
self.set_http_host(kwargs)
return django_client.delete(url, encoded, **kwargs) return django_client.delete(url, encoded, **kwargs)
@instrument_url @instrument_url
@@ -157,12 +170,14 @@ class ZulipTestCase(TestCase):
# type: (Text, Dict[str, Any], **Any) -> HttpResponse # type: (Text, Dict[str, Any], **Any) -> HttpResponse
encoded = urllib.parse.urlencode(info) encoded = urllib.parse.urlencode(info)
django_client = self.client # see WRAPPER_COMMENT django_client = self.client # see WRAPPER_COMMENT
self.set_http_host(kwargs)
return django_client.options(url, encoded, **kwargs) return django_client.options(url, encoded, **kwargs)
@instrument_url @instrument_url
def client_post(self, url, info={}, **kwargs): def client_post(self, url, info={}, **kwargs):
# type: (Text, Dict[str, Any], **Any) -> HttpResponse # type: (Text, Dict[str, Any], **Any) -> HttpResponse
django_client = self.client # see WRAPPER_COMMENT django_client = self.client # see WRAPPER_COMMENT
self.set_http_host(kwargs)
return django_client.post(url, info, **kwargs) return django_client.post(url, info, **kwargs)
@instrument_url @instrument_url
@@ -184,6 +199,7 @@ class ZulipTestCase(TestCase):
def client_get(self, url, info={}, **kwargs): def client_get(self, url, info={}, **kwargs):
# type: (Text, Dict[str, Any], **Any) -> HttpResponse # type: (Text, Dict[str, Any], **Any) -> HttpResponse
django_client = self.client # see WRAPPER_COMMENT django_client = self.client # see WRAPPER_COMMENT
self.set_http_host(kwargs)
return django_client.get(url, info, **kwargs) return django_client.get(url, info, **kwargs)
example_user_map = dict( example_user_map = dict(