Added extra tests after refactoring

This commit is contained in:
Ken Tsang
2017-08-11 12:51:52 +01:00
parent c81b1aa6a0
commit 0c4c467cac
3 changed files with 53 additions and 54 deletions

View File

@@ -76,6 +76,6 @@ def test_set_inbound_number_active_flag(notify_db, notify_db_session, sample_ser
dao_set_inbound_number_active_flag(inbound_number.id, active=active)
inbound_number = dao_get_inbound_number(inbound_number.id)
inbound_number = dao_get_inbound_number_for_service(sample_service.id)
assert inbound_number.active is active

View File

@@ -4,7 +4,6 @@ import json
from app.models import InboundNumber
from app.dao.inbound_numbers_dao import (
dao_get_inbound_numbers,
dao_get_inbound_number,
dao_get_available_inbound_numbers,
dao_get_inbound_number_for_service,
dao_set_inbound_number_to_service
@@ -20,56 +19,60 @@ def test_rest_get_inbound_numbers(admin_request, sample_inbound_numbers):
assert result['data'] == [i.serialize() for i in sample_inbound_numbers]
def test_rest_allocate_inbound_number(admin_request, notify_db_session, sample_inbound_numbers):
service = create_service(service_name='test service')
admin_request.post(
'inbound_number.post_allocate_inbound_number',
_expected_status=204,
service_id=service.id
def test_rest_get_inbound_number(admin_request, notify_db_session, sample_service):
inbound_number = create_inbound_number(number='1', provider='mmg', active=False, service_id=sample_service.id)
result = admin_request.get(
'inbound_number.get_inbound_number_for_service',
service_id=sample_service.id
)
assert result['data'] == inbound_number.serialize()
def test_rest_allocate_inbound_number_when_no_inbound_available_returns_409(
def test_rest_set_service_to_several_inbound_numbers_returns_400(
admin_request, notify_db_session, sample_service):
service_1 = create_service(service_name='test service 1')
create_inbound_number(number='4', provider='mmg', active=False, service_id=sample_service.id)
create_inbound_number(number='5', provider='mmg', active=True, service_id=service_1.id)
create_inbound_number(number='1', provider='mmg', active=False, service_id=sample_service.id)
inbound_number = create_inbound_number(number='2', provider='mmg', active=True, service_id=service_1.id)
service_2 = create_service(service_name='test service 2')
admin_request.post(
'inbound_number.post_allocate_inbound_number',
_expected_status=409,
service_id=service_2.id
)
def test_rest_set_service_to_several_inbound_numbers_returns_409(
admin_request, notify_db_session, sample_service):
service_1 = create_service(service_name='test service 1')
create_inbound_number(number='4', provider='mmg', active=False, service_id=sample_service.id)
inbound_number = create_inbound_number(number='5', provider='mmg', active=True, service_id=service_1.id)
service_2 = create_service(service_name='test service 2')
admin_request.post(
result = admin_request.post(
'inbound_number.post_set_inbound_number_for_service',
_expected_status=409,
_expected_status=400,
inbound_number_id=inbound_number.id,
service_id=service_2.id
)
assert result['message'] == 'No inbound numbers available'
def test_rest_set_number_to_several_services_returns_409(
def test_rest_set_number_to_several_services_returns_400(
admin_request, notify_db_session, sample_service):
service_1 = create_service(service_name='test service 1')
inbound_number = create_inbound_number(number='4', provider='mmg', active=False, service_id=sample_service.id)
inbound_number = create_inbound_number(number='1', provider='mmg', active=True, service_id=sample_service.id)
create_inbound_number(number='2', provider='mmg', active=True, service_id=None)
service_2 = create_service(service_name='test service 2')
admin_request.post(
result = admin_request.post(
'inbound_number.post_set_inbound_number_for_service',
_expected_status=409,
_expected_status=400,
inbound_number_id=inbound_number.id,
service_id=service_2.id
)
assert result['message'] == 'Inbound number already assigned'
def test_rest_set_multiple_number_to_a_service_returns_400(
admin_request, notify_db_session, sample_service):
create_inbound_number(number='1', provider='mmg', active=True, service_id=sample_service.id)
inbound_number = create_inbound_number(number='2', provider='mmg', active=True, service_id=None)
result = admin_request.post(
'inbound_number.post_set_inbound_number_for_service',
_expected_status=400,
inbound_number_id=inbound_number.id,
service_id=sample_service.id
)
assert result['message'] == 'Service already has an inbound number'
def test_rest_set_inbound_number_active_flag_off(admin_request, notify_db_session):
@@ -82,7 +85,7 @@ def test_rest_set_inbound_number_active_flag_off(admin_request, notify_db_sessio
inbound_number_id=inbound_number.id
)
inbound_number_off = dao_get_inbound_number(inbound_number.id)
inbound_number_off = dao_get_inbound_number_for_service(service.id)
assert not inbound_number_off.active
@@ -96,5 +99,5 @@ def test_rest_set_inbound_number_active_flag_on(admin_request, notify_db_session
inbound_number_id=inbound_number.id
)
inbound_number_on = dao_get_inbound_number(inbound_number.id)
inbound_number_on = dao_get_inbound_number_for_service(service.id)
assert inbound_number_on.active