CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-06-24 21:08:25 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

urls: Use POST for zerver.views.realm_emoji.upload_emoji.

Browse Source 
The upload_emoji endpoint is changed from PUT to POST because
this endpoint is not idempotent.
This commit is contained in:
Vishnu Ks 2017-07-05 22:43:11 +05:30 committed by Tim Abbott
parent cf2dec539f
commit df5df76961
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
static/js/settings_emoji.js
View File

@ -91,7 +91,7 @@ exports.set_up = function () {
$.each($('#emoji_file_input')[0].files, function (i, file) {
formData.append('file-' + i, file);
});
channel.put({
channel.post({
url: "/json/realm/emoji/" + encodeURIComponent(emoji.name),
data: formData,
cache: false,

6
zerver/tests/test_reactions.py
View File

@ -50,7 +50,7 @@ class ReactionEmojiTest(ZulipTestCase):
self.login(email)
with get_test_image_file('img.png') as fp1:
emoji_data = {'f1': fp1}
result = self.client_put_multipart('/json/realm/emoji/my_emoji', info=emoji_data)
result = self.client_post('/json/realm/emoji/my_emoji', info=emoji_data)
self.assert_json_success(result)
emoji = RealmEmoji.objects.get(name="my_emoji")
emoji.deactivated = True
@ -119,8 +119,8 @@ class ReactionEmojiTest(ZulipTestCase):
emoji_name = 'my_emoji'
with get_test_image_file('img.png') as fp1:
emoji_data = {'f1': fp1}
result = self.client_put_multipart('/json/realm/emoji/my_emoji', info=emoji_data,
**self.api_auth(sender))
result = self.client_post('/json/realm/emoji/my_emoji', info=emoji_data,
**self.api_auth(sender))
self.assert_json_success(result)
self.assertEqual(200, result.status_code)

16
zerver/tests/test_realm_emoji.py
View File

@ -53,7 +53,7 @@ class RealmEmojiTest(ZulipTestCase):
self.login(email)
with get_test_image_file('img.png') as fp1:
emoji_data = {'f1': fp1}
result = self.client_put_multipart('/json/realm/emoji/my_emoji', info=emoji_data)
result = self.client_post('/json/realm/emoji/my_emoji', info=emoji_data)
self.assert_json_success(result)
self.assertEqual(200, result.status_code)
emoji = RealmEmoji.objects.get(name="my_emoji")
@ -79,7 +79,7 @@ class RealmEmojiTest(ZulipTestCase):
self.login(email)
with get_test_image_file('img.png') as fp1:
emoji_data = {'f1': fp1}
result = self.client_put_multipart('/json/realm/emoji/my_em*oji', info=emoji_data)
result = self.client_post('/json/realm/emoji/my_em*oji', info=emoji_data)
self.assert_json_error(result, 'Invalid characters in emoji name')
def test_upload_uppercase_exception(self):
@ -88,7 +88,7 @@ class RealmEmojiTest(ZulipTestCase):
self.login(email)
with get_test_image_file('img.png') as fp1:
emoji_data = {'f1': fp1}
result = self.client_put_multipart('/json/realm/emoji/my_EMoji', info=emoji_data)
result = self.client_post('/json/realm/emoji/my_EMoji', info=emoji_data)
self.assert_json_error(result, 'Invalid characters in emoji name')
def test_upload_admins_only(self):
@ -100,7 +100,7 @@ class RealmEmojiTest(ZulipTestCase):
realm.save()
with get_test_image_file('img.png') as fp1:
emoji_data = {'f1': fp1}
result = self.client_put_multipart('/json/realm/emoji/my_emoji', info=emoji_data)
result = self.client_post('/json/realm/emoji/my_emoji', info=emoji_data)
self.assert_json_error(result, 'Must be a realm administrator')
def test_delete(self):
@ -169,7 +169,7 @@ class RealmEmojiTest(ZulipTestCase):
email = self.example_email('iago')
self.login(email)
with get_test_image_file('img.png') as fp1, get_test_image_file('img.png') as fp2:
result = self.client_put_multipart('/json/realm/emoji/my_emoji', {'f1': fp1, 'f2': fp2})
result = self.client_post('/json/realm/emoji/my_emoji', {'f1': fp1, 'f2': fp2})
self.assert_json_error(result, 'You must upload exactly one file.')
def test_emoji_upload_file_size_error(self):
@ -178,7 +178,7 @@ class RealmEmojiTest(ZulipTestCase):
self.login(email)
with get_test_image_file('img.png') as fp:
with self.settings(MAX_EMOJI_FILE_SIZE=0):
result = self.client_put_multipart('/json/realm/emoji/my_emoji', {'file': fp})
result = self.client_post('/json/realm/emoji/my_emoji', {'file': fp})
self.assert_json_error(result, 'Uploaded file is larger than the allowed limit of 0 MB')
def test_upload_already_existed_emoji(self):
@ -187,8 +187,8 @@ class RealmEmojiTest(ZulipTestCase):
self.login(email)
with get_test_image_file('img.png') as fp1:
emoji_data = {'f1': fp1}
self.client_put_multipart('/json/realm/emoji/my_emoji', info=emoji_data)
self.client_post('/json/realm/emoji/my_emoji', info=emoji_data)
with get_test_image_file('img.png') as fp1:
emoji_data = {'f1': fp1}
result = self.client_put_multipart('/json/realm/emoji/my_emoji', info=emoji_data)
result = self.client_post('/json/realm/emoji/my_emoji', info=emoji_data)
self.assert_json_error(result, 'Realm emoji with this Realm and Name already exists.')

2
zproject/urls.py
View File

@ -191,7 +191,7 @@ v1_api_and_json_patterns = [
url(r'^realm/emoji$', rest_dispatch,
{'GET': 'zerver.views.realm_emoji.list_emoji'}),
url(r'^realm/emoji/(?P<emoji_name>.*)$', rest_dispatch,
{'PUT': 'zerver.views.realm_emoji.upload_emoji',
{'POST': 'zerver.views.realm_emoji.upload_emoji',
'DELETE': 'zerver.views.realm_emoji.delete_emoji'}),
# realm/icon -> zerver.views.realm_icon