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

Merge branch 'master' into refactor-query-filters

Browse Source 
Conflicts:
	app/permission/rest.py
This commit is contained in:
Rebecca Law
2016-06-16 10:26:17 +01:00
parent f8262b13c1 92fdba7010
commit 39c9d9ebe9
15 changed files with 235 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/app/dao/test_templates_dao.py
View File

@@ -267,6 +267,6 @@ def test_get_template_versions(sample_template):
assert x.content == 'new version'
else:
assert x.content == original_content
from app.schemas import (template_history_schema)
from app.schemas import template_history_schema
v = template_history_schema.load(versions, many=True)
assert v.__len__() == 2

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

@@ -296,7 +296,7 @@ def test_get_user_by_email_bad_url_returns_404(notify_api,
assert resp.status_code == 400
json_resp = json.loads(resp.get_data(as_text=True))
assert json_resp['result'] == 'error'
assert json_resp['message'] == 'invalid request'
assert json_resp['message'] == 'Invalid request. Email query string param required'
def test_get_user_with_permissions(notify_api,