Merge master into feature/VIBE-241-cookie-policy

Resolved conflicts:
- e2e-tests/tests/page-structure.spec.ts: Updated footer link tests to use /cookie-preferences instead of /cookie-policy
- yarn.lock: Regenerated to include latest dependencies

🤖 Generated with [Claude Code](https://claude.com/claude-code)

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

e2e-tests/tests/page-structure.spec.ts

@@ -74,34 +74,34 @@ test.describe("Page Structure - VIBE-149", () => {
       await page.goto("/");
 
       // AC8: All 8 footer links present
-      // Note: The footer has 8 links
-      const footerLinksOpenInSameTab = [
+      // Verify we have 8 footer meta links
+      const footerMetaLinks = page.locator(".govuk-footer__meta .govuk-footer__inline-list-item");
+      await expect(footerMetaLinks).toHaveCount(8);
+
+      // Links that should open in same tab
+      const sameTablLinks = [
         { text: "Help", href: "https://www.gov.uk/help" },
         { text: "Privacy policy", href: "https://www.gov.uk/help/privacy-notice" },
-        { text: "Accessibility statement", href: "/accessibility-statement" },
+        { text: "Cookies", href: "/cookie-preferences" },
         { text: "Contact us", href: "https://www.gov.uk/contact" },
         { text: "Terms and conditions", href: "https://www.gov.uk/help/terms-conditions" },
         { text: "Welsh", href: "https://www.gov.uk/cymraeg" },
         { text: "Government Digital Service", href: "https://www.gov.uk/government/organisations/government-digital-service" }
       ];
 
-      // Verify we have 8 footer meta links
-      const footerMetaLinks = page.locator(".govuk-footer__meta .govuk-footer__inline-list-item");
-      await expect(footerMetaLinks).toHaveCount(8);
-
-      // Verify links that open in same tab
-      for (const link of footerLinksOpenInSameTab) {
+      // Verify links that should open in same tab
+      for (const link of sameTablLinks) {
         const footerLink = page.locator(`.govuk-footer__link[href="${link.href}"]`).first();
         await expect(footerLink).toBeVisible({ timeout: 5000 });
         const targetAttr = await footerLink.getAttribute("target");
         expect(targetAttr).not.toBe("_blank");
       }
 
-      // Verify Cookies link opens in new tab
-      const cookiesLink = page.locator('.govuk-footer__link[href="/cookie-policy"]').first();
-      await expect(cookiesLink).toBeVisible({ timeout: 5000 });
-      await expect(cookiesLink).toHaveAttribute("target", "_blank");
-      await expect(cookiesLink).toHaveAttribute("rel", "noopener noreferrer");
+      // Accessibility statement should open in new tab
+      const accessibilityLink = page.locator('.govuk-footer__link[href="/accessibility-statement"]').first();
+      await expect(accessibilityLink).toBeVisible({ timeout: 5000 });
+      await expect(accessibilityLink).toHaveAttribute("target", "_blank");
+      await expect(accessibilityLink).toHaveAttribute("rel", "noopener noreferrer");
     });
 
     test("should display Crown copyright link", async ({ page }) => {
@@ -160,7 +160,7 @@ test.describe("Page Structure - VIBE-149", () => {
       await expect(signInLink).toHaveText("Mewngofnodi");
 
       // Verify footer links are in Welsh
-      const cookiesLink = page.locator('.govuk-footer__link[href="/cookie-policy"]');
+      const cookiesLink = page.locator('.govuk-footer__link[href="/cookie-preferences"]');
       await expect(cookiesLink).toHaveText("Cwcis");
 
       // Click language toggle to switch back to English

yarn.lock

@@ -503,10 +503,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@biomejs/cli-linux-arm64@npm:2.3.10, @biomejs/cli-linux-arm64@npm:^2.3.6":
+"@biomejs/cli-linux-arm64@npm:2.3.10":
   version: 2.3.10
   resolution: "@biomejs/cli-linux-arm64@npm:2.3.10"
-  checksum: 10c0/5467cf817b9384c713b64934e1a4c76e18f8a9cee7aec3d7d38b43982b65e3cb3a06820b1dd995ca55f85f64bf182bf76f8d8f9c85910aa96710e6ff0b479774
+  conditions: os=linux & cpu=arm64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@biomejs/cli-linux-arm64@npm:^2.3.6":
+  version: 2.3.8
+  resolution: "@biomejs/cli-linux-arm64@npm:2.3.8"
+  checksum: 10c0/1f10e8c05be93baf297ce77efb1e47e31008600f67af38886cb0c3a5b928d281c86d399fdb29caa5b0ae0216a68c7c49097c55af26e6e163c06f2b6969dfd7aa
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
@@ -5533,6 +5540,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jszip@npm:^3.10.1":
+  version: 3.10.1
+  resolution: "jszip@npm:3.10.1"
+  dependencies:
+    lie: "npm:~3.3.0"
+    pako: "npm:~1.0.2"
+    readable-stream: "npm:~2.3.6"
+    setimmediate: "npm:^1.0.5"
+  checksum: 10c0/58e01ec9c4960383fb8b38dd5f67b83ccc1ec215bf74c8a5b32f42b6e5fb79fada5176842a11409c4051b5b94275044851814a31076bf49e1be218d3ef57c863
+  languageName: node
+  linkType: hard
+
 "jwa@npm:^1.4.2":
   version: 1.4.2
   resolution: "jwa@npm:1.4.2"
@@ -5568,6 +5587,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lazystream@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "lazystream@npm:1.0.1"
+  dependencies:
+    readable-stream: "npm:^2.0.5"
+  checksum: 10c0/ea4e509a5226ecfcc303ba6782cc269be8867d372b9bcbd625c88955df1987ea1a20da4643bf9270336415a398d33531ebf0d5f0d393b9283dc7c98bfcbd7b69
+  languageName: node
+  linkType: hard
+
+"lie@npm:~3.3.0":
+  version: 3.3.0
+  resolution: "lie@npm:3.3.0"
+  dependencies:
+    immediate: "npm:~3.0.5"
+  checksum: 10c0/56dd113091978f82f9dc5081769c6f3b947852ecf9feccaf83e14a123bc630c2301439ce6182521e5fbafbde88e88ac38314327a4e0493a1bea7e0699a7af808
+  languageName: node
+  linkType: hard
+
 "limiter@npm:^1.1.5":
   version: 1.1.5
   resolution: "limiter@npm:1.1.5"