From eb72f43b3f125769796f4cee5ee0a5af4bdcf17d Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Fri, 3 Aug 2018 17:39:58 +0100 Subject: [PATCH] Fixes for tests broken by changes - corrects target page for set_email_branding to new preview step instead of itself - removed check for helper method being called in email page test - updates expected result for test of global headers to include changes to `frame-src` - updates navigation config with brand preview page --- app/navigation.py | 4 ++++ tests/app/main/views/test_email_preview.py | 2 -- tests/app/main/views/test_headers.py | 4 ++-- tests/app/main/views/test_service_settings.py | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/navigation.py b/app/navigation.py index ebc917a93..b4467cdcf 100644 --- a/app/navigation.py +++ b/app/navigation.py @@ -218,6 +218,7 @@ class HeaderNavigation(Navigation): 'service_letter_contact_details', 'service_name_change', 'service_name_change_confirm', + 'service_preview_email_branding', 'service_set_auth_type', 'service_set_basic_view', 'service_set_contact_link', @@ -339,6 +340,7 @@ class MainNavigation(Navigation): 'service_letter_contact_details', 'service_name_change', 'service_name_change_confirm', + 'service_preview_email_branding', 'service_set_auth_type', 'service_set_basic_view', 'service_set_contact_link', @@ -661,6 +663,7 @@ class CaseworkNavigation(Navigation): 'service_letter_contact_details', 'service_name_change', 'service_name_change_confirm', + 'service_preview_email_branding', 'service_set_auth_type', 'service_set_basic_view', 'service_set_contact_link', @@ -887,6 +890,7 @@ class OrgNavigation(Navigation): 'service_letter_contact_details', 'service_name_change', 'service_name_change_confirm', + 'service_preview_email_branding', 'service_set_auth_type', 'service_set_basic_view', 'service_set_contact_link', diff --git a/tests/app/main/views/test_email_preview.py b/tests/app/main/views/test_email_preview.py index 5b7923ce6..05fb3f32b 100644 --- a/tests/app/main/views/test_email_preview.py +++ b/tests/app/main/views/test_email_preview.py @@ -10,11 +10,9 @@ from flask import url_for ) def test_renders(client, mocker, query_args, result): - mock_convert_to_boolean = mocker.patch('app.main.views.index.convert_to_boolean') mocker.patch('app.main.views.index.HTMLEmailTemplate.__str__', return_value='rendered') response = client.get(url_for('main.email_template', **query_args)) assert response.status_code == 200 assert response.get_data(as_text=True) == 'rendered' - mock_convert_to_boolean.assert_called_once_with(result) diff --git a/tests/app/main/views/test_headers.py b/tests/app/main/views/test_headers.py index 94558d431..1ef2a794c 100644 --- a/tests/app/main/views/test_headers.py +++ b/tests/app/main/views/test_headers.py @@ -14,7 +14,7 @@ def test_owasp_useful_headers_set(client, mocker): "object-src 'self';" "font-src 'self' data:;" "img-src 'self' *.google-analytics.com *.notifications.service.gov.uk static-logos.test.com data:;" - "frame-src www.youtube.com;" + "frame-src 'self' www.youtube.com;" ) @@ -31,5 +31,5 @@ def test_headers_non_ascii_characters_are_replaced(client, mocker): "object-src 'self';" "font-src 'self' data:;" "img-src 'self' *.google-analytics.com *.notifications.service.gov.uk static-logos??.test.com data:;" - "frame-src www.youtube.com;" + "frame-src 'self' www.youtube.com;" ) diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py index 812891bb5..87feb5b66 100644 --- a/tests/app/main/views/test_service_settings.py +++ b/tests/app/main/views/test_service_settings.py @@ -1785,7 +1785,8 @@ def test_should_set_branding_and_organisations( } ) assert response.status_code == 302 - assert response.location == url_for('main.service_settings', service_id=service_one['id'], _external=True) + assert response.location == url_for('main.service_preview_email_branding', + service_id=service_one['id'], _external=True) mock_get_all_email_branding.assert_called_once_with() mock_update_service.assert_called_once_with(