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

Factor permissions tests for code reuse

Browse Source 
We had these fiddly little generator expressions repeated throughout
this file. Code is made easier to understand by refactoring them into a
function that describes what it does.
This commit is contained in:
Chris Hill-Scott
2017-10-19 11:14:07 +01:00
parent 46d45d8595
commit 534a2ea7cd
1 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
tests/app/dao/test_services_dao.py
View File

@@ -261,14 +261,9 @@ def test_create_service_returns_service_with_default_permissions(service_factory
service = service_factory.get('testing', email_from='testing') service = service_factory.get('testing', email_from='testing')
service = dao_fetch_service_by_id(service.id) service = dao_fetch_service_by_id(service.id)
assert len(service.permissions) == 3 _assert_service_permissions(service.permissions, (
assert set([ SMS_TYPE, EMAIL_TYPE, INTERNATIONAL_SMS_TYPE,
SMS_TYPE, ))
EMAIL_TYPE,
INTERNATIONAL_SMS_TYPE,
]) == set(
p.permission for p in service.permissions
)
@pytest.mark.parametrize("permission_to_remove, permission_remaining", [ @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) dao_remove_service_permission(service_id=sample_service.id, permission=permission_to_remove)
service = dao_fetch_service_by_id(sample_service.id) service = dao_fetch_service_by_id(sample_service.id)
assert len(service.permissions) == 2 _assert_service_permissions(service.permissions, (
assert set( permission_remaining, INTERNATIONAL_SMS_TYPE,
p.permission for p in service.permissions
) == set((
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) dao_add_service_permission(service_id=service.id, permission=LETTER_TYPE)
service = dao_fetch_service_by_id(service.id) service = dao_fetch_service_by_id(service.id)
assert len(service.permissions) == 4 _assert_service_permissions(service.permissions, (
assert set([
SMS_TYPE, EMAIL_TYPE, LETTER_TYPE, INTERNATIONAL_SMS_TYPE, 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) dao_remove_service_permission(service_id=service.id, permission=LETTER_TYPE)
service = dao_fetch_service_by_id(service.id) service = dao_fetch_service_by_id(service.id)
assert len(service.permissions) == 3 _assert_service_permissions(service.permissions, (
assert set([
SMS_TYPE, EMAIL_TYPE, INTERNATIONAL_SMS_TYPE, 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): 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() service_from_db = Service.query.first()
assert service_from_db.version == 2 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] permission = [p for p in service.permissions if p.permission == 'sms'][0]
service.permissions.remove(permission) 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() service_from_db = Service.query.first()
assert service_from_db.version == 3 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 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 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]) dao_set_inbound_number_to_service(service.id, inbound_numbers[0])
assert service.inbound_number.number == inbound_numbers[0].number 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)