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

add get_active_services method

Browse Source 
* all current invocations of get_services now call get_active_services
  EXCEPT for platform admin page (where we want to see inactive services
* cleaned up parameter names and unpacking (since *params is unhelpful)
* fixed incorrect kwarg name in conftest
This commit is contained in:
Leo Hemsted
2016-11-09 14:33:35 +00:00
parent b885ce9cf4
commit 08881e5bd1
7 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/conftest.py
View File

@@ -187,7 +187,7 @@ def mock_get_services(mocker, fake_uuid, user=None):
if user is None:
user = active_user_with_permissions(fake_uuid)
def _create(user_id=None):
def _get_services(params_dict=None):
service_one = service_json(
SERVICE_ONE_ID, "service_one", [user.id], 1000, True, False)
service_two = service_json(
@@ -195,7 +195,7 @@ def mock_get_services(mocker, fake_uuid, user=None):
return {'data': [service_one, service_two]}
return mocker.patch(
'app.service_api_client.get_services', side_effect=_create)
'app.service_api_client.get_services', side_effect=_get_services)
@pytest.fixture(scope='function')
@@ -203,11 +203,11 @@ def mock_get_services_with_no_services(mocker, fake_uuid, user=None):
if user is None:
user = active_user_with_permissions(fake_uuid)
def _create(user_id=None):
def _get_services(params_dict=None):
return {'data': []}
return mocker.patch(
'app.service_api_client.get_services', side_effect=_create)
'app.service_api_client.get_services', side_effect=_get_services)
@pytest.fixture(scope='function')
@@ -215,13 +215,13 @@ def mock_get_services_with_one_service(mocker, fake_uuid, user=None):
if user is None:
user = api_user_active(fake_uuid)
def _create(user_id=None):
def _get_services(params_dict=None):
return {'data': [service_json(
SERVICE_ONE_ID, "service_one", [user.id], 1000, True, False
)]}
return mocker.patch(
'app.service_api_client.get_services', side_effect=_create)
'app.service_api_client.get_services', side_effect=_get_services)
@pytest.fixture(scope='function')
@@ -825,7 +825,7 @@ def mock_login(mocker, mock_get_user, mock_update_user, mock_events):
def _verify_code(user_id, code, code_type):
return True, ''
def _no_services(user_id=None):
def _no_services(params_dict=None):
return {'data': []}
return (