Merge pull request #82 from dongweiming/fix-test

fix api delete statue_code

Author: halfcrazy

firefly/views/api/user.py

@@ -38,10 +38,7 @@ def delete(self, id):
                 .update_one(pull__following=user.to_dbref())
             User.objects(id=id) \
                 .update_one(pull__follower=current_user.to_dbref())
-            status_fields = generate_status_fields(OK)
-        else:
-            status_fields = generate_status_fields(NOTFOUND)
-        return status_fields, 200
+        return '', 204
 
 
 class BlockUserApi(Resource):
@@ -69,7 +66,4 @@ def delete(self, id):
         if id in current_user.blocked_user_id:
             User.objects(id=current_user.id) \
                 .update_one(pull__blocked_user_id=id)
-            status_fields = generate_status_fields(OK)
-        else:
-            status_fields = generate_status_fields(NOTFOUND)
-        return status_fields, 200
+        return '', 204

tests/test_user.py

@@ -1,5 +1,5 @@
-from __future__ import absolute_import
 # coding=utf-8
+from __future__ import absolute_import
 from flask import url_for
 from flask_login import current_user
 import pytest
@@ -51,8 +51,7 @@ def test_follow_user_api(self):
         # test unfollow
         url = url_for('api.followuserapi', id=self.users[1].id)
         rv = self.client.delete(url, buffered=True)
-        assert rv.status_code == 200
-        assert rv.json['status'] == OK
+        assert rv.status_code == 204
         self.users[0].reload()
         self.users[1].reload()
         assert self.users[0].following == []
@@ -72,7 +71,6 @@ def test_block_user_api(self):
         # test unblock
         url = url_for('api.blockuserapi', id=self.users[1].id)
         rv = self.client.delete(url, buffered=True)
-        assert rv.status_code == 200
-        assert rv.json['status'] == OK
+        assert rv.status_code == 204
         self.users[0].reload()
         assert self.users[0].following == []