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

clean up some usage of active in tests and remove it from service_api_client.create_service (created services are always active)

Browse Source
This commit is contained in:
Leo Hemsted
2016-11-08 15:37:25 +00:00
parent 045864f052
commit b885ce9cf4
4 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/conftest.py
View File

@@ -67,9 +67,7 @@ def fake_uuid():
@pytest.fixture(scope='function')
def mock_get_service(mocker, api_user_active):
def _get(service_id):
service = service_json(
service_id, "Test Service", [api_user_active.id], message_limit=50,
active=False, restricted=True)
service = service_json(service_id, users=[api_user_active.id], message_limit=50)
return {'data': service}
return mocker.patch('app.service_api_client.get_service', side_effect=_get)
@@ -125,10 +123,7 @@ def mock_get_live_service(mocker, api_user_active):
def _get(service_id):
service = service_json(
service_id,
"Test Service",
[api_user_active.id],
message_limit=1000,
active=False,
users=[api_user_active.id],
restricted=False)
return {'data': service}
@@ -137,10 +132,9 @@ def mock_get_live_service(mocker, api_user_active):
@pytest.fixture(scope='function')
def mock_create_service(mocker):
def _create(service_name, active, message_limit, restricted, user_id, email_from):
def _create(service_name, message_limit, restricted, user_id, email_from):
service = service_json(
101, service_name, [user_id], message_limit=message_limit,
active=active, restricted=restricted, email_from=email_from)
101, service_name, [user_id], message_limit=message_limit, restricted=restricted, email_from=email_from)
return service['id']
return mocker.patch(
@@ -152,7 +146,7 @@ def mock_update_service(mocker):
def _update(service_id, **kwargs):
service = service_json(
service_id,
**{key: kwargs.get(key) for key in [
**{key: kwargs[key] for key in kwargs if key in [
'name',
'users',
'message_limit',