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

Merge branch 'master' into service-not-found-returns-404

Browse Source 
Conflicts:
	app/errors.py
This commit is contained in:
Rebecca Law
2016-02-25 15:33:53 +00:00
parent 0f333de2cc ab495d983e
commit ff6cad1acf
36 changed files with 917 additions and 767 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/app/service/test_rest.py
View File

@@ -381,8 +381,8 @@ def test_get_users_for_service_returns_empty_list_if_no_users_associated_with_se
'/service/{}/users'.format(sample_service.id),
headers=[('Content-Type', 'application/json'), auth_header]
)
assert response.status_code == 200
result = json.loads(response.get_data(as_text=True))
assert response.status_code == 200
assert result['data'] == []