x/wsme
Code Issues Proposed changes

Rename the body argument to __body__ in tests + now tests for request body single argument

Browse Source
This commit is contained in:
Christophe de Vienne 2013-01-17 22:50:10 +01:00
parent 23bac07fee
commit 02551de6de
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
wsme/tests/test_restjson.py
View File

@ -122,6 +122,11 @@ class MiniCrud(object):
print(repr(data)) print(repr(data))
return CRUDResult(data, u('update')) return CRUDResult(data, u('update'))
@expose(CRUDResult, wsme.types.text, body=Obj)
def update_with_body(self, msg, data):
print(repr(data))
return CRUDResult(data, msg)
@expose(CRUDResult, method='DELETE') @expose(CRUDResult, method='DELETE')
@validate(Obj) @validate(Obj)
def delete(self, ref): def delete(self, ref):
@ -211,16 +216,16 @@ class TestRestJson(wsme.tests.protocol.ProtocolTestCase):
print(r) print(r)
assert r.status_int == 400 assert r.status_int == 400
assert json.loads(r.text)['faultstring'] == \ assert json.loads(r.text)['faultstring'] == \
"Cannot read parameters from both a body and GET/POST params" "Parameter value was given several times"
def test_inline_body(self): def test_inline_body(self):
params = urlencode({'body': '{"value": 4}'}) params = urlencode({'__body__': '{"value": 4}'})
r = self.app.get('/argtypes/setint.json?' + params) r = self.app.get('/argtypes/setint.json?' + params)
print(r) print(r)
assert json.loads(r.text) == 4 assert json.loads(r.text) == 4
def test_empty_body(self): def test_empty_body(self):
params = urlencode({'body': ''}) params = urlencode({'__body__': ''})
r = self.app.get('/returntypes/getint.json?' + params) r = self.app.get('/returntypes/getint.json?' + params)
print(r) print(r)
assert json.loads(r.text) == 2 assert json.loads(r.text) == 2
@ -397,3 +402,19 @@ class TestRestJson(wsme.tests.protocol.ProtocolTestCase):
assert result['data']['id'] == 1 assert result['data']['id'] == 1
assert result['data']['name'] == u("test") assert result['data']['name'] == u("test")
assert result['message'] == "read" assert result['message'] == "read"
def test_body_arg(self):
headers = {
'Content-Type': 'application/json',
}
res = self.app.post(
'/crud/update_with_body?msg=hello',
json.dumps(dict(id=1, name=u('test'))),
headers=headers,
expect_errors=False)
print("Received:", res.body)
result = json.loads(res.text)
print(result)
assert result['data']['id'] == 1
assert result['data']['name'] == u("test")
assert result['message'] == "hello"

2
wsme/tests/test_spore.py
View File

@ -18,7 +18,7 @@ class TestSpore(unittest.TestCase):
spore = json.loads(spore) spore = json.loads(spore)
assert len(spore['methods']) == 46, str(len(spore['methods'])) assert len(spore['methods']) == 47, str(len(spore['methods']))
m = spore['methods']['argtypes_setbytesarray'] m = spore['methods']['argtypes_setbytesarray']
assert m['path'] == 'argtypes/setbytesarray', m['path'] assert m['path'] == 'argtypes/setbytesarray', m['path']