Skip to content

Sync #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TommyLemon merged 4 commits into from
Oct 22, 2019
Merged

Sync #42

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bb4eeb0
tests: add 15 tests for apijson_put
zhangchunlin Oct 22, 2019
6f8cade
apison_post: modify to be same with original apijson, just return "id…
zhangchunlin Oct 22, 2019
8a266cf
tests: add 11 tests for apijson_delete
zhangchunlin Oct 22, 2019
1b303bf
bump version to 0.2.1; update CHANGELOG
zhangchunlin Oct 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
tests: add 11 tests for apijson_delete
  • Loading branch information
@zhangchunlin
zhangchunlin committed Oct 22, 2019
commit 8a266cf0e216ade14bfb3f7f3e67da107b7db54d
2 changes: 1 addition & 1 deletion tests/demo/apps/apijson_demo/settings.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ publicnotice = {
"HEAD" : { "roles" : ["OWNER","LOGIN","ADMIN","UNKNOWN"] },
"POST" : { "roles" : ["OWNER","ADMIN"] },
"PUT" : { "roles" : ["OWNER","ADMIN","UNKNOWN"] },
"DELETE" : { "roles" : ["OWNER","ADMIN"] },
"DELETE" : { "roles" : ["OWNER","ADMIN","UNKNOWN"] },
}

[APIJSON_REQUESTS]
Expand Down
194 changes: 190 additions & 4 deletions tests/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,17 @@
from uliweb import manage
from uliweb.manage import make_simple_application
from json import loads as json_loads
from nose import with_setup

os.chdir('demo')
def setup():
os.chdir('demo')

manage.call('uliweb syncdb -v')
manage.call('uliweb reset -v -y')
manage.call('uliweb dbinit -v')
manage.call('uliweb syncdb -v')
manage.call('uliweb reset -v -y')
manage.call('uliweb dbinit -v')

def teardown():
pass

def pre_call_as(username):
from uliweb import models
Expand All @@ -17,6 +22,7 @@ def pre_call(request):
request.user = user
return pre_call

@with_setup(setup,teardown)
def test_apijson_get():
"""
>>> application = make_simple_application(project_dir='.')
Expand Down Expand Up @@ -1233,3 +1239,183 @@ def test_apijson_put():
>>> print(d)
{'code': 400, 'msg': 'failed when updating, maybe no change', 'moment': {'id': 1, 'code': 400, 'msg': 'failed when updating, maybe no change', 'count': 0}}
"""

def test_apijson_delete():
"""
>>> application = make_simple_application(project_dir='.')
>>> handler = application.handler()

>>> #apijson delete
>>> data ='''{
... "moment": {
... "id": 1
... },
... "@tag": "moment"
... }'''
>>> r = handler.post('/apijson/delete', data=data, pre_call=pre_call_as("usera"), middlewares=[])
>>> d = json_loads(r.data)
>>> print(d)
{'code': 200, 'msg': 'success', 'moment': {'id': 1, 'code': 200, 'message': 'success', 'count': 1}}
>>> data ='''{
... "moment": {
... "id": 1
... }
... }'''
>>> r = handler.post('/apijson/get', data=data, pre_call=pre_call_as("usera"), middlewares=[])
>>> d = json_loads(r.data)
>>> print(d)
{'code': 200, 'msg': 'success', 'moment': None}

>>> #apijson delete, without @tag
>>> data ='''{
... "moment": {
... "content": "new moment for test"
... },
... "@tag": "moment"
... }'''
>>> r = handler.post('/apijson/post', data=data, pre_call=pre_call_as("usera"), middlewares=[])
>>> d = json_loads(r.data)
>>> data ='''{
... "moment": {
... "id": %s
... }
... }'''%(d["moment"]["id"])
>>> r = handler.post('/apijson/delete', data=data, pre_call=pre_call_as("usera"), middlewares=[])
>>> d = json_loads(r.data)
>>> print(d)
{'code': 400, 'msg': "'tag' parameter is needed"}

>>> #apijson delete, with non exist model
>>> data ='''{
... "nonexist": {
... "id": 1
... },
... "@tag": "nonexist"
... }'''
>>> r = handler.post('/apijson/delete', data=data, pre_call=pre_call_as("usera"), middlewares=[])
>>> d = json_loads(r.data)
>>> print(d)
{'code': 400, 'msg': "model 'nonexist' not found"}

>>> #apijson delete, default to OWNER and delete other's record
>>> data ='''{
... "moment": {
... "id": 2
... },
... "@tag": "moment"
... }'''
>>> r = handler.post('/apijson/delete', data=data, pre_call=pre_call_as("usera"), middlewares=[])
>>> d = json_loads(r.data)
>>> print(d)
{'code': 400, 'msg': 'no permission'}

>>> #apijson delete, without id
>>> data ='''{
... "moment": {
... },
... "@tag": "moment"
... }'''
>>> r = handler.post('/apijson/delete', data=data, pre_call=pre_call_as("usera"), middlewares=[])
>>> d = json_loads(r.data)
>>> print(d)
{'code': 400, 'msg': 'id param needed'}

>>> #apijson delete, id not int
>>> data ='''{
... "moment": {
... "id": "abc"
... },
... "@tag": "moment"
... }'''
>>> r = handler.post('/apijson/delete', data=data, pre_call=pre_call_as("usera"), middlewares=[])
>>> d = json_loads(r.data)
>>> print(d)
{'code': 400, 'msg': "id 'abc' cannot convert to integer"}

>>> #apijson delete
>>> data ='''{
... "moment": {
... "id": 100
... },
... "@tag": "moment"
... }'''
>>> r = handler.post('/apijson/delete', data=data, pre_call=pre_call_as("usera"), middlewares=[])
>>> d = json_loads(r.data)
>>> print(d)
{'code': 400, 'msg': "cannot find record id = '100'"}

>>> #apijson delete, with a role having no permission
>>> data ='''{
... "moment": {
... "content": "new moment for test"
... },
... "@tag": "moment"
... }'''
>>> r = handler.post('/apijson/post', data=data, pre_call=pre_call_as("usera"), middlewares=[])
>>> d = json_loads(r.data)
>>> data ='''{
... "moment": {
... "@role": "UNKNOWN",
... "id": %s
... },
... "@tag": "moment"
... }'''%(d["moment"]["id"])
>>> r = handler.post('/apijson/delete', data=data, pre_call=pre_call_as("usera"), middlewares=[])
>>> d = json_loads(r.data)
>>> print(d)
{'code': 400, 'msg': "'moment' not accessible by role 'UNKNOWN'"}

>>> #apijson delete, with OWNER but not login
>>> data ='''{
... "moment": {
... "content": "new moment for test"
... },
... "@tag": "moment"
... }'''
>>> r = handler.post('/apijson/post', data=data, pre_call=pre_call_as("usera"), middlewares=[])
>>> d = json_loads(r.data)
>>> data ='''{
... "moment": {
... "id": %s
... },
... "@tag": "moment"
... }'''%(d["moment"]["id"])
>>> r = handler.post('/apijson/delete', data=data, middlewares=[])
>>> d = json_loads(r.data)
>>> print(d)
{'code': 400, 'msg': 'need login user'}

>>> #apijson delete, with UNKNOWN role
>>> data ='''{
... "publicnotice": {
... "@role": "UNKNOWN",
... "id": 1
... },
... "@tag": "publicnotice"
... }'''
>>> r = handler.post('/apijson/delete', data=data, middlewares=[])
>>> d = json_loads(r.data)
>>> print(d)
{'code': 200, 'msg': 'success', 'publicnotice': {'id': 1, 'code': 200, 'message': 'success', 'count': 1}}

>>> #apijson delete, with a role which have no permission
>>> data ='''{
... "moment": {
... "content": "new moment for test"
... },
... "@tag": "moment"
... }'''
>>> r = handler.post('/apijson/post', data=data, pre_call=pre_call_as("usera"), middlewares=[])
>>> d = json_loads(r.data)
>>> data ='''{
... "moment": {
... "@role": "superuser",
... "id": %s
... },
... "@tag": "moment"
... }'''%(d["moment"]["id"])
>>> r = handler.post('/apijson/delete', data=data, pre_call=pre_call_as("admin"), middlewares=[])
>>> d = json_loads(r.data)
>>> print(d)
{'code': 400, 'msg': "'moment' not accessible by role 'superuser'"}
"""
2 changes: 1 addition & 1 deletion uliweb_apijson/apijson/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ def _delete_one(self,key,tag):
return json({"code":400,"msg":"id '%s' cannot convert to integer"%(params.get("id"))})
obj = model.get(id_)
if not obj:
return json({"code":400,"msg":"cannot find record id '%s'"%(id_)})
return json({"code":400,"msg":"cannot find record id = '%s'"%(id_)})

permission_check_ok = False
DELETE = model_setting.get("DELETE")
Expand Down