paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-16 11:52:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Add assert_url_serves_contents_of_file() to ZulipTestCase

Browse Source 
Add `assert_url_serves_contents_of_file()` in `ZulipTestCase` class
and deduplicate some codes.

Fixes #1276.
This commit is contained in:
Rafid Aslam
2016-12-19 22:17:19 +07:00
committed by showell
parent 64f595b061
commit 5cc8838df4
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zerver/lib/test_classes.py
View File

@@ -273,6 +273,12 @@ class ZulipTestCase(TestCase):
return [subscription.user_profile for subscription in subscriptions] return [subscription.user_profile for subscription in subscriptions]
def assert_url_serves_contents_of_file(self, url, result):
# type: (str, bytes) -> None
response = self.client_get(url)
data = b"".join(response.streaming_content)
self.assertEquals(result, data)
def assert_json_success(self, result): def assert_json_success(self, result):
# type: (HttpResponse) -> Dict[str, Any] # type: (HttpResponse) -> Dict[str, Any]
""" """

8
zerver/tests/test_upload.py
View File

@@ -74,9 +74,7 @@ class FileUploadTest(ZulipTestCase):
# Files uploaded through the API should be accesible via the web client # Files uploaded through the API should be accesible via the web client
self.login("hamlet@zulip.com") self.login("hamlet@zulip.com")
response = self.client_get(uri) self.assert_url_serves_contents_of_file(uri, b"zulip!")
data = b"".join(response.streaming_content)
self.assertEqual(b"zulip!", data)
def test_file_too_big_failure(self): def test_file_too_big_failure(self):
# type: () -> None # type: () -> None
@@ -171,9 +169,7 @@ class FileUploadTest(ZulipTestCase):
# In the future, local file requests will follow the same style as S3 # In the future, local file requests will follow the same style as S3
# requests; they will be first authenthicated and redirected # requests; they will be first authenthicated and redirected
response = self.client_get(uri) self.assert_url_serves_contents_of_file(uri, b"zulip!")
data = b"".join(response.streaming_content)
self.assertEqual(b"zulip!", data)
# check if DB has attachment marked as unclaimed # check if DB has attachment marked as unclaimed
entry = Attachment.objects.get(file_name='zulip.txt') entry = Attachment.objects.get(file_name='zulip.txt')