diff --git a/app/main/views/add_service.py b/app/main/views/add_service.py index 3f8a5e064..2869788ce 100644 --- a/app/main/views/add_service.py +++ b/app/main/views/add_service.py @@ -41,7 +41,6 @@ def _add_invited_user_to_service(invited_user): def _create_service(service_name, email_from): service_id = service_api_client.create_service(service_name=service_name, - active=False, message_limit=current_app.config['DEFAULT_SERVICE_LIMIT'], restricted=True, user_id=session['user_id'], diff --git a/tests/app/main/views/test_add_service.py b/tests/app/main/views/test_add_service.py index a1639663b..537ccad58 100644 --- a/tests/app/main/views/test_add_service.py +++ b/tests/app/main/views/test_add_service.py @@ -40,7 +40,6 @@ def test_should_add_service_and_redirect_to_tour_when_no_services(app_, assert mock_get_services_with_no_services.called mock_create_service.assert_called_once_with( service_name='testing the post', - active=False, message_limit=app_.config['DEFAULT_SERVICE_LIMIT'], restricted=True, user_id=api_user_active.id, @@ -73,7 +72,6 @@ def test_should_add_service_and_redirect_to_dashboard_when_existing_service(app_ assert mock_get_services.called mock_create_service.assert_called_once_with( service_name='testing the post', - active=False, message_limit=app_.config['DEFAULT_SERVICE_LIMIT'], restricted=True, user_id=api_user_active.id, diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py index ae0484b28..4090ec366 100644 --- a/tests/app/main/views/test_service_settings.py +++ b/tests/app/main/views/test_service_settings.py @@ -545,11 +545,7 @@ def test_switch_service_from_research_mode_to_normal( with app_.test_request_context(): with app_.test_client() as client: service = service_json( - "1234", - "Test Service", - [active_user_with_permissions.id], - message_limit=1000, - active=False, + users=[active_user_with_permissions.id], restricted=True, research_mode=True ) diff --git a/tests/conftest.py b/tests/conftest.py index e9f7cc8f9..2d3d14120 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -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',