-
+
{% endblock %}
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 60b66f28a..a27093059 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -74,6 +74,7 @@ gulp.task('javascripts', () => gulp
paths.src + 'javascripts/preventDuplicateFormSubmissions.js',
paths.src + 'javascripts/fullscreenTable.js',
paths.src + 'javascripts/conditionalRadios.js',
+ paths.src + 'javascripts/emailPreviewPane.js',
paths.src + 'javascripts/main.js'
])
.pipe(plugins.prettyerror())
diff --git a/tests/app/main/views/test_email_preview.py b/tests/app/main/views/test_email_preview.py
index 5b7923ce6..3d8fc34f7 100644
--- a/tests/app/main/views/test_email_preview.py
+++ b/tests/app/main/views/test_email_preview.py
@@ -1,4 +1,7 @@
+import re
+
import pytest
+from bs4 import BeautifulSoup
from flask import url_for
@@ -10,11 +13,73 @@ 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)
+
+
+def test_displays_govuk_branding_by_default(client):
+
+ response = client.get(url_for('main.email_template'))
+
+ page = BeautifulSoup(response.data.decode("utf-8"), "html.parser")
+
+ assert response.status_code == 200
+
+ assert page.find("a", attrs={"href": "https://www.gov.uk"})
+
+
+def test_displays_govuk_branding(client):
+
+ response = client.get(url_for('main.email_template', branding_type="govuk", branding_style="1"))
+
+ page = BeautifulSoup(response.data.decode("utf-8"), "html.parser")
+
+ assert response.status_code == 200
+
+ assert page.find("a", attrs={"href": "https://www.gov.uk"})
+
+
+def test_displays_both_branding(client, mock_get_email_branding):
+
+ response = client.get(url_for('main.email_template', branding_type="both", branding_style="1"))
+
+ page = BeautifulSoup(response.data.decode("utf-8"), "html.parser")
+
+ assert response.status_code == 200
+ mock_get_email_branding.assert_called_once_with('1')
+
+ assert page.find("a", attrs={"href": "https://www.gov.uk"})
+ assert page.find("img", attrs={"src": re.compile("example.png$")})
+
+
+def test_displays_org_branding(client, mock_get_email_branding):
+
+ response = client.get(url_for('main.email_template', branding_type="org", branding_style="1"))
+
+ page = BeautifulSoup(response.data.decode("utf-8"), "html.parser")
+
+ assert response.status_code == 200
+ mock_get_email_branding.assert_called_once_with('1')
+
+ assert not page.find("a", attrs={"href": "https://www.gov.uk"})
+ assert page.find("img", attrs={"src": re.compile("example.png")})
+ assert not page.select("body > table > tr > td[bgcolor='#f00']")
+
+
+def test_displays_org_branding_with_banner(client, mock_get_email_branding):
+
+ response = client.get(url_for('main.email_template', branding_type="org_banner",
+ branding_style="1"))
+
+ page = BeautifulSoup(response.data.decode("utf-8"), "html.parser")
+
+ assert response.status_code == 200
+ mock_get_email_branding.assert_called_once_with('1')
+
+ assert not page.find("a", attrs={"href": "https://www.gov.uk"})
+ assert page.find("img", attrs={"src": re.compile("example.png")})
+ assert page.select("body > table > tr > td[bgcolor='#f00']")
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..45cacf614 100644
--- a/tests/app/main/views/test_service_settings.py
+++ b/tests/app/main/views/test_service_settings.py
@@ -1769,7 +1769,7 @@ def test_should_show_organisations(
app.service_api_client.get_service.assert_called_once_with(service_one['id'])
-def test_should_set_branding_and_organisations(
+def test_should_send_branding_and_organisations_to_preview(
logged_in_platform_admin_client,
service_one,
mock_get_all_email_branding,
@@ -1781,17 +1781,58 @@ def test_should_set_branding_and_organisations(
),
data={
'branding_type': 'org',
- 'organisation': '1'
+ 'branding_style': '1'
}
)
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'], branding_type='org',
+ branding_style='1', _external=True)
mock_get_all_email_branding.assert_called_once_with()
+
+
+def test_should_preview_email_branding(
+ logged_in_platform_admin_client,
+ service_one,
+):
+ response = logged_in_platform_admin_client.get(url_for(
+ 'main.service_preview_email_branding', service_id=service_one['id'],
+ branding_type='org', branding_style='1'
+ ))
+ assert response.status_code == 200
+ page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
+ iframe = page.find('iframe', attrs={"class": "email-branding-preview"})
+
+ assert page.find('input', attrs={"id": "branding_type"})['value'] == 'org'
+ assert page.find('input', attrs={"id": "branding_style"})['value'] == '1'
+ assert iframe and iframe['src'] == '/_email?branding_type=org&branding_style=1'
+
+ app.service_api_client.get_service.assert_called_once_with(service_one['id'])
+
+
+def test_should_set_branding_and_organisations(
+ logged_in_platform_admin_client,
+ service_one,
+ mock_update_service,
+):
+ response = logged_in_platform_admin_client.post(
+ url_for(
+ 'main.service_preview_email_branding', service_id=service_one['id']
+ ),
+ data={
+ 'branding_type': 'org',
+ 'branding_style': '1'
+ }
+ )
+ assert response.status_code == 302
+ assert response.location == url_for('main.service_settings',
+ service_id=service_one['id'], _external=True)
+
mock_update_service.assert_called_once_with(
service_one['id'],
branding='org',
- email_branding=None
+ email_branding='1'
)