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

Merge branch 'master' into fix-permissions

Browse Source 
Conflicts:
	app/main/views/jobs.py
	tests/app/main/views/test_manage_users.py
This commit is contained in:
Rebecca Law
2016-03-30 10:36:55 +01:00
parent 1cfaeec7b2 1a8d4fda69
commit c99df69025
25 changed files with 132 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/app/main/views/test_manage_users.py
View File

@@ -314,6 +314,6 @@ def test_remove_user_from_service(app_,
def _login_user(user, client, mocker, service):
mocker.patch('app.user_api_client.get_user', return_value=user)
mocker.patch('app.service_api_client.get_service', return_value=service)
mocker.patch('app.service_api_client.get_service', return_value={'data': service})
mocker.patch('app.service_api_client.get_services', return_value={'data': [service]})
client.login(user)