Merge branch 'dequelabs:develop' into develop

dan-tripp · Sep 10, 2021 · 6e389a1 · 6e389a1
2 parents ac32146 + d0d1d59
commit 6e389a1
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 5 deletions.
diff --git a/doc/projects.md b/doc/projects.md
@@ -54,3 +54,4 @@ Add your project/integration to this file and submit a pull request.
 1. [axe-sarif-converter](https://github.com/microsoft/axe-sarif-converter)
 1. [Selenium.Axe for .NET](https://github.com/TroyWalshProf/SeleniumAxeDotnet)
 1. [vue-axe](https://github.com/vue-a11y/vue-axe-next)
+1. [a11y-sitechecker](https://github.com/forsti0506/a11y-sitechecker)
diff --git a/lib/standards/aria-roles.js b/lib/standards/aria-roles.js
@@ -147,6 +147,11 @@ const ariaRoles = {
     allowedAttrs: ['aria-expanded'],
     superclassRole: ['landmark']
   },
+  comment: {
+    type: 'structure',
+    allowedAttrs: ['aria-level', 'aria-posinset', 'aria-setsize'],
+    superclassRole: ['article']
+  },
   definition: {
     type: 'structure',
     allowedAttrs: ['aria-expanded'],
@@ -391,6 +396,11 @@ const ariaRoles = {
     accessibleNameRequired: true,
     childrenPresentational: true
   },
+  mark: {
+    type: 'structure',
+    superclassRole: ['section'],
+    prohibitedAttrs: ['aria-label', 'aria-labelledby']
+  },
   navigation: {
     type: 'landmark',
     allowedAttrs: ['aria-expanded'],
@@ -674,6 +684,12 @@ const ariaRoles = {
     nameFromContent: true,
     childrenPresentational: true
   },
+  suggestion: {
+    type: 'structure',
+    requiredOwned: ['insertion', 'deletion'],
+    superclassRole: ['section'],
+    prohibitedAttrs: ['aria-label', 'aria-labelledby']
+  },
   tab: {
     type: 'widget',
     requiredContext: ['tablist'],

diff --git a/test/integration/rules/aria-allowed-attr/failures.html b/test/integration/rules/aria-allowed-attr/failures.html
@@ -34,3 +34,7 @@
   aria-orientation="horizontal"
   id="fail30"
 ></audio>
+<div role="mark" aria-label="value" id="fail31">fail</div>
+<div role="mark" aria-labelledby="value" id="fail32">fail</div>
+<div role="suggestion" aria-label="value" id="fail33">fail</div>
+<div role="suggestion" aria-labelledby="value" id="fail34">fail</div>
diff --git a/test/integration/rules/aria-allowed-attr/failures.json b/test/integration/rules/aria-allowed-attr/failures.json
@@ -31,6 +31,10 @@
     ["#fail27"],
     ["#fail28"],
     ["#fail29"],
-    ["#fail30"]
+    ["#fail30"],
+    ["#fail31"],
+    ["#fail32"],
+    ["#fail33"],
+    ["#fail34"]
   ]
 }
diff --git a/test/integration/rules/aria-allowed-attr/passes.html b/test/integration/rules/aria-allowed-attr/passes.html
@@ -1941,3 +1941,13 @@
     </tr>
   </tbody>
 </table>
+
+<div
+  id="pass91"
+  role="comment"
+  aria-level="1"
+  aria-posinset="1"
+  aria-setsize="16"
+>
+  ok
+</div>
diff --git a/test/integration/rules/aria-allowed-attr/passes.json b/test/integration/rules/aria-allowed-attr/passes.json
@@ -93,6 +93,7 @@
     ["#pass88"],
     ["#pass89"],
     ["#pass90"],
-    ["#treegrid"]
+    ["#treegrid"],
+    ["#pass91"]
   ]
 }
diff --git a/test/integration/rules/aria-required-children/aria-required-children.html b/test/integration/rules/aria-required-children/aria-required-children.html
@@ -55,3 +55,10 @@
     <li role="menuitem" id="ignore14">>Trash</li>
   </ul>
 </div>
+
+<div role="suggestion" id="pass8">
+  <span role="deletion">option</span>
+  <span role="insertion">option</span>
+</div>
+
+<div role="suggestion" id="fail8"></div>
diff --git a/test/integration/rules/aria-required-children/aria-required-children.json b/test/integration/rules/aria-required-children/aria-required-children.json
@@ -8,7 +8,8 @@
     ["#fail4"],
     ["#fail5"],
     ["#fail6"],
-    ["#fail7"]
+    ["#fail7"],
+    ["#fail8"]
   ],
   "passes": [
     ["#pass1"],
@@ -17,7 +18,8 @@
     ["#pass4"],
     ["#pass5"],
     ["#pass6"],
-    ["#pass7"]
+    ["#pass7"],
+    ["#pass8"]
   ],
   "incomplete": [
     ["#incomplete1"],

diff --git a/test/integration/rules/aria-roles/aria-roles.html b/test/integration/rules/aria-roles/aria-roles.html
@@ -111,6 +111,9 @@
   <div role="graphics-document" id="pass111">ok</div>
   <div role="graphics-object" id="pass112">ok</div>
   <div role="graphics-symbol" id="pass113">ok</div>
+  <div role="comment" id="pass114">ok</div>
+  <div role="mark" id="pass115">ok</div>
+  <div role="suggestion" id="pass116">ok</div>
 </div>
 <div id="violation">
   <!-- abstract roles -->

diff --git a/test/integration/rules/aria-roles/aria-roles.json b/test/integration/rules/aria-roles/aria-roles.json
@@ -129,6 +129,9 @@
     ["#pass110"],
     ["#pass111"],
     ["#pass112"],
-    ["#pass113"]
+    ["#pass113"],
+    ["#pass114"],
+    ["#pass115"],
+    ["#pass116"]
   ]
 }