Merge pull request #1354 from uktrade/GP2-2835--disable-homepage-cache

Reverting disable homepage cache and removed cache middleware

config/settings.py

@@ -79,7 +79,6 @@
 ]
 
 MIDDLEWARE = [
-    'wagtailcache.cache.UpdateCacheMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
@@ -93,7 +92,6 @@
     'core.middleware.UserSpecificRedirectMiddleware',
     'core.middleware.UserLocationStoreMiddleware',
     'core.middleware.StoreUserExpertiseMiddleware',
-    'wagtailcache.cache.FetchFromCacheMiddleware',
     'core.middleware.CheckGATags',
 ]
 

domestic/models.py

@@ -16,7 +16,6 @@
 from wagtail.core.models import Page
 from wagtail.images import get_image_model_string
 from wagtail.images.edit_handlers import ImageChooserPanel
-from wagtailcache.cache import WagtailCacheMixin
 
 from core import (
     blocks as core_blocks,
@@ -136,7 +135,6 @@ class DomesticHomePage(
     mixins.EnableTourMixin,
     mixins.AnonymousUserRequired,
     DataLayerMixin,
-    WagtailCacheMixin,
     Page,
 ):
     # Note that this is was the original homepage for Magna/V2 MPV.
@@ -163,10 +161,6 @@ class DomesticHomePage(
         ImageChooserPanel('image'),
     ]
 
-    # Deliberately asking wagtail not to cache homepage
-    def cache_control(self):
-        return 'no-cache'
-
 
 class DomesticDashboard(
     mixins.WagtailAdminExclusivePageMixin,

tests/unit/domestic/test_models.py

@@ -1804,30 +1804,3 @@ def test_allowed_parents(self):
                 GreatDomesticHomePage,
             },
         )
-
-
-@pytest.mark.django_db
-def test_great_domestic_homepage_header_cache(root_page, client, user):
-
-    homepage = GreatDomesticHomePageFactory(
-        parent=root_page,
-        slug='root',
-    )
-
-    SiteFactory(
-        root_page=homepage,
-        hostname=client._base_environ()['SERVER_NAME'],
-    )
-
-    for user_logged_in in (False, True):
-
-        if user_logged_in:
-            client.force_login(user)
-
-        response = client.get(homepage.url)
-
-        assert response.has_header('Cache-Control') is True
-        assert response.get('Cache-Control') == 'no-cache'
-
-        assert response.has_header('X-Wagtail-Cache') is True
-        assert response.get('X-Wagtail-Cache') == 'skip'