darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-20 23:41:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove the default value - expect it to always be set.

Browse Source
This commit is contained in:
Rebecca Law
2017-09-20 12:20:12 +01:00
parent c6bf38e869
commit 877d8a2877
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/dao/service_email_reply_to_dao.py
View File

@@ -40,7 +40,7 @@ def dao_update_reply_to_email(reply_to):
@transactional @transactional
def add_reply_to_email_address_for_service(service_id, email_address, is_default=True): def add_reply_to_email_address_for_service(service_id, email_address, is_default):
old_default = _get_existing_default(service_id) old_default = _get_existing_default(service_id)
if is_default: if is_default:
_reset_old_default_to_false(old_default) _reset_old_default_to_false(old_default)
@@ -53,7 +53,7 @@ def add_reply_to_email_address_for_service(service_id, email_address, is_default
@transactional @transactional
def update_reply_to_email_address(service_id, reply_to_id, email_address, is_default=True): def update_reply_to_email_address(service_id, reply_to_id, email_address, is_default):
old_default = _get_existing_default(service_id) old_default = _get_existing_default(service_id)
if is_default: if is_default:
_reset_old_default_to_false(old_default) _reset_old_default_to_false(old_default)

10
tests/app/dao/test_service_email_reply_to_dao.py
View File

@@ -69,7 +69,9 @@ def test_dao_get_reply_to_by_service_id(notify_db_session):
def test_add_reply_to_email_address_for_service_creates_first_email_for_service(notify_db_session): def test_add_reply_to_email_address_for_service_creates_first_email_for_service(notify_db_session):
service = create_service() service = create_service()
add_reply_to_email_address_for_service(service_id=service.id, email_address='new@address.com') add_reply_to_email_address_for_service(service_id=service.id,
email_address='new@address.com',
is_default=True)
results = dao_get_reply_to_by_service_id(service_id=service.id) results = dao_get_reply_to_by_service_id(service_id=service.id)
assert len(results) == 1 assert len(results) == 1
@@ -112,7 +114,8 @@ def test_add_reply_to_email_address_new_reply_to_is_default_existing_reply_to_is
def test_add_reply_to_email_address_can_add_a_third_reply_to_address(sample_service): def test_add_reply_to_email_address_can_add_a_third_reply_to_address(sample_service):
add_reply_to_email_address_for_service(service_id=sample_service.id, add_reply_to_email_address_for_service(service_id=sample_service.id,
email_address="first@address.com") email_address="first@address.com",
is_default=True)
add_reply_to_email_address_for_service(service_id=sample_service.id, email_address='second@address.com', add_reply_to_email_address_for_service(service_id=sample_service.id, email_address='second@address.com',
is_default=False) is_default=False)
add_reply_to_email_address_for_service(service_id=sample_service.id, email_address='third@address.com', add_reply_to_email_address_for_service(service_id=sample_service.id, email_address='third@address.com',
@@ -150,7 +153,8 @@ def test_add_reply_to_email_address_ensure_there_is_not_more_than_one_default(sa
def test_update_reply_to_email_address(sample_service): def test_update_reply_to_email_address(sample_service):
first_reply_to = create_reply_to_email(service=sample_service, email_address="first@address.com") first_reply_to = create_reply_to_email(service=sample_service, email_address="first@address.com")
update_reply_to_email_address(service_id=sample_service.id, reply_to_id=first_reply_to.id, update_reply_to_email_address(service_id=sample_service.id, reply_to_id=first_reply_to.id,
email_address='change_address@email.com') email_address='change_address@email.com',
is_default=True)
updated_reply_to = ServiceEmailReplyTo.query.get(first_reply_to.id) updated_reply_to = ServiceEmailReplyTo.query.get(first_reply_to.id)
assert updated_reply_to.email_address == 'change_address@email.com' assert updated_reply_to.email_address == 'change_address@email.com'