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

Remove hardcoded default to use test channel

Browse Source 
There is no need for a default now as every broadcast service has set on
it which broadcast channel to use.
This commit is contained in:
David McDonald
2021-02-19 11:38:10 +00:00
parent 9b21e6b04f
commit 3ea86bfb48
4 changed files with 4 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
tests/app/celery/test_broadcast_message_tasks.py
View File

@@ -203,47 +203,6 @@ def test_send_broadcast_provider_message_uses_channel_set_on_broadcast_service(
)
@freeze_time('2020-08-01 12:00')
@pytest.mark.parametrize('provider,provider_capitalised', [
['ee', 'EE'],
['three', 'Three'],
['o2', 'O2'],
['vodafone', 'Vodafone'],
])
def test_send_broadcast_provider_message_defaults_to_test_channel_if_no_service_broadcast_settings(
notify_db, mocker, sample_service, provider, provider_capitalised
):
template = create_template(sample_service, BROADCAST_TYPE)
broadcast_message = create_broadcast_message(
template,
areas={
'areas': ['london', 'glasgow'],
'simple_polygons': [
[[50.12, 1.2], [50.13, 1.2], [50.14, 1.21]],
[[-4.53, 55.72], [-3.88, 55.72], [-3.88, 55.96], [-4.53, 55.96]],
],
},
status=BroadcastStatusType.BROADCASTING
)
event = create_broadcast_event(broadcast_message)
mock_create_broadcast = mocker.patch(
f'app.clients.cbc_proxy.CBCProxy{provider_capitalised}.create_and_send_broadcast',
)
send_broadcast_provider_message(provider=provider, broadcast_event_id=str(event.id))
mock_create_broadcast.assert_called_once_with(
identifier=mocker.ANY,
message_number=mocker.ANY,
headline='GOV.UK Notify Broadcast',
description='this is an emergency broadcast message',
areas=mocker.ANY,
sent=mocker.ANY,
expires=mocker.ANY,
channel="test",
)
def test_send_broadcast_provider_message_works_if_we_retried_previously(mocker, sample_broadcast_service):
template = create_template(sample_broadcast_service, BROADCAST_TYPE)
broadcast_message = create_broadcast_message(

22
tests/app/service/test_rest.py
View File

@@ -300,28 +300,6 @@ def test_get_service_by_id_for_broadcast_service_returns_broadcast_keys(
assert json_resp['data']['broadcast_channel'] == broadcast_channel
def test_get_service_by_id_for_service_with_broadcast_permission_sets_channel_as_test_if_no_service_broadcast_settings(
admin_request, notify_db_session
):
service = create_service(service_permissions=[BROADCAST_TYPE])
assert BROADCAST_TYPE in [p.permission for p in service.permissions]
assert service.broadcast_channel is None
json_resp = admin_request.get('service.get_service_by_id', service_id=service.id)
assert json_resp['data']['id'] == str(service.id)
assert json_resp['data']['broadcast_channel'] == 'test'
def test_get_service_by_id_for_non_broadcast_service_sets_channel_as_none(
admin_request, sample_service
):
assert BROADCAST_TYPE not in [p.permission for p in sample_service.permissions]
json_resp = admin_request.get('service.get_service_by_id', service_id=sample_service.id)
assert json_resp['data']['id'] == str(sample_service.id)
assert json_resp['data']['broadcast_channel'] is None
@pytest.mark.parametrize('detailed', [True, False])
def test_get_service_by_id_returns_organisation_type(admin_request, sample_service, detailed):
json_resp = admin_request.get('service.get_service_by_id', service_id=sample_service.id, detailed=detailed)