darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-01-30 06:21:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactor code

Browse Source
This commit is contained in:
Ken Tsang
2017-08-10 18:03:20 +01:00
parent d5b91f9911
commit 104fc93503
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/app/conftest.py
View File

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