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

Make email branding settings a table

Browse Source 
So that it matches the other settings on this page
This commit is contained in:
Chris Hill-Scott
2016-08-24 09:34:14 +01:00
parent e234ed9741
commit 58b2a8a825
5 changed files with 133 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/main/views/service_settings.py
View File

@@ -34,7 +34,14 @@ from app import user_api_client, current_service, organisations_client
@login_required @login_required
@user_has_permissions('manage_settings', admin_override=True) @user_has_permissions('manage_settings', admin_override=True)
def service_settings(service_id): def service_settings(service_id):
return render_template('views/service-settings.html') if current_service['organisation']:
organisation = organisations_client.get_organisation(current_service['organisation'])['organisation']
else:
organisation = None
return render_template(
'views/service-settings.html',
organisation=organisation
)
@main.route("/services/<service_id>/service-settings/name", methods=['GET', 'POST']) @main.route("/services/<service_id>/service-settings/name", methods=['GET', 'POST'])

3
app/notify_client/organisations_client.py
View File

@@ -15,5 +15,8 @@ class OrganisationsClient(BaseAPIClient):
self.client_id = app.config['ADMIN_CLIENT_USER_NAME'] self.client_id = app.config['ADMIN_CLIENT_USER_NAME']
self.secret = app.config['ADMIN_CLIENT_SECRET'] self.secret = app.config['ADMIN_CLIENT_SECRET']
def get_organisation(self, id):
return self.get(url='/organisation/{}'.format(id))
def get_organisations(self): def get_organisations(self):
return self.get(url='/organisation')['organisations'] return self.get(url='/organisation')['organisations']

26
app/templates/views/service-settings.html
View File

@@ -60,12 +60,26 @@
<h2 class="heading-medium">Platform admin settings</h2> <h2 class="heading-medium">Platform admin settings</h2>
{{ browse_list([ {% call mapping_table(
{ caption='Settings',
'title': 'Email branding', field_headings=['Label', 'Value', 'Action'],
'link': url_for('.service_set_branding_and_org', service_id=current_service.id) field_headings_visible=False,
} caption_visible=False
]) }} ) %}
{% call row() %}
{{ text_field('Email branding' )}}
{% call field() %}
{% if current_service.branding == 'govuk' %}
GOV.UK
{% elif current_service.branding == 'both' %}
GOV.UK and {{ organisation.name if organisation else None }}
{% elif current_service.branding == 'org' %}
Only {{ organisation.name if organisation else None }}
{% endif %}
{% endcall %}
{{ edit_field('Change', url_for('.service_set_branding_and_org', service_id=current_service.id)) }}
{% endcall %}
{% endcall %}
<ul> <ul>
<li class="bottom-gutter"> <li class="bottom-gutter">

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

@@ -13,7 +13,8 @@ def test_should_show_overview(
app_, app_,
active_user_with_permissions, active_user_with_permissions,
mocker, mocker,
service_one service_one,
mock_get_organisation
): ):
with app_.test_request_context(), app_.test_client() as client: with app_.test_request_context(), app_.test_client() as client:
client.login(active_user_with_permissions, mocker, service_one) client.login(active_user_with_permissions, mocker, service_one)
@@ -36,7 +37,8 @@ def test_should_show_overview_for_service_with_more_things_set(
app_, app_,
active_user_with_permissions, active_user_with_permissions,
mocker, mocker,
service_with_reply_to_addresses service_with_reply_to_addresses,
mock_get_organisation
): ):
with app_.test_request_context(), app_.test_client() as client: with app_.test_request_context(), app_.test_client() as client:
client.login(active_user_with_permissions, mocker, service_with_reply_to_addresses) client.login(active_user_with_permissions, mocker, service_with_reply_to_addresses)
@@ -91,14 +93,17 @@ def test_should_redirect_after_change_service_name(app_,
assert mock_get_services.called assert mock_get_services.called
def test_switch_service_to_live(app_, def test_switch_service_to_live(
service_one, app_,
mock_login, service_one,
mock_get_user, mock_login,
active_user_with_permissions, mock_get_user,
mock_get_service, active_user_with_permissions,
mock_update_service, mock_get_service,
mock_has_permissions): mock_update_service,
mock_has_permissions,
mock_get_organisation
):
with app_.test_request_context(): with app_.test_request_context():
with app_.test_client() as client: with app_.test_client() as client:
client.login(active_user_with_permissions) client.login(active_user_with_permissions)
@@ -115,14 +120,17 @@ def test_switch_service_to_live(app_,
) )
def test_switch_service_to_restricted(app_, def test_switch_service_to_restricted(
service_one, app_,
mock_login, service_one,
mock_get_user, mock_login,
active_user_with_permissions, mock_get_user,
mock_get_live_service, active_user_with_permissions,
mock_update_service, mock_get_live_service,
mock_has_permissions): mock_update_service,
mock_has_permissions,
mock_get_organisation
):
with app_.test_request_context(): with app_.test_request_context():
with app_.test_client() as client: with app_.test_client() as client:
client.login(active_user_with_permissions) client.login(active_user_with_permissions)
@@ -176,12 +184,15 @@ def test_should_show_service_name_confirmation(app_,
app.service_api_client.get_service.assert_called_with(service_one['id']) app.service_api_client.get_service.assert_called_with(service_one['id'])
def test_should_redirect_after_service_name_confirmation(app_, def test_should_redirect_after_service_name_confirmation(
active_user_with_permissions, app_,
service_one, active_user_with_permissions,
mocker, service_one,
mock_update_service, mocker,
mock_verify_password): mock_update_service,
mock_verify_password,
mock_get_organisation
):
with app_.test_request_context(): with app_.test_request_context():
with app_.test_client() as client: with app_.test_client() as client:
client.login(active_user_with_permissions, mocker, service_one) client.login(active_user_with_permissions, mocker, service_one)
@@ -250,12 +261,13 @@ def test_should_show_request_to_go_live(app_,
def test_should_redirect_after_request_to_go_live( def test_should_redirect_after_request_to_go_live(
app_, app_,
api_user_active, api_user_active,
mock_get_user, mock_get_user,
mock_get_service, mock_get_service,
mock_has_permissions, mock_has_permissions,
mocker mock_get_organisation,
mocker
): ):
mock_post = mocker.patch( mock_post = mocker.patch(
'app.main.views.feedback.requests.post', 'app.main.views.feedback.requests.post',
@@ -290,12 +302,12 @@ def test_should_redirect_after_request_to_go_live(
def test_log_error_on_request_to_go_live( def test_log_error_on_request_to_go_live(
app_, app_,
api_user_active, api_user_active,
mock_get_user, mock_get_user,
mock_get_service, mock_get_service,
mock_has_permissions, mock_has_permissions,
mocker mocker
): ):
mock_post = mocker.patch( mock_post = mocker.patch(
'app.main.views.service_settings.requests.post', 'app.main.views.service_settings.requests.post',
@@ -407,7 +419,7 @@ def test_should_redirect_delete_confirmation(app_,
assert mock_delete_service.called assert mock_delete_service.called
def test_route_permissions(mocker, app_, api_user_active, service_one): def test_route_permissions(mocker, app_, api_user_active, service_one, mock_get_organisation):
routes = [ routes = [
'main.service_settings', 'main.service_settings',
'main.service_name_change', 'main.service_name_change',
@@ -428,7 +440,7 @@ def test_route_permissions(mocker, app_, api_user_active, service_one):
service_one) service_one)
def test_route_invalid_permissions(mocker, app_, api_user_active, service_one): def test_route_invalid_permissions(mocker, app_, api_user_active, service_one, mock_get_organisation):
routes = [ routes = [
'main.service_settings', 'main.service_settings',
'main.service_name_change', 'main.service_name_change',
@@ -451,7 +463,7 @@ def test_route_invalid_permissions(mocker, app_, api_user_active, service_one):
service_one) service_one)
def test_route_for_platform_admin(mocker, app_, platform_admin_user, service_one): def test_route_for_platform_admin(mocker, app_, platform_admin_user, service_one, mock_get_organisation):
routes = [ routes = [
'main.service_settings', 'main.service_settings',
'main.service_name_change', 'main.service_name_change',
@@ -490,11 +502,13 @@ def test_route_for_platform_admin_update_service(mocker, app_, platform_admin_us
def test_set_reply_to_email_address( def test_set_reply_to_email_address(
app_, app_,
active_user_with_permissions, active_user_with_permissions,
mocker, mocker,
mock_update_service, mock_update_service,
service_one): service_one,
mock_get_organisation
):
with app_.test_request_context(): with app_.test_request_context():
with app_.test_client() as client: with app_.test_client() as client:
client.login(active_user_with_permissions, mocker, service_one) client.login(active_user_with_permissions, mocker, service_one)
@@ -583,14 +597,16 @@ def test_switch_service_from_research_mode_to_normal(
def test_shows_research_mode_indicator( def test_shows_research_mode_indicator(
app_, app_,
service_one, service_one,
mock_login, mock_login,
mock_get_user, mock_get_user,
active_user_with_permissions, active_user_with_permissions,
mock_get_service, mock_get_service,
mock_has_permissions, mock_has_permissions,
mocker): mock_get_organisation,
mocker
):
with app_.test_request_context(): with app_.test_request_context():
with app_.test_client() as client: with app_.test_client() as client:
service = service_json( service = service_json(
@@ -615,14 +631,16 @@ def test_shows_research_mode_indicator(
def test_does_not_show_research_mode_indicator( def test_does_not_show_research_mode_indicator(
app_, app_,
service_one, service_one,
mock_login, mock_login,
mock_get_user, mock_get_user,
active_user_with_permissions, active_user_with_permissions,
mock_get_service, mock_get_service,
mock_has_permissions, mock_has_permissions,
mocker): mock_get_organisation,
mocker
):
with app_.test_request_context(): with app_.test_request_context():
with app_.test_client() as client: with app_.test_client() as client:
client.login(active_user_with_permissions) client.login(active_user_with_permissions)
@@ -635,11 +653,13 @@ def test_does_not_show_research_mode_indicator(
def test_set_text_message_sender( def test_set_text_message_sender(
app_, app_,
active_user_with_permissions, active_user_with_permissions,
mocker, mocker,
mock_update_service, mock_update_service,
service_one): service_one,
mock_get_organisation
):
with app_.test_request_context(): with app_.test_request_context():
with app_.test_client() as client: with app_.test_client() as client:
client.login(active_user_with_permissions, mocker, service_one) client.login(active_user_with_permissions, mocker, service_one)

17
tests/conftest.py
View File

@@ -1144,3 +1144,20 @@ def mock_get_organisations(mocker):
return mocker.patch( return mocker.patch(
'app.organisations_client.get_organisations', side_effect=_get_organisations 'app.organisations_client.get_organisations', side_effect=_get_organisations
) )
@pytest.fixture(scope='function')
def mock_get_organisation(mocker):
def _get_organisation(id):
return {
'organisation': {
'logo': 'example.png',
'name': 'Organisation name',
'id': 'organisation-id',
'colour': '#f00'
}
}
return mocker.patch(
'app.organisations_client.get_organisation', side_effect=_get_organisation
)