diff --git a/tests/app/dao/test_services_dao.py b/tests/app/dao/test_services_dao.py index 3396e52ca..a1538eebf 100644 --- a/tests/app/dao/test_services_dao.py +++ b/tests/app/dao/test_services_dao.py @@ -261,14 +261,9 @@ def test_create_service_returns_service_with_default_permissions(service_factory service = service_factory.get('testing', email_from='testing') service = dao_fetch_service_by_id(service.id) - assert len(service.permissions) == 3 - assert set([ - SMS_TYPE, - EMAIL_TYPE, - INTERNATIONAL_SMS_TYPE, - ]) == set( - p.permission for p in service.permissions - ) + _assert_service_permissions(service.permissions, ( + SMS_TYPE, EMAIL_TYPE, INTERNATIONAL_SMS_TYPE, + )) @pytest.mark.parametrize("permission_to_remove, permission_remaining", [ @@ -281,11 +276,8 @@ def test_remove_permission_from_service_by_id_returns_service_with_correct_permi dao_remove_service_permission(service_id=sample_service.id, permission=permission_to_remove) service = dao_fetch_service_by_id(sample_service.id) - assert len(service.permissions) == 2 - assert set( - p.permission for p in service.permissions - ) == set(( - permission_remaining, INTERNATIONAL_SMS_TYPE + _assert_service_permissions(service.permissions, ( + permission_remaining, INTERNATIONAL_SMS_TYPE, )) @@ -312,22 +304,16 @@ def test_create_service_by_id_adding_and_removing_letter_returns_service_without dao_add_service_permission(service_id=service.id, permission=LETTER_TYPE) service = dao_fetch_service_by_id(service.id) - assert len(service.permissions) == 4 - assert set([ + _assert_service_permissions(service.permissions, ( SMS_TYPE, EMAIL_TYPE, LETTER_TYPE, INTERNATIONAL_SMS_TYPE, - ]) == set([ - p.permission for p in service.permissions - ]) + )) dao_remove_service_permission(service_id=service.id, permission=LETTER_TYPE) service = dao_fetch_service_by_id(service.id) - assert len(service.permissions) == 3 - assert set([ + _assert_service_permissions(service.permissions, ( SMS_TYPE, EMAIL_TYPE, INTERNATIONAL_SMS_TYPE, - ]) == set([ - p.permission for p in service.permissions - ]) + )) def test_create_service_creates_a_history_record_with_current_data(sample_user): @@ -404,7 +390,10 @@ def test_update_service_permission_creates_a_history_record_with_current_data(sa service_from_db = Service.query.first() assert service_from_db.version == 2 - assert LETTER_TYPE in [p.permission for p in service_from_db.permissions] + + _assert_service_permissions(service.permissions, ( + SMS_TYPE, EMAIL_TYPE, INTERNATIONAL_SMS_TYPE, LETTER_TYPE, + )) permission = [p for p in service.permissions if p.permission == 'sms'][0] service.permissions.remove(permission) @@ -415,7 +404,9 @@ def test_update_service_permission_creates_a_history_record_with_current_data(sa service_from_db = Service.query.first() assert service_from_db.version == 3 - assert SMS_TYPE not in [p.permission for p in service_from_db.permissions] + _assert_service_permissions(service.permissions, ( + EMAIL_TYPE, INTERNATIONAL_SMS_TYPE, LETTER_TYPE, + )) assert len(Service.get_history_model().query.filter_by(name='service_name').all()) == 3 assert Service.get_history_model().query.filter_by(name='service_name').all()[2].version == 3 @@ -971,3 +962,9 @@ def test_dao_allocating_inbound_number_shows_on_service(notify_db_session, sampl dao_set_inbound_number_to_service(service.id, inbound_numbers[0]) assert service.inbound_number.number == inbound_numbers[0].number + + +def _assert_service_permissions(service_permissions, expected): + + assert len(service_permissions) == len(expected) + assert set(expected) == set(p.permission for p in service_permissions)