arno/isso
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Return 200 with empty array when there are no comments #301 (#565)

Browse Source 
* Return 200 with empty array when there are no comments #301
{"id": null, "total_replies": 0, "hidden_replies": 0, "replies": []}
This commit is contained in:
tdro 2019-09-30 19:04:28 -04:00 committed by Jelmer Vernooij
parent 1f77ecc25e
commit f4b0376f1a
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
isso/tests/test_comments.py
View File

@ -159,10 +159,18 @@ class TestComments(unittest.TestCase):
def testGetInvalid(self): def testGetInvalid(self):
self.assertEqual(self.get('/?uri=%2Fpath%2F&id=123').status_code, 404) self.assertEqual(self.get('/?uri=%2Fpath%2F&id=123').status_code, 200)
data = loads(self.get('/?uri=%2Fpath%2F&id=123').data)
self.assertEqual(len(data['replies']), 0)
self.assertEqual( self.assertEqual(
self.get('/?uri=%2Fpath%2Fspam%2F&id=123').status_code, 404) self.get('/?uri=%2Fpath%2Fspam%2F&id=123').status_code, 200)
self.assertEqual(self.get('/?uri=?uri=%foo%2F').status_code, 404) data = loads(self.get('/?uri=%2Fpath%2Fspam%2F&id=123').data)
self.assertEqual(len(data['replies']), 0)
self.assertEqual(self.get('/?uri=?uri=%foo%2F').status_code, 200)
data = loads(self.get('/?uri=?uri=%foo%2F').data)
self.assertEqual(len(data['replies']), 0)
def testGetLimited(self): def testGetLimited(self):
@ -244,9 +252,12 @@ class TestComments(unittest.TestCase):
self.assertEqual(self.get('/?uri=%2Fpath%2F&id=2').status_code, 200) self.assertEqual(self.get('/?uri=%2Fpath%2F&id=2').status_code, 200)
r = client.delete('/id/2') r = client.delete('/id/2')
self.assertEqual(self.get('/?uri=%2Fpath%2F').status_code, 404) self.assertEqual(self.get('/?uri=%2Fpath%2F').status_code, 200)
self.assertNotIn('/path/', self.app.db.threads) self.assertNotIn('/path/', self.app.db.threads)
data = loads(client.get('/?uri=%2Fpath%2F').data)
self.assertEqual(len(data['replies']), 0)
def testDeleteWithMultipleReferences(self): def testDeleteWithMultipleReferences(self):
""" """
[ comment 1 ] [ comment 1 ]
@ -272,7 +283,10 @@ class TestComments(unittest.TestCase):
client.delete('/id/3') client.delete('/id/3')
self.assertEqual(self.get('/?uri=%2Fpath%2F').status_code, 200) self.assertEqual(self.get('/?uri=%2Fpath%2F').status_code, 200)
client.delete('/id/4') client.delete('/id/4')
self.assertEqual(self.get('/?uri=%2Fpath%2F').status_code, 404) self.assertEqual(self.get('/?uri=%2Fpath%2F').status_code, 200)
data = loads(client.get('/?uri=%2Fpath%2F').data)
self.assertEqual(len(data['replies']), 0)
def testPathVariations(self): def testPathVariations(self):
@ -465,7 +479,10 @@ class TestModeratedComments(unittest.TestCase):
self.assertEqual(rv.status_code, 202) self.assertEqual(rv.status_code, 202)
self.assertEqual(self.client.get('/id/1').status_code, 200) self.assertEqual(self.client.get('/id/1').status_code, 200)
self.assertEqual(self.client.get('/?uri=test').status_code, 404) self.assertEqual(self.client.get('/?uri=test').status_code, 200)
data = loads(self.client.get('/?uri=test').data)
self.assertEqual(len(data['replies']), 0)
self.app.db.comments.activate(1) self.app.db.comments.activate(1)
self.assertEqual(self.client.get('/?uri=test').status_code, 200) self.assertEqual(self.client.get('/?uri=test').status_code, 200)

2
isso/views/comments.py
View File

@ -769,8 +769,6 @@ class API(object):
root_list = [] root_list = []
else: else:
root_list = list(self.comments.fetch(**args)) root_list = list(self.comments.fetch(**args))
if not root_list:
raise NotFound
if root_id not in reply_counts: if root_id not in reply_counts:
reply_counts[root_id] = 0 reply_counts[root_id] = 0