From 5fe503e30687b29c2755a25051c4c86a88fab91d Mon Sep 17 00:00:00 2001
From: Rahim Abdi <rahim_abdi@apple.com>
Date: Thu, 4 Jan 2024 15:31:27 -0800
Subject: [PATCH 1/6] Add html-aam <summary> contextual tests

---
 html-aam/roles-contextual.html | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/html-aam/roles-contextual.html b/html-aam/roles-contextual.html
index 98ad07cd95f256..c67029a578dec9 100644
--- a/html-aam/roles-contextual.html
+++ b/html-aam/roles-contextual.html
@@ -45,6 +45,15 @@
 <section data-testname="el-section" aria-label="x" data-expectedrole="region" class="ex">x</section>
 <section data-testname="el-section-no-name" class="ex-generic">x</section>
 
+<!-- el-summary -->
+<summary data-testname="el-summary-orphan" aria-label="x" class="ex-generic">x</summary>
+<details>
+  <ol>
+    <li>x</li>
+    <li>x</li>
+  </ol>
+  <summary data-testname="el-summary-not-first-child-of-details" aria-label="x" class="ex-generic">x</summary>
+</details>
 
 <script>
 AriaUtils.verifyRolesBySelector(".ex");

From 4f207dc9dbf164bd38c0d6506e44062dae5d7b16 Mon Sep 17 00:00:00 2001
From: Rahim Abdi <rahim_abdi@apple.com>
Date: Thu, 4 Jan 2024 15:39:52 -0800
Subject: [PATCH 2/6] Remove unneeded ARIA

---
 html-aam/roles-contextual.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/html-aam/roles-contextual.html b/html-aam/roles-contextual.html
index c67029a578dec9..a5e4891f561390 100644
--- a/html-aam/roles-contextual.html
+++ b/html-aam/roles-contextual.html
@@ -46,13 +46,13 @@
 <section data-testname="el-section-no-name" class="ex-generic">x</section>
 
 <!-- el-summary -->
-<summary data-testname="el-summary-orphan" aria-label="x" class="ex-generic">x</summary>
+<summary data-testname="el-summary-orphan" class="ex-generic">x</summary>
 <details>
   <ol>
     <li>x</li>
     <li>x</li>
   </ol>
-  <summary data-testname="el-summary-not-first-child-of-details" aria-label="x" class="ex-generic">x</summary>
+  <summary data-testname="el-summary-not-first-child-of-details" class="ex-generic">x</summary>
 </details>
 
 <script>

From 0044ea76ed00787a9e67898811dc0b7b810a5e67 Mon Sep 17 00:00:00 2001
From: Rahim Abdi <rahim_abdi@apple.com>
Date: Fri, 5 Jan 2024 09:30:17 -0800
Subject: [PATCH 3/6] Fix 'not first <summary>' test

---
 html-aam/roles-contextual.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/html-aam/roles-contextual.html b/html-aam/roles-contextual.html
index a5e4891f561390..584828ff8e8e4b 100644
--- a/html-aam/roles-contextual.html
+++ b/html-aam/roles-contextual.html
@@ -52,7 +52,8 @@
     <li>x</li>
     <li>x</li>
   </ol>
-  <summary data-testname="el-summary-not-first-child-of-details" class="ex-generic">x</summary>
+  <summary>x</summary>
+  <summary data-testname="el-summary-not-first-summary-child-of-details" class="ex-generic">x</summary>
 </details>
 
 <script>

From 4e0b589a10259c878d53045dc2884659a8364953 Mon Sep 17 00:00:00 2001
From: Rahim Abdi <rahim_abdi@apple.com>
Date: Sun, 7 Apr 2024 14:29:52 -0700
Subject: [PATCH 4/6] Create ./summary.html, update documentation reference
 links in ./roles.html and ./roles-contextual.html

---
 html-aam/roles-contextual.html | 11 +--------
 html-aam/roles.html            |  2 +-
 html-aam/summary.html          | 45 ++++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 11 deletions(-)
 create mode 100644 html-aam/summary.html

diff --git a/html-aam/roles-contextual.html b/html-aam/roles-contextual.html
index 584828ff8e8e4b..b33c35dc08df6a 100644
--- a/html-aam/roles-contextual.html
+++ b/html-aam/roles-contextual.html
@@ -45,16 +45,7 @@
 <section data-testname="el-section" aria-label="x" data-expectedrole="region" class="ex">x</section>
 <section data-testname="el-section-no-name" class="ex-generic">x</section>
 
-<!-- el-summary -->
-<summary data-testname="el-summary-orphan" class="ex-generic">x</summary>
-<details>
-  <ol>
-    <li>x</li>
-    <li>x</li>
-  </ol>
-  <summary>x</summary>
-  <summary data-testname="el-summary-not-first-summary-child-of-details" class="ex-generic">x</summary>
-</details>
+<!-- el-summary -> ./summary.html -->
 
 <script>
 AriaUtils.verifyRolesBySelector(".ex");
diff --git a/html-aam/roles.html b/html-aam/roles.html
index 7cfb2852c23ad8..4b251a01914f84 100644
--- a/html-aam/roles.html
+++ b/html-aam/roles.html
@@ -176,7 +176,7 @@ <h6 data-testname="el-h6" data-expectedrole="heading" class="ex">x</h6>
 <strong data-testname="el-strong" data-expectedrole="strong" class="ex">x</strong>
 <!-- style (not mapped) -->
 <sub data-testname="el-sub" data-expectedrole="subscript" class="ex">x</sub>
-<!-- todo: summary -->
+<!-- summary -> ./summary.html -->
 <sup data-testname="el-sup" data-expectedrole="superscript" class="ex">x</sup>
 <!-- todo: svg (see /graphics-aam and /svg-aam tests) -->
 <!-- table -> ./table-roles.html -->
diff --git a/html-aam/summary.html b/html-aam/summary.html
new file mode 100644
index 00000000000000..6441d1ddbd57e3
--- /dev/null
+++ b/html-aam/summary.html
@@ -0,0 +1,45 @@
+<!doctype html>
+<html>
+<head>
+  <title>Summary Element - HTML-AAM Contextual-Specific Role Verification Tests</title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/resources/testdriver.js"></script>
+  <script src="/resources/testdriver-vendor.js"></script>
+  <script src="/resources/testdriver-actions.js"></script>
+  <script src="/wai-aria/scripts/aria-utils.js"></script>
+</head>
+<body>
+
+<h1>Summary Element - HTML-AAM Contextual-Specific Role Verification Tests</h1>
+<p>Tests contextual computedrole mappings for <code>summary</code> defined in
+  <a href="https://html.spec.whatwg.org/multipage/interactive-elements.html#the-summary-element">summary (HTML spec)</a>
+  and <a href="https://www.w3.org/TR/html-aam-1.0/#el-summary">HTML-AAM summary mapping</a>
+<p>
+
+<!--
+  Per HTML/HTML-AAM, the mapping for <summary> element is:
+
+  If the element is the first child of its type within a parent details element: html-summary
+  Otherwise, if it is not the first child of its type of a parent details element, or it is not a child of a details element: generic role
+
+-->
+
+<summary data-testname="orphan summary has generic role" class="ex-generic">x</summary>
+
+<details>
+  <ol>
+    <li>x</li>
+    <li>x</li>
+  </ol>
+  <summary>x</summary>
+  <summary data-testname="descendant summary of details, that is not the first descendant summary, has generic role" class="ex-generic">x</summary>
+</details>
+
+<script>
+AriaUtils.verifyRolesBySelector(".ex");
+AriaUtils.verifyGenericRolesBySelector(".ex-generic");
+</script>
+
+</body>
+</html>

From 333c3df598fc45dde63f77379384c32e7d87327e Mon Sep 17 00:00:00 2001
From: Rahim Abdi <rahim_abdi@apple.com>
Date: Sun, 7 Apr 2024 14:50:04 -0700
Subject: [PATCH 5/6] Remove unused verifyRoles..() in script block

---
 html-aam/summary.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/html-aam/summary.html b/html-aam/summary.html
index 6441d1ddbd57e3..3122ce5b6dda29 100644
--- a/html-aam/summary.html
+++ b/html-aam/summary.html
@@ -37,7 +37,6 @@ <h1>Summary Element - HTML-AAM Contextual-Specific Role Verification Tests</h1>
 </details>
 
 <script>
-AriaUtils.verifyRolesBySelector(".ex");
 AriaUtils.verifyGenericRolesBySelector(".ex-generic");
 </script>
 

From 4f22d66def7ffdedfd8ea09d23c5bf0258aac81f Mon Sep 17 00:00:00 2001
From: Rahim Abdi <abdi.abdirahim@gmail.com>
Date: Mon, 8 Apr 2024 14:02:16 -0700
Subject: [PATCH 6/6] Add test for intervening element after <details>

Co-authored-by: Scott O'Hara <scottaohara@users.noreply.github.com>
---
 html-aam/summary.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/html-aam/summary.html b/html-aam/summary.html
index 3122ce5b6dda29..ca23c751246122 100644
--- a/html-aam/summary.html
+++ b/html-aam/summary.html
@@ -36,6 +36,12 @@ <h1>Summary Element - HTML-AAM Contextual-Specific Role Verification Tests</h1>
   <summary data-testname="descendant summary of details, that is not the first descendant summary, has generic role" class="ex-generic">x</summary>
 </details>
 
+<details>
+  <div>
+    <summary data-testname="descendant summary of details with intervening element, has generic role" class="ex-generic">x</summary>
+  </div>
+  <p>Other content</p>
+</details>
 <script>
 AriaUtils.verifyGenericRolesBySelector(".ex-generic");
 </script>