From 33b2c081e01dc601130eb36cc8cddb7c50a7dec2 Mon Sep 17 00:00:00 2001 From: Andrew Hosgood Date: Fri, 26 Jan 2024 16:59:35 +0000 Subject: [PATCH 1/2] Fix cookie path in examples --- .../components/cookie-banner/cookie-banner.stories.js | 6 ++++++ .../utilities/colour-schemes/colour-themes.stories.js | 1 + src/nationalarchives/templates/layouts/_generic.njk | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/nationalarchives/components/cookie-banner/cookie-banner.stories.js b/src/nationalarchives/components/cookie-banner/cookie-banner.stories.js index 7ae083a4..07298faf 100644 --- a/src/nationalarchives/components/cookie-banner/cookie-banner.stories.js +++ b/src/nationalarchives/components/cookie-banner/cookie-banner.stories.js @@ -63,6 +63,7 @@ const Template = ({ export const Standard = Template.bind({}); Standard.args = { cookiesUrl: "#", + cookiesPath: "/tna-frontend/", classes: "tna-cookie-banner--demo", }; @@ -70,6 +71,7 @@ export const Accept = Template.bind({}); Accept.args = { serviceName: "My service", cookiesUrl: "#", + cookiesPath: "/tna-frontend/", allowInsecure: true, style: "contrast", classes: "tna-cookie-banner--demo", @@ -112,6 +114,7 @@ export const Reject = Template.bind({}); Reject.args = { serviceName: "My service", cookiesUrl: "#", + cookiesPath: "/tna-frontend/", style: "contrast", classes: "tna-cookie-banner--demo", }; @@ -149,6 +152,7 @@ export const CustomPolicies = Template.bind({}); CustomPolicies.args = { serviceName: "My service", cookiesUrl: "#", + cookiesPath: "/tna-frontend/", policies: "custom", style: "contrast", classes: "tna-cookie-banner--demo", @@ -185,6 +189,7 @@ export const Existing = Template.bind({}); Existing.args = { serviceName: "My service", cookiesUrl: "#", + cookiesPath: "/tna-frontend/", allowInsecure: true, style: "contrast", classes: "tna-cookie-banner--demo", @@ -221,6 +226,7 @@ Existing.play = async ({ canvasElement }) => { // EventHandling.args = { // serviceName: "My service", // cookiesUrl: "#", +// cookiesPath: "/tna-frontend/", // policies: "custom", // classes: "tna-cookie-banner--demo", // }; diff --git a/src/nationalarchives/stories/utilities/colour-schemes/colour-themes.stories.js b/src/nationalarchives/stories/utilities/colour-schemes/colour-themes.stories.js index ebbfad57..a0748b57 100644 --- a/src/nationalarchives/stories/utilities/colour-schemes/colour-themes.stories.js +++ b/src/nationalarchives/stories/utilities/colour-schemes/colour-themes.stories.js @@ -96,6 +96,7 @@ const Template = ({ theme, accent }) => { ${CookieBanner({ params: { cookiesUrl: "#", + cookiesPath: "/tna-frontend/", }, })} --> diff --git a/src/nationalarchives/templates/layouts/_generic.njk b/src/nationalarchives/templates/layouts/_generic.njk index 19711413..0f73497c 100644 --- a/src/nationalarchives/templates/layouts/_generic.njk +++ b/src/nationalarchives/templates/layouts/_generic.njk @@ -45,7 +45,8 @@ {% block bodyStart %} {% block cookies %} {{ tnaCookieBanner({ - url: '#' + cookiesUrl: '#', + cookiesPath: "/tna-frontend/" }) }} {% endblock %} From c57b9dde751ef93cda0ce291fcb60a66074053ed Mon Sep 17 00:00:00 2001 From: Andrew Hosgood Date: Fri, 26 Jan 2024 17:11:05 +0000 Subject: [PATCH 2/2] Fix broken tests --- .../components/cookie-banner/cookie-banner.stories.js | 6 ++---- .../utilities/colour-schemes/colour-themes.stories.js | 9 --------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/nationalarchives/components/cookie-banner/cookie-banner.stories.js b/src/nationalarchives/components/cookie-banner/cookie-banner.stories.js index 07298faf..e719f47a 100644 --- a/src/nationalarchives/components/cookie-banner/cookie-banner.stories.js +++ b/src/nationalarchives/components/cookie-banner/cookie-banner.stories.js @@ -71,7 +71,6 @@ export const Accept = Template.bind({}); Accept.args = { serviceName: "My service", cookiesUrl: "#", - cookiesPath: "/tna-frontend/", allowInsecure: true, style: "contrast", classes: "tna-cookie-banner--demo", @@ -108,13 +107,14 @@ Accept.play = async ({ canvasElement }) => { // await userEvent.click(closeButton); // await expect(closeButton).not.toBeVisible(); + + await cookies.deleteAll(); }; export const Reject = Template.bind({}); Reject.args = { serviceName: "My service", cookiesUrl: "#", - cookiesPath: "/tna-frontend/", style: "contrast", classes: "tna-cookie-banner--demo", }; @@ -152,7 +152,6 @@ export const CustomPolicies = Template.bind({}); CustomPolicies.args = { serviceName: "My service", cookiesUrl: "#", - cookiesPath: "/tna-frontend/", policies: "custom", style: "contrast", classes: "tna-cookie-banner--demo", @@ -189,7 +188,6 @@ export const Existing = Template.bind({}); Existing.args = { serviceName: "My service", cookiesUrl: "#", - cookiesPath: "/tna-frontend/", allowInsecure: true, style: "contrast", classes: "tna-cookie-banner--demo", diff --git a/src/nationalarchives/stories/utilities/colour-schemes/colour-themes.stories.js b/src/nationalarchives/stories/utilities/colour-schemes/colour-themes.stories.js index a0748b57..0625364b 100644 --- a/src/nationalarchives/stories/utilities/colour-schemes/colour-themes.stories.js +++ b/src/nationalarchives/stories/utilities/colour-schemes/colour-themes.stories.js @@ -5,7 +5,6 @@ import Card from "../../../components/card/template.njk"; import Checkboxes from "../../../components/checkboxes/template.njk"; import FeaturedRecords from "../../../components/featured-records/template.njk"; import Footer from "../../../components/footer/template.njk"; -import CookieBanner from "../../../components/cookie-banner/template.njk"; import Gallery from "../../../components/gallery/template.njk"; import Header from "../../../components/header/template.njk"; import Hero from "../../../components/hero/template.njk"; @@ -92,14 +91,6 @@ const Template = ({ theme, accent }) => { : "" }">
- ${SkipLink({ params: { href: "main-content",