From d141af4b9420d391ceb1c8215d6b1ea056efad52 Mon Sep 17 00:00:00 2001 From: Adam Shimali Date: Tue, 17 May 2016 11:34:49 +0100 Subject: [PATCH] If service has reply to show it in form --- app/main/views/service_settings.py | 2 ++ tests/app/main/views/test_service_settings.py | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py index 3c54e2cb5..b4d5cf42d 100644 --- a/app/main/views/service_settings.py +++ b/app/main/views/service_settings.py @@ -229,6 +229,8 @@ def service_delete_confirm(service_id): @user_has_permissions('manage_settings', admin_override=True) def service_set_reply_to_email(service_id): form = ServiceReplyToEmailFrom() + if request.method == 'GET': + form.email_address.data = current_service.get('reply_to_email_address') if form.validate_on_submit(): message = 'Reply to email set to {}'.format(form.email_address.data) service_api_client.update_service( diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py index ef53c1088..f7bd64a8c 100644 --- a/tests/app/main/views/test_service_settings.py +++ b/tests/app/main/views/test_service_settings.py @@ -549,3 +549,19 @@ def test_set_reply_to_email_address(app_, ANY, service_one['email_from'], "test@someservice.gov.uk") + + +def test_if_reply_to_email_address_set_then_form_populated(app_, + active_user_with_permissions, + mocker, + service_one): + + service_one['reply_to_email_address'] = 'test@service.gov.uk' + with app_.test_request_context(): + with app_.test_client() as client: + client.login(active_user_with_permissions, mocker, service_one) + response = client.get(url_for('main.service_set_reply_to_email', service_id=service_one['id'])) + + assert response.status_code == 200 + page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser') + assert page.find(id='email_address')['value'] == 'test@service.gov.uk'