Cookie streamlining (#493)

* remove cookie banner
* remove form from cookies.html
* move cookie content to privacy page

tests/app/main/test_errorhandlers.py

@@ -46,7 +46,7 @@ def test_csrf_returns_400(client_request, mocker):
     mocker.patch('app.main.views.index.render_template', side_effect=csrf_err)
 
     page = client_request.get_url(
-        '/cookies',
+        '/privacy',
         _expected_status=400,
         _test_page_title=False,
     )
@@ -61,8 +61,8 @@ def test_csrf_redirects_to_sign_in_page_if_not_signed_in(client_request, mocker)
 
     client_request.logout()
     client_request.get_url(
-        '/cookies',
-        _expected_redirect=url_for('main.sign_in', next='/cookies'),
+        '/privacy',
+        _expected_redirect=url_for('main.sign_in', next='/privacy'),
     )
 
 

tests/app/main/views/service_settings/test_service_settings.py

@@ -3483,7 +3483,7 @@ def test_send_files_by_email_contact_details_page(
     page = client_request.get(
         'main.send_files_by_email_contact_details', service_id=SERVICE_ONE_ID
     )
-    assert normalize_spaces(page.find_all('h2')[1].text) == subheader
+    assert normalize_spaces(page.find_all('h2')[0].text) == subheader
     if button_selected:
         assert 'checked' in page.find('input', {'name': 'contact_details_type', 'value': 'email_address'}).attrs
     else:

tests/app/main/views/test_index.py

@@ -91,7 +91,7 @@ def test_hiding_pages_from_search_engines(
 
 
 @pytest.mark.parametrize('view', [
-    'cookies', 'privacy', 'pricing', 'terms', 'roadmap',
+    'privacy', 'pricing', 'terms', 'roadmap',
     'features', 'documentation', 'security',
     'message_status', 'features_email', 'features_sms',
     'how_to_pay', 'get_started',

tests/app/test_navigation.py

@@ -52,7 +52,6 @@ EXCLUDED_ENDPOINTS = tuple(map(Navigation.get_endpoint_with_blueprint, {
     'conversation_reply',
     'conversation_reply_with_template',
     'conversation_updates',
-    'cookies',
     'copy_template',
     'count_content_length',
     'create_and_send_messages',