More fixes for creating the site and running tests

README.md

@@ -116,6 +116,9 @@ variables or in a `.env` file, see `.env.example`:
 cp .env.example .env
 ```
 
+Note: if you change anything to the `create_site.py` script, you must remove the
+`matomoaitracker-plone` image, otherwise this has no effect.
+
 Simulate an AI chatbot visit, and see what reached the fake Matomo a few seconds
 later:
 

scripts/create_site.py

@@ -104,6 +104,10 @@ def asbool(s):
     installer = get_installer(site)
     if not installer.is_product_installed("plone.app.caching"):
         installer.install_product("plone.app.caching")
+        # Apply the with-caching-proxy settings.
+        site.portal_setup.runAllImportStepsFromProfile(
+            "profile-plone.app.caching:with-caching-proxy"
+        )
     site.portal_setup.upgradeProfile("plone.app.caching:default")
     prefix = "plone.cachepurging.interfaces.ICachePurgingSettings"
     registry[f"{prefix}.enabled"] = True

tests/stack/conftest.py

@@ -89,7 +89,7 @@ def caching_policy(request, stack):
     if request.param == "moderate":
         original_mapping = stack.registry_get(OPERATION_MAPPING)
         original_smaxage = stack.registry_get(MODERATE_SMAXAGE)
-        mapping = dict(original_mapping)
+        mapping = dict(original_mapping) if original_mapping is not None else {}
         for rule in ("plone.content.folderView", "plone.content.itemView"):
             mapping[rule] = "plone.app.caching.moderateCaching"
         stack.registry_set({OPERATION_MAPPING: mapping, MODERATE_SMAXAGE: SMAXAGE})