New cookie consent for Clarity and VWO cookies

DFE-Digital · Oct 24, 2024 · c8d6b88 · c8d6b88
1 parent 6278337
commit c8d6b88
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -41,7 +41,7 @@ def not_found(_error = nil)
   private
 
   def show_cookies_banner?
-    cookies["consented-to-additional-cookies"].blank?
+    cookies["consented-to-additional-cookies-clarity-vwo"].blank?
   end
   helper_method :show_cookies_banner?
 

diff --git a/app/controllers/cookies_preferences_controller.rb b/app/controllers/cookies_preferences_controller.rb
@@ -2,14 +2,14 @@ class CookiesPreferencesController < ApplicationController
   before_action :set_previous_url_in_session
 
   def new
-    @cookies_preferences_form = CookiesPreferencesForm.new(cookies_consent: cookies["consented-to-additional-cookies"])
+    @cookies_preferences_form = CookiesPreferencesForm.new(cookies_consent: cookies["consented-to-additional-cookies-clarity-vwo"])
   end
 
   def create
     @cookies_preferences_form = CookiesPreferencesForm.new(cookies_preferences_params)
 
     if @cookies_preferences_form.valid?
-      cookies["consented-to-additional-cookies"] = { value: @cookies_preferences_form.cookies_consent,
+      cookies["consented-to-additional-cookies-clarity-vwo"] = { value: @cookies_preferences_form.cookies_consent,
                                                      expires: 6.months.from_now }
 
       redirect_to(session[:previous_url], success: I18n.t("cookies_preferences.success")) unless params[:no_redirect]

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -36,6 +36,6 @@ def footer_links
   end
 
   def include_google_tag_manager?
-    cookies["consented-to-additional-cookies"] == "yes" && Rails.configuration.app_role.production?
+    cookies["consented-to-additional-cookies-clarity-vwo"] == "yes" && Rails.configuration.app_role.production?
   end
 end
diff --git a/backstop/lib/playwright/loadCookies.cjs b/backstop/lib/playwright/loadCookies.cjs
@@ -13,7 +13,7 @@ module.exports = async (browserContext, scenario, consent = true) => {
 
   if (consent) {
     cookies.push({
-      "name": "consented-to-additional-cookies",
+      "name": "consented-to-additional-cookies-clarity-vwo",
       "value": "yes",
       "domain": url.host,
       "path": "/",

diff --git a/config/locales/cookies_preferences.yml b/config/locales/cookies_preferences.yml
@@ -91,7 +91,7 @@ en:
           We also use additional cookies to measure how you use the service and to help us with our marketing and communications.
 
       heading: Cookies on Teaching Vacancies
-      subheading: 
+      subheading:
         settings: Cookie settings
         additional: Additional cookies settings
       title: Cookies

diff --git a/spec/requests/cookies_preferences_spec.rb b/spec/requests/cookies_preferences_spec.rb
@@ -11,7 +11,7 @@
   describe "POST #create" do
     it "sets cookie value" do
       post create_cookies_preferences_path, params: { cookies_consent: "yes" }
-      expect(response.cookies["consented-to-additional-cookies"]).to eq("yes")
+      expect(response.cookies["consented-to-additional-cookies-clarity-vwo"]).to eq("yes")
     end
   end
 end
diff --git a/spec/system/other/cookies_banner_spec.rb b/spec/system/other/cookies_banner_spec.rb
@@ -26,7 +26,7 @@ def set_cookie(name, value)
 
   context "when user has set their cookies preferences" do
     before do
-      set_cookie("consented-to-additional-cookies", "yes")
+      set_cookie("consented-to-additional-cookies-clarity-vwo", "yes")
     end
 
     scenario "does not display the cookies banner" do