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

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)

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;"
     )

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(