Merge branch 'master' into fix-new-jobs-showing-as-deleted

This commit is contained in:
Chris Hill-Scott
2020-01-21 14:24:40 +00:00
committed by GitHub
55 changed files with 1859 additions and 207 deletions

View File

@@ -545,7 +545,7 @@ def validate_route_permission(mocker,
mocker.patch('app.user_api_client.get_user', return_value=usr)
mocker.patch('app.user_api_client.get_user_by_email', return_value=usr)
mocker.patch('app.service_api_client.get_service', return_value={'data': service})
mocker.patch('app.models.user.Users.client', return_value=[usr])
mocker.patch('app.models.user.Users.client_method', return_value=[usr])
mocker.patch('app.job_api_client.has_jobs', return_value=False)
with app_.test_request_context():
with app_.test_client() as client: