From 8bc3dd87276a624be3bb47221034b3fc84668469 Mon Sep 17 00:00:00 2001
From: antoliny0919 <antoliny0919@gmail.com>
Date: Sun, 13 Apr 2025 15:13:20 +0900
Subject: Fixed #35507 -- Improved accessibility of search and filter elements
 in the admin changelist.

---
 tests/admin_changelist/tests.py | 7 ++++++-
 tests/admin_views/tests.py      | 9 ++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'tests')

diff --git a/tests/admin_changelist/tests.py b/tests/admin_changelist/tests.py
index 6003ce47d8..7203daa6b0 100644
--- a/tests/admin_changelist/tests.py
+++ b/tests/admin_changelist/tests.py
@@ -1745,7 +1745,12 @@ class ChangeListTests(TestCase):
         response = m.changelist_view(request)
         self.assertContains(
             response,
-            '<form id="changelist-search" method="get" role="search">',
+            '<h2 id="changelist-search-form" class="visually-hidden">Search bands</h2>',
+        )
+        self.assertContains(
+            response,
+            '<form id="changelist-search" method="get" role="search" '
+            'aria-labelledby="changelist-search-form">',
         )
 
     def test_search_bar_total_link_preserves_options(self):
diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py
index 13af96c004..9ea603423c 100644
--- a/tests/admin_views/tests.py
+++ b/tests/admin_views/tests.py
@@ -875,7 +875,8 @@ class AdminViewBasicTest(AdminViewBasicTestCase):
         response = self.client.get(reverse("admin:admin_views_thing_changelist"))
         self.assertContains(
             response,
-            '<nav id="changelist-filter" aria-labelledby="changelist-filter-header">',
+            '<search id="changelist-filter" '
+            'aria-labelledby="changelist-filter-header">',
             msg_prefix="Expected filter not found in changelist view",
         )
         self.assertNotContains(
@@ -930,7 +931,8 @@ class AdminViewBasicTest(AdminViewBasicTestCase):
         response = self.client.get(changelist_url)
         self.assertContains(
             response,
-            '<nav id="changelist-filter" aria-labelledby="changelist-filter-header">',
+            '<search id="changelist-filter" '
+            'aria-labelledby="changelist-filter-header">',
         )
         filters = {
             "chap__id__exact": {
@@ -1070,7 +1072,8 @@ class AdminViewBasicTest(AdminViewBasicTestCase):
         )
         self.assertContains(
             response,
-            '<nav id="changelist-filter" aria-labelledby="changelist-filter-header">',
+            '<search id="changelist-filter" '
+            'aria-labelledby="changelist-filter-header">',
         )
         self.assertContains(
             response,
-- 
cgit v1.3