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

Merge branch 'master' into schedule-api-notification

Browse Source 
Conflicts:
	app/celery/scheduled_tasks.py
	app/v2/notifications/post_notifications.py
	tests/app/celery/test_scheduled_tasks.py
This commit is contained in:
Rebecca Law
2017-05-22 14:05:57 +01:00
parent 973cc2c4c9 47f361037e
commit 3a3161ecc4
48 changed files with 1917 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/app/conftest.py
View File

@@ -675,11 +675,9 @@ def sample_permission(notify_db,
@pytest.fixture(scope='function')
def sample_service_permission(notify_db,
notify_db_session,
service=None,
user=None,
permission="manage_settings"):
def sample_user_service_permission(
notify_db, notify_db_session, service=None, user=None, permission="manage_settings"
):
if user is None:
user = create_user()
if service is None: