darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-01 04:09:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #570 from alphagov/reply-to-email

Browse Source 
Admin app settings to save reply to email address for service.
This commit is contained in:
Adam Shimali
2016-05-16 17:51:05 +01:00
parent 37fff2da63 18a0b94d98
commit ed74280044
8 changed files with 98 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/__init__.py
View File

@@ -35,7 +35,7 @@ def generate_uuid():
return uuid.uuid4()
def service_json(id_, name, users, message_limit=1000, active=False, restricted=True, email_from=None):
def service_json(id_, name, users, message_limit=1000, active=False, restricted=True, email_from=None, reply_to_email_address=None): # noqa
return {
'id': id_,
'name': name,
@@ -43,7 +43,8 @@ def service_json(id_, name, users, message_limit=1000, active=False, restricted=
'message_limit': message_limit,
'active': active,
'restricted': restricted,
'email_from': email_from
'email_from': email_from,
'reply_to_email_address': reply_to_email_address
}

23
tests/app/main/views/test_service_settings.py
View File

@@ -526,3 +526,26 @@ def test_route_for_platform_admin(mocker, app_, platform_admin_user, service_one
[],
platform_admin_user,
service_one)
def test_set_reply_to_email_address(app_,
active_user_with_permissions,
mocker,
mock_update_service,
service_one):
with app_.test_request_context():
with app_.test_client() as client:
client.login(active_user_with_permissions, mocker, service_one)
data = {"email_address": "test@someservice.gov.uk"}
response = client.post(url_for('main.service_set_reply_to_email', service_id=service_one['id']),
data=data,
follow_redirects=True)
assert response.status_code == 200
mock_update_service.assert_called_with(service_one['id'],
service_one['name'],
service_one['active'],
service_one['message_limit'],
service_one['restricted'],
ANY,
service_one['email_from'],
"test@someservice.gov.uk")

5
tests/conftest.py
View File

@@ -99,10 +99,11 @@ def mock_update_service(mocker):
message_limit,
restricted,
users,
email_from):
email_from,
reply_to_email_address=None):
service = service_json(
service_id, service_name, users, message_limit=message_limit,
active=active, restricted=restricted, email_from=email_from)
active=active, restricted=restricted, email_from=email_from, reply_to_email_address=reply_to_email_address)
return {'data': service}
return mocker.patch(