darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-09-09 11:49:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed admin_request bug

Browse Source
This commit is contained in:
Ken Tsang
2017-08-10 12:47:57 +01:00
parent 468048797a
commit d5b91f9911
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/app/conftest.py
View File

@@ -1051,11 +1051,15 @@ def admin_request(client):
data=json.dumps(_data), data=json.dumps(_data),
headers=[('Content-Type', 'application/json'), create_authorization_header()] headers=[('Content-Type', 'application/json'), create_authorization_header()]
) )
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
json_resp = json.loads(resp.get_data(as_text=True)) json_resp = json.loads(resp.get_data(as_text=True))
assert resp.status_code == _expected_status, json_resp assert resp.status_code == _expected_status, json_resp
======= =======
if resp.get_data: if resp.get_data:
=======
if resp.get_data():
>>>>>>> Fixed admin_request bug
json_resp = json.loads(resp.get_data(as_text=True)) json_resp = json.loads(resp.get_data(as_text=True))
else: else:
json_resp = None json_resp = None