Merge branch 'master' into flexible-data-retention

tests/app/main/views/test_service_settings.py

@@ -2041,8 +2041,10 @@ def test_service_switch_can_upload_document_changes_the_permission_if_not_adding
         follow_redirects=True
     )
     page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
-
-    assert service_one['permissions'] == end_permissions
+    mock_update_service.assert_called_once_with(
+        SERVICE_ONE_ID,
+        permissions=end_permissions,
+    )
     assert page.h1.text.strip() == 'Settings'
 
 
@@ -2082,7 +2084,7 @@ def test_service_switch_can_upload_document_lets_contact_link_be_added_and_switc
     )
     page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
 
-    assert 'upload_document' in service_one['permissions']
+    assert 'upload_document' in mock_update_service.call_args[1]['permissions']
     assert page.h1.text.strip() == 'Settings'
 
 
@@ -2451,6 +2453,7 @@ def test_update_basic_view(
 def test_preview_basic_view(
     client_request,
     mock_get_service_templates,
+    mock_has_no_jobs,
 ):
     page = client_request.get(
         "main.preview_basic_view",
@@ -2461,7 +2464,7 @@ def test_preview_basic_view(
     with client_request.session_transaction() as session:
         assert session['basic'] is True
 
-    assert page.h1.text.strip() == 'Choose a template'
+    assert page.h1.text.strip() == 'Templates'
     page.select('.navigation-service-basic-view-preview')
     assert normalize_spaces(page.select_one('.navigation-service').text) == (
         'service one '
@@ -2486,6 +2489,7 @@ def test_preview_basic_view(
 def test_cant_preview_basic_view_for_another_service(
     client_request,
     mock_get_service_templates,
+    mock_has_no_jobs,
     fake_uuid,
 ):
     client_request.get(