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

test_upload: Fix some URLs to uploaded files.

Browse Source 
Using http://localhost:9991 is incorrect - e.g. messages sent with file
urls constructed trigger do_claim_attachments to be called with empty
list in potential_path_ids.

realm.host should be used in all these places, like in the other tests
in the file.
This commit is contained in:
Mateusz Mandera
2022-05-18 21:31:18 +02:00
committed by Tim Abbott
parent 72166f1b03
commit 5ff4754090
1 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
zerver/tests/test_upload.py
View File

@@ -220,9 +220,10 @@ class FileUploadTest(UploadSerializeMixin, ZulipTestCase):
entry = Attachment.objects.get(file_name="zulip.txt") entry = Attachment.objects.get(file_name="zulip.txt")
self.assertEqual(entry.is_claimed(), False) self.assertEqual(entry.is_claimed(), False)
self.subscribe(self.example_user("hamlet"), "Denmark") hamlet = self.example_user("hamlet")
body = "First message ...[zulip.txt](http://localhost:9991" + uri + ")" self.subscribe(hamlet, "Denmark")
self.send_stream_message(self.example_user("hamlet"), "Denmark", body, "test") body = f"First message ...[zulip.txt]({hamlet.realm.host}{uri})"
self.send_stream_message(hamlet, "Denmark", body, "test")
# Now try the endpoint that's supposed to return a temporary URL for access # Now try the endpoint that's supposed to return a temporary URL for access
# to the file. # to the file.
@@ -363,7 +364,7 @@ class FileUploadTest(UploadSerializeMixin, ZulipTestCase):
hamlet = self.example_user("hamlet") hamlet = self.example_user("hamlet")
self.login_user(hamlet) self.login_user(hamlet)
response = self.client_get( response = self.client_get(
f"http://localhost:9991/user_uploads/{hamlet.realm_id}/ff/gg/abc.py" f"http://{hamlet.realm.host}/user_uploads/{hamlet.realm_id}/ff/gg/abc.py"
) )
self.assertEqual(response.status_code, 404) self.assertEqual(response.status_code, 404)
self.assert_in_response("File not found.", response) self.assert_in_response("File not found.", response)
@@ -391,11 +392,14 @@ class FileUploadTest(UploadSerializeMixin, ZulipTestCase):
d2_attachment.save() d2_attachment.save()
# Send message referring only dummy_1 # Send message referring only dummy_1
self.subscribe(self.example_user("hamlet"), "Denmark") hamlet = self.example_user("hamlet")
self.subscribe(hamlet, "Denmark")
body = ( body = (
"Some files here ...[zulip.txt](http://localhost:9991/user_uploads/" + d1_path_id + ")" f"Some files here ...[zulip.txt](http://{hamlet.realm.host}/user_uploads/"
+ d1_path_id
+ ")"
) )
self.send_stream_message(self.example_user("hamlet"), "Denmark", body, "test") self.send_stream_message(hamlet, "Denmark", body, "test")
# dummy_2 should not exist in database or the uploads folder # dummy_2 should not exist in database or the uploads folder
do_delete_old_unclaimed_attachments(2) do_delete_old_unclaimed_attachments(2)
@@ -410,9 +414,21 @@ class FileUploadTest(UploadSerializeMixin, ZulipTestCase):
def test_attachment_url_without_upload(self) -> None: def test_attachment_url_without_upload(self) -> None:
hamlet = self.example_user("hamlet") hamlet = self.example_user("hamlet")
self.login_user(hamlet) self.login_user(hamlet)
body = f"Test message ...[zulip.txt](http://localhost:9991/user_uploads/{hamlet.realm_id}/64/fake_path_id.txt)" with self.assertLogs(level="WARNING") as warn_log:
self.send_stream_message(self.example_user("hamlet"), "Denmark", body, "test") body = f"Test message ...[zulip.txt](http://{hamlet.realm.host}/user_uploads/{hamlet.realm_id}/64/fake_path_id.txt)"
self.assertFalse(Attachment.objects.filter(path_id="1/64/fake_path_id.txt").exists()) message_id = self.send_stream_message(
self.example_user("hamlet"), "Denmark", body, "test"
)
self.assertFalse(
Attachment.objects.filter(path_id=f"{hamlet.realm_id}/64/fake_path_id.txt").exists()
)
self.assertEqual(
warn_log.output,
[
f"WARNING:root:User {hamlet.id} tried to share upload {hamlet.realm_id}/64/fake_path_id.txt in message {message_id}, but lacks permission"
],
)
def test_multiple_claim_attachments(self) -> None: def test_multiple_claim_attachments(self) -> None:
""" """
@@ -1932,7 +1948,7 @@ class S3Test(ZulipTestCase):
self.assert_length(b"zulip!", uploaded_file.size) self.assert_length(b"zulip!", uploaded_file.size)
self.subscribe(self.example_user("hamlet"), "Denmark") self.subscribe(self.example_user("hamlet"), "Denmark")
body = "First message ...[zulip.txt](http://localhost:9991" + uri + ")" body = f"First message ...[zulip.txt](http://{user_profile.realm.host}{uri})"
self.send_stream_message(self.example_user("hamlet"), "Denmark", body, "test") self.send_stream_message(self.example_user("hamlet"), "Denmark", body, "test")
@use_s3_backend @use_s3_backend
@@ -2038,9 +2054,10 @@ class S3Test(ZulipTestCase):
# second (resulting in the same timestamp+signature), # second (resulting in the same timestamp+signature),
# url_only_url may or may not equal redirect_url. # url_only_url may or may not equal redirect_url.
self.subscribe(self.example_user("hamlet"), "Denmark") hamlet = self.example_user("hamlet")
body = "First message ...[zulip.txt](http://localhost:9991" + uri + ")" self.subscribe(hamlet, "Denmark")
self.send_stream_message(self.example_user("hamlet"), "Denmark", body, "test") body = f"First message ...[zulip.txt](http://{hamlet.realm.host}" + uri + ")"
self.send_stream_message(hamlet, "Denmark", body, "test")
@use_s3_backend @use_s3_backend
def test_upload_avatar_image(self) -> None: def test_upload_avatar_image(self) -> None: