From 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 19 Apr 2024 03:13:33 +0200
Subject: Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 accessible/tests/mochitest/role/test_aria.html    | 24 +++++++++++++++--------
 accessible/tests/mochitest/role/test_general.html |  2 +-
 2 files changed, 17 insertions(+), 9 deletions(-)

(limited to 'accessible/tests/mochitest/role')

diff --git a/accessible/tests/mochitest/role/test_aria.html b/accessible/tests/mochitest/role/test_aria.html
index bd7ffd27fb..0e7873c485 100644
--- a/accessible/tests/mochitest/role/test_aria.html
+++ b/accessible/tests/mochitest/role/test_aria.html
@@ -56,16 +56,16 @@
       testRole("aria_directory_mixed", ROLE_LIST);
       testRole("aria_document", ROLE_NON_NATIVE_DOCUMENT);
       testRole("aria_document_mixed", ROLE_NON_NATIVE_DOCUMENT);
-      testRole("aria_form", ROLE_FORM);
-      testRole("aria_form_mixed", ROLE_FORM);
+      testRole("aria_form", ROLE_TEXT);
+      testRole("aria_form_mixed", ROLE_TEXT);
       testRole("aria_form_with_label", ROLE_FORM);
       testRole("aria_form_with_label_mixed", ROLE_FORM);
       testRole("aria_feed", ROLE_GROUPING);
       testRole("aria_feed_mixed", ROLE_GROUPING);
       testRole("aria_figure", ROLE_FIGURE);
       testRole("aria_figure_mixed", ROLE_FIGURE);
-      testRole("aria_grid", ROLE_TABLE);
-      testRole("aria_grid_mixed", ROLE_TABLE);
+      testRole("aria_grid", ROLE_GRID);
+      testRole("aria_grid_mixed", ROLE_GRID);
       testRole("aria_gridcell", ROLE_GRID_CELL);
       testRole("aria_gridcell_mixed", ROLE_GRID_CELL);
       testRole("aria_group", ROLE_GROUPING);
@@ -184,8 +184,10 @@
 
       testRole("articlemain", ROLE_LANDMARK);
       testRole("articlemain_mixed", ROLE_LANDMARK);
-      testRole("articleform", ROLE_FORM);
-      testRole("articleform_mixed", ROLE_FORM);
+      testRole("articleform", ROLE_ARTICLE);
+      testRole("articleform_mixed", ROLE_ARTICLE);
+      testRole("articleform_label", ROLE_FORM);
+      testRole("articleform_label_mixed", ROLE_FORM);
 
       // Test article exposed as article
       testRole("testArticle", ROLE_ARTICLE);
@@ -204,8 +206,10 @@
       // strong landmark
       testRole("application", ROLE_APPLICATION);
       testRole("application_mixed", ROLE_APPLICATION);
-      testRole("form", ROLE_FORM);
-      testRole("form_mixed", ROLE_FORM);
+      testRole("form", ROLE_SECTION);
+      testRole("form_mixed", ROLE_SECTION);
+      testRole("form_label", ROLE_FORM);
+      testRole("form_label_mixed", ROLE_FORM);
       testRole("application_table", ROLE_APPLICATION);
       testRole("application_table_mixed", ROLE_APPLICATION);
 
@@ -535,6 +539,8 @@
   <article id="articlemain_mixed" role="mAIn">a main area</article>
   <article id="articleform" role="form">a form area</article>
   <article id="articleform_mixed" role="fORm">a form area</article>
+  <article id="articleform_label" aria-label="form" role="form">a form area</article>
+  <article id="articleform_label_mixed" aria-label="form" role="fORm">a form area</article>
 
   <div id="testArticle" role="article" title="Test article">
     <p>This is a paragraph inside the article.</p>
@@ -561,6 +567,8 @@
   <div role="aPPLICATIOn" id="application_mixed">application</div>
   <div role="form" id="form">form</div>
   <div role="fORm" id="form_mixed">form</div>
+  <div role="form" id="form_label" aria-label="form">form</div>
+  <div role="fORm" id="form_label_mixed" aria-label="form">form</div>
 
   <!-- weak landmarks -->
   <div role="banner" id="banner">banner</div>
diff --git a/accessible/tests/mochitest/role/test_general.html b/accessible/tests/mochitest/role/test_general.html
index 38dde3325a..c0afd39360 100644
--- a/accessible/tests/mochitest/role/test_general.html
+++ b/accessible/tests/mochitest/role/test_general.html
@@ -161,7 +161,7 @@
          id="nav_overflow">overflow nav</nav>
     <header style="overflow: hidden;"
             id="header_overflow">overflow header</header>
-    <aside style="overflow: hidden;"
+    <aside style="overflow: hidden;" aria-label="aside"
            id="aside_overflow">overflow aside</aside>
     <footer style="overflow: hidden;"
             id="footer_overflow">overflow footer</footer>
-- 
cgit v1.2.3