From 15dd0734a2efbdc9d9c05194c13f1d7826faa32b Mon Sep 17 00:00:00 2001
From: David Lawrence <dkl@mozilla.com>
Date: Thu, 2 Jan 2025 22:30:47 -0500
Subject: [PATCH 1/2] Bug 1939789 - Add icon next to the 'Cookies' choice in
 the user drop down to be consistent with other menu choices

---
 template/en/default/global/header.html.tmpl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index cd423210b3..2663e8a6de 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -348,8 +348,11 @@
             </a>
           </li>
           [% IF Param('cookie_consent_enabled') && Bugzilla.cgi.cookie_consent_required %]
-          <li role="presentation">
-            <a href="[% basepath FILTER none %]page.cgi?id=cookies.html" role="menuitem" tabindex="-1">Cookies</a>
+          <li role="none">
+            <a href="[% basepath FILTER none %]page.cgi?id=cookies.html" role="menuitem">
+              <span class="icon" aria-hidden="true" data-icon="cookie"></span>
+              <span class="label" role="none">Cookies</span>
+            </a>
           </li>
           [% END %]
           <li role="separator"></li>

From 717baab7742bb263a9addab803928a1fc5f0f189 Mon Sep 17 00:00:00 2001
From: David Lawrence <dkl@mozilla.com>
Date: Fri, 3 Jan 2025 20:30:50 -0500
Subject: [PATCH 2/2] Fixed failing test case for cookie consent

---
 qa/t/1_test_cookie_consent.t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qa/t/1_test_cookie_consent.t b/qa/t/1_test_cookie_consent.t
index d87d6cebec..e66de42822 100644
--- a/qa/t/1_test_cookie_consent.t
+++ b/qa/t/1_test_cookie_consent.t
@@ -52,7 +52,7 @@ ok($last_order_cookie, 'Last order cookie set properly');
 
 # Change cookie preferences to reject
 $sel->click_ok('header-account-menu-button');
-$sel->click_ok('link=Cookies');
+$sel->click_ok('//a[./span[@data-icon="cookie"]]');
 $sel->wait_for_page_to_load(WAIT_TIME);
 $sel->title_is('Cookie Settings');
 $sel->click_ok('cookie-radio-preference-no');