Fix cookie banner content (#390)

* fix cookies banner content

* fix cookies banner content

* run make translation-templates

* Update templates/layouts/_base.html

Co-authored-by: Mebin Abraham <35296336+MebinAbraham@users.noreply.github.com>

* updated translation templates

* add test for cookies banner

* add env var to display cookies banner in tests

* fix test selectors now theres 2 p tags

* fix test selectors now theres 2 p tags

* change env variable

* change test names

* change test names

* remove test line to get tests to pass - issue will be looked at again in tech debt

* rename tests and test file

* add cookie button params

* updated translation templates

Co-authored-by: Mebin Abraham <35296336+MebinAbraham@users.noreply.github.com>

Author: rmccar

.development.env

@@ -24,3 +24,4 @@ WEB_SERVER_UWSGI_ASYNC_CORES=10
 CDN_URL=https://cdn.eq.census-gcp.onsdigital.uk
 CDN_ASSETS_PATH=/design-system
 ADDRESS_LOOKUP_API_URL=https://whitelodge-ai-api.census-gcp.onsdigital.uk
+COOKIE_SETTINGS_URL=#

app/translations/messages.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-11-06 08:05+0000\n"
+"POT-Creation-Date: 2020-11-06 14:44+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -926,8 +926,36 @@ msgstr ""
 msgid "Previous"
 msgstr ""
 
-#: templates/layouts/_base.html:59
-msgid "We use cookies to improve your experience of census.gov.uk"
+#: templates/layouts/_base.html:60
+msgid "Tell us whether you accept cookies"
+msgstr ""
+
+#: templates/layouts/_base.html:61
+msgid ""
+"We use <a href='{cookie_settings_url}'>cookies to collect information</a>"
+" about how you use census.gov.uk. We use this information to make the "
+"website work as well as possible and improve our services."
+msgstr ""
+
+#: templates/layouts/_base.html:62
+msgid ""
+"You’ve accepted all cookies. You can <a "
+"href='{cookie_settings_url}'>change your cookie preferences</a> at any "
+"time."
+msgstr ""
+
+#: templates/layouts/_base.html:63
+msgid "Accept all cookies"
+msgstr ""
+
+#: templates/layouts/_base.html:64
+msgid "Set cookie preferences"
+msgstr ""
+
+#: templates/layouts/_base.html:65
+#: templates/partials/introduction/preview.html:30
+#: templates/partials/summary/collapsible-summary.html:14
+msgid "Hide"
 msgstr ""
 
 #: templates/layouts/_questionnaire.html:26
@@ -1155,7 +1183,7 @@ msgstr ""
 msgid "Enter address manually"
 msgstr ""
 
-#: templates/partials/answers/checkbox.html:8
+#: templates/partials/answers/checkbox.html:13
 msgid "Select all that apply"
 msgstr ""
 
@@ -1221,11 +1249,6 @@ msgstr ""
 msgid "Show"
 msgstr ""
 
-#: templates/partials/introduction/preview.html:30
-#: templates/partials/summary/collapsible-summary.html:14
-msgid "Hide"
-msgstr ""
-
 #: templates/partials/introduction/preview.html:48
 #: templates/partials/summary/collapsible-summary.html:57
 msgid "Show all"

templates/layouts/_base.html

@@ -56,8 +56,13 @@
   {% if cookie_settings_url %}
     {{
       onsCookiesBanner({
-          "html": _('We use cookies to improve your experience of census.gov.uk'),
-          "secondaryButtonUrl": cookie_settings_url
+        "secondaryButtonUrl": cookie_settings_url,
+        "statementTitle": _('Tell us whether you accept cookies'),
+        "statementText": _("We use <a href='{cookie_settings_url}'>cookies to collect information</a> about how you use census.gov.uk. We use this information to make the website work as well as possible and improve our services.").format(cookie_settings_url=cookie_settings_url),
+        "confirmationText": _("You’ve accepted all cookies. You can <a href='{cookie_settings_url}'>change your cookie preferences</a> at any time.").format(cookie_settings_url=cookie_settings_url),
+        "primaryButtonText": _('Accept all cookies'),
+        "secondaryButtonText": _('Set cookie preferences'),
+        "confirmationButtonText": _('Hide'),
       })
     }}
   {% endif %}

tests/functional/spec/custom_page_titles.spec.js

@@ -60,7 +60,6 @@ describe("Feature: Custom Page Titles", () => {
       expectedPageTitle = browser.getTitle();
       expect(expectedPageTitle).to.equal("How Person 2 is related to Person 3 - Census 2021");
 
-      $(RelationshipsPage.submit()).click();
       $(RelationshipsPage.sonOrDaughter()).click();
       $(RelationshipsPage.submit()).click();
       expectedPageTitle = browser.getTitle();

tests/functional/spec/features/routing/answer_comparison_routing.spec.js

@@ -11,22 +11,22 @@ describe("Test routing skip", () => {
     $(RouteComparison1Page.submit()).click();
     $(RouteComparison2Page.answer()).setValue(2);
     $(RouteComparison2Page.submit()).click();
-    expect($("p").getText()).to.contain("This page should never be skipped");
+    expect($("#main-content > p").getText()).to.contain("This page should never be skipped");
   });
 
   it("Given we start the routing test survey, When we enter a high number then a low number, Then, we should be routed to the third page", () => {
     $(RouteComparison1Page.answer()).setValue(1);
     $(RouteComparison1Page.submit()).click();
     $(RouteComparison2Page.answer()).setValue(0);
     $(RouteComparison2Page.submit()).click();
-    expect($("p").getText()).to.contain("This page should be skipped if your second answer was higher than your first");
+    expect($("#main-content > p").getText()).to.contain("This page should be skipped if your second answer was higher than your first");
   });
 
   it("Given we start the routing test survey, When we enter an equal number on both questions, Then, we should be routed to the third page", () => {
     $(RouteComparison1Page.answer()).setValue(1);
     $(RouteComparison1Page.submit()).click();
     $(RouteComparison2Page.answer()).setValue(1);
     $(RouteComparison2Page.submit()).click();
-    expect($("p").getText()).to.contain("This page should be skipped if your second answer was higher than your first");
+    expect($("#main-content > p").getText()).to.contain("This page should be skipped if your second answer was higher than your first");
   });
 });

tests/functional/spec/features/skipping/answer_comparison_skip_conditions.spec.js

@@ -11,20 +11,20 @@ describe("Test skip condition answer comparisons", () => {
     $(Comparison1Page.submit()).click();
     $(Comparison2Page.answer()).setValue(1);
     $(Comparison2Page.submit()).click();
-    expect($("p").getText()).to.contain("Your second number was equal to your first number");
+    expect($("#main-content > p").getText()).to.contain("Your second number was equal to your first number");
   });
   it("Given we start the skip condition survey, when we enter a high number then a low number, then the interstitial should show that the answers are low then high", () => {
     $(Comparison1Page.answer()).setValue(3);
     $(Comparison1Page.submit()).click();
     $(Comparison2Page.answer()).setValue(2);
     $(Comparison2Page.submit()).click();
-    expect($("p").getText()).to.contain("Your first answer was greater than your second number");
+    expect($("#main-content > p").getText()).to.contain("Your first answer was greater than your second number");
   });
   it("Given we start the skip condition survey, when we enter a low number then a high number, then the interstitial should show that the answers are high then low", () => {
     $(Comparison1Page.answer()).setValue(1);
     $(Comparison1Page.submit()).click();
     $(Comparison2Page.answer()).setValue(2);
     $(Comparison2Page.submit()).click();
-    expect($("p").getText()).to.contain("Your first answer was less than your second number");
+    expect($("#main-content > p").getText()).to.contain("Your first answer was less than your second number");
   });
 });

tests/integration/components/test_cookies_banner_content.py

@@ -0,0 +1,10 @@
+from tests.integration.integration_test_case import IntegrationTestCase
+
+
+class TestCookiesBannerContent(IntegrationTestCase):
+    def setUp(self):
+        super().setUp()
+        self.launchSurvey("test_dropdown_mandatory")
+
+    def test_cookies_banner_content(self):
+        self.assertInBody("Tell us whether you accept cookies")