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

Fix all tests.

Browse Source
This commit is contained in:
Nicholas Staples
2016-03-02 11:10:52 +00:00
parent 6f689a187e
commit 01f616eeac
3 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tests/app/conftest.py
View File

@@ -324,7 +324,7 @@ def sample_permission(notify_db,
notify_db_session,
service=None,
user=None,
permission="sample permission"):
permission="manage_service"):
if user is None:
user = sample_user(notify_db, notify_db_session)
data = {
@@ -333,9 +333,14 @@ def sample_permission(notify_db,
}
if service:
data['service'] = service
p_model = Permission(**data)
db.session.add(p_model)
db.session.commit()
p_model = Permission.query.filter_by(
user=user,
service=service,
permission=permission).first()
if not p_model:
p_model = Permission(**data)
db.session.add(p_model)
db.session.commit()
return p_model
@@ -344,7 +349,7 @@ def sample_service_permission(notify_db,
notify_db_session,
service=None,
user=None,
permission="sample permission"):
permission="manage_service"):
if user is None:
user = sample_user(notify_db, notify_db_session)
if service is None:
@@ -354,7 +359,12 @@ def sample_service_permission(notify_db,
'service': service,
'permission': permission
}
p_model = Permission(**data)
db.session.add(p_model)
db.session.commit()
p_model = Permission.query.filter_by(
user=user,
service=service,
permission=permission).first()
if not p_model:
p_model = Permission(**data)
db.session.add(p_model)
db.session.commit()
return p_model