darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-02 09:26:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactor the sms sender code to remove any unused methods.

Browse Source 
Refactor tests/db/create_service() to behave more like the real world.
Created new create_service_with_inbound_number and create_service_with_defined_sms_sender() test/db methods.
This commit is contained in:
Rebecca Law
2017-11-07 14:26:18 +00:00
parent 430342b567
commit 0054361044
15 changed files with 224 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
tests/app/inbound_number/test_rest.py
View File

@@ -1,7 +1,4 @@
import uuid
from app.dao.inbound_numbers_dao import dao_get_inbound_number_for_service
from app.models import ServiceSmsSender
from tests.app.db import create_service, create_inbound_number
@@ -38,66 +35,6 @@ def test_rest_get_inbound_number_when_service_is_not_assigned_returns_empty_dict
assert result['data'] == {}
def test_rest_allocate_inbound_number_to_service(
admin_request, notify_db_session, sample_service):
service = create_service(service_name='test service 1')
inbound_number = create_inbound_number(number='1', provider='mmg', active=True)
result = admin_request.post(
'inbound_number.post_allocate_inbound_number',
_expected_status=204,
service_id=service.id
)
inbound_number_from_db = dao_get_inbound_number_for_service(service.id)
assert inbound_number_from_db.active
assert inbound_number_from_db.id == inbound_number.id
assert inbound_number_from_db.number == inbound_number.number
def test_rest_allocate_inbound_number_to_service_raises_400_when_no_available_numbers(
admin_request, notify_db_session, sample_service):
service = create_service(service_name='test service 1')
create_inbound_number(number='1', provider='mmg', active=False)
result = admin_request.post(
'inbound_number.post_allocate_inbound_number',
_expected_status=400,
service_id=service.id
)
assert result['message'] == 'No available inbound numbers'
def test_rest_allocate_inbound_number_to_service_sets_active_flag_true_when_flag_is_false(
admin_request, notify_db_session, sample_service):
service = create_service(service_name='test service 1')
create_inbound_number(number='1', provider='mmg', active=False, service_id=service.id)
result = admin_request.post(
'inbound_number.post_allocate_inbound_number',
_expected_status=204,
service_id=service.id
)
inbound_number = dao_get_inbound_number_for_service(service.id)
assert inbound_number.active
def test_rest_allocate_inbound_number_to_service_sets_active_flag_true_when_flag_is_true(
admin_request, notify_db_session, sample_service):
service = create_service(service_name='test service 1')
create_inbound_number(number='1', provider='mmg', active=True, service_id=service.id)
result = admin_request.post(
'inbound_number.post_allocate_inbound_number',
_expected_status=200,
service_id=service.id
)
def test_rest_set_inbound_number_active_flag_off(
admin_request, notify_db_session):
service = create_service(service_name='test service 1')
@@ -114,67 +51,6 @@ def test_rest_set_inbound_number_active_flag_off(
assert not inbound_number_from_db.active
def test_allocate_inbound_number_insert_update_service_sms_sender(
admin_request, notify_db_session
):
service = create_service()
inbound_number = create_inbound_number(number='123')
admin_request.post(
'inbound_number.post_allocate_inbound_number',
_expected_status=204,
service_id=service.id
)
service_sms_senders = ServiceSmsSender.query.all()
assert len(service_sms_senders) == 1
assert service_sms_senders[0].sms_sender == inbound_number.number
assert service_sms_senders[0].inbound_number_id == inbound_number.id
assert service_sms_senders[0].is_default
def test_allocate_inbound_number_to_service(admin_request, notify_db_session):
service = create_service()
inbound_number = create_inbound_number(number='1235468')
admin_request.post(
'inbound_number.allocate_inbound_number_to_service',
_expected_status=204,
service_id=service.id,
inbound_number_id=inbound_number.id
)
sms_sender = ServiceSmsSender.query.filter_by(service_id=service.id).first()
assert sms_sender.sms_sender == inbound_number.number
assert sms_sender.inbound_number_id == inbound_number.id
def test_allocate_inbound_number_to_service_returns_404_if_service_does_not_exist(
admin_request, notify_db_session
):
inbound_number = create_inbound_number(number='1235468')
admin_request.post(
'inbound_number.allocate_inbound_number_to_service',
_expected_status=404,
service_id=uuid.uuid4(),
inbound_number_id=inbound_number.id
)
def test_allocate_inbound_number_to_service_returns_500_if_inbound_number_is_assigned(
admin_request, notify_db_session
):
service = create_service()
inbound_number = create_inbound_number(number='1235468', service_id=service.id)
admin_request.post(
'inbound_number.allocate_inbound_number_to_service',
_expected_status=404,
service_id=uuid.uuid4(),
inbound_number_id=inbound_number.id
)
def test_get_available_inbound_numbers_returns_empty_list(admin_request):
result = admin_request.get('inbound_number.get_available_inbound_numbers')