Post-merge fixes: Wagtail API arg order, turnstile rename, alembic merge head

- place/portal generateMetadata used the legacy getCMSContent(slug, lang, type)
  arg order and published_content shape; align with the Wagtail client
- TestReviewTagScoping still sent recaptcha_token (renamed to turnstile_token on dev)
- test_config monkeypatched ACCOUNT_ID, which no longer exists in Settings
- alembic merge revision for the dev + wagtail-cutover heads

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

Author: nofurtherinformation

app/src/app/(static)/place/[slug]/page.tsx

@@ -12,8 +12,8 @@ export const revalidate = 3600;
 export async function generateMetadata({params}: {params: Promise<{slug: string}>}) {
   const [{slug}, userCookies] = await Promise.all([params, cookies()]);
   const language = userCookies.get('language')?.value ?? 'en';
-  const cmsData = await getCMSContent(slug, language, 'places').catch(() => null);
-  const title = cmsData?.content?.published_content?.title;
+  const cmsData = await getCMSContent('places', slug, language).catch(() => null);
+  const title = cmsData?.content?.title;
   return title ? {title, description: `Draw and explore districting maps for ${title}`} : {};
 }
 

app/src/app/(static)/portal/[slug]/page.tsx

@@ -11,8 +11,8 @@ export const revalidate = 3600;
 export async function generateMetadata({params}: {params: Promise<{slug: string}>}) {
   const [{slug}, userCookies] = await Promise.all([params, cookies()]);
   const language = userCookies.get('language')?.value ?? 'en';
-  const cmsData = await getCMSContent(slug, language, 'tags').catch(() => null);
-  const title = cmsData?.content?.published_content?.title;
+  const cmsData = await getCMSContent('tags', slug, language).catch(() => null);
+  const title = cmsData?.content?.title;
   return title ? {title} : {};
 }
 

backend/app/alembic/versions/ba6fafe520dc_merge_dev_and_wagtail_cutover_heads.py

@@ -0,0 +1,26 @@
+"""merge dev and wagtail-cutover heads
+
+Revision ID: ba6fafe520dc
+Revises: a1c4d2e9b7f3, a30db9686b7c
+Create Date: 2026-08-04 19:06:23.398536
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'ba6fafe520dc'
+down_revision: Union[str, None] = ('a1c4d2e9b7f3', 'a30db9686b7c')
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    pass
+
+
+def downgrade() -> None:
+    pass

backend/tests/test_comments.py

@@ -1441,7 +1441,7 @@ def _make_comment(self, client, title: str, tags: list[str]) -> dict:
             "commenter": {"first_name": "Scoped", "email": "scoped@example.com"},
             "comment": {"title": title, "comment": f"{title} body."},
             "tags": [{"tag": tag} for tag in tags],
-            "recaptcha_token": "test_token",
+            "turnstile_token": "test_token",
         }
         response = client.post("/api/comments/submit", json=form_data)
         assert response.status_code == 201

backend/tests/test_config.py

@@ -54,7 +54,6 @@ def test_get_s3_client_static_keys_take_precedence(monkeypatch):
     monkeypatch.setattr(settings, "AWS_ACCESS_KEY_ID", "test-key")
     monkeypatch.setattr(settings, "AWS_SECRET_ACCESS_KEY", "test-secret")
     monkeypatch.setattr(settings, "AWS_USE_DEFAULT_CREDENTIALS", True)
-    monkeypatch.setattr(settings, "ACCOUNT_ID", None)
 
     client = settings.get_s3_client()