Merge remote-tracking branch 'upstream/develop' into develop

Author: dan-tripp-siteimprove

.github/scripts/approve-rule.mjs

@@ -27,10 +27,11 @@ await updateRuleVersionsYaml(config, argv.ruleId);
 await approveTestCaseJson(config, argv.ruleId);
 await commitAndPush(config, `Set ${argv.ruleId} to approved`);
 
-async function generateApprovedRulePages({ tmpDir, rulesDir, glossaryDir }, ruleId) {
+async function generateApprovedRulePages({ tmpDir, rulesDir, glossaryDir, testAssetsDir }, ruleId) {
   await $`node ./node_modules/act-tools/dist/cli/rule-transform.js \
   --rulesDir "${rulesDir}" \
   --glossaryDir "${glossaryDir}" \
+  --testAssetsDir "${testAssetsDir}" \
   --outDir "${tmpDir}" \
   --ruleIds "${ruleId}"
   `;

.github/scripts/wai-build.mjs

@@ -8,10 +8,11 @@ await generateTestCases(config);
 const commitMessage = (await $`git log -1 --pretty=%B`).stdout;
 await commitAndPush(config, commitMessage);
 
-async function generateProposedRulePages({ tmpDir, rulesDir, glossaryDir }) {
+async function generateProposedRulePages({ tmpDir, rulesDir, glossaryDir, testAssetsDir }) {
   await $`node ./node_modules/act-tools/dist/cli/rule-transform.js \
   --rulesDir "${rulesDir}" \
   --glossaryDir "${glossaryDir}" \
+  --testAssetsDir "${testAssetsDir}" \
   --outDir "${tmpDir}" \
   --proposed
   `;

.github/workflows/approve-rule.yml

@@ -1,4 +1,4 @@
-# Sets a rule to "approved" in the wcag-act-rules repository in a given branch. 
+# Sets a rule to "approved" in the wcag-act-rules repository in a given branch.
 name: Set a rule to approved
 on:
   workflow_dispatch:
@@ -14,12 +14,11 @@ jobs:
   dispatch:
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@v3
       - name: Check user permission
         uses: 74th/workflow-permission-action@1.0.0
         with:
           listfile: .github/workflows/chair-accounts.md
-
-      - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
           node-version: '16'
@@ -39,4 +38,4 @@ jobs:
           git config --global user.name "${{ secrets.WAI_GIT_NAME }}"
           git config --global user.email "${{ secrets.WAI_GIT_EMAIL }}"
       - name: Set rule to approved
-        run: npx zx .github/scripts/wai-build.mjs --ruleId ${{ github.event.inputs.ruleId }}" --branch ${{ github.event.inputs.branch }}"
+        run: npx zx .github/scripts/approve-rule.mjs --ruleId "${{ github.event.inputs.ruleId }}" --branch "${{ github.event.inputs.branch }}"

__tests__/frontmatter.js

@@ -95,14 +95,17 @@ function validateRuleFrontmatter({ frontmatter }, metaData) {
 		 */
 		const accRequirementValues = Object.values(accessibility_requirements)
 		test.each(accRequirementValues)('has expected keys for accessibility requirement: `%p`', accReq => {
-			if (accReq.secondary) {
-				expect(accReq.secondary).toBeTrue()
-				return
-			}
-
+			expect(accReq).not.toBeNull()
+			expect(typeof accReq).toBe('object')
 			const keys = Object.keys(accReq).sort()
-			expect(keys.length).toBeGreaterThanOrEqual(4)
-			expect(keys).toIncludeAllMembers(['failed', 'forConformance', 'inapplicable', 'passed'])
+
+			if (keys.includes('secondary')) {
+				expect(keys.length).toBe(1)
+				expect(typeof accReq.secondary).toBe('string')
+			} else {
+				expect(keys.length).toBeGreaterThanOrEqual(4)
+				expect(keys).toIncludeAllMembers(['failed', 'forConformance', 'inapplicable', 'passed'])
+			}
 		})
 	}
 }

__tests__/link-to-glossary-term-valid.js

@@ -14,6 +14,7 @@ const whitelist = [
 	/^#expectation(-[1-9][0-9]*)?$/,
 	/^#assumptions$/,
 	/^#accessibility-support$/,
+	/^#accessibility-requirements-mapping$/,
 	/^#background$/,
 	/^#test-cases$/,
 	/^#passed(-example-[1-9][0-9]*)?$/,

__tests__/spelling-ignore.yml

@@ -86,6 +86,7 @@
 - RFC
 - rfc
 - webauthn
+- customizable
 
 # spell checker checks against strict casing & hence some repeated words here
 - Autocomplete
@@ -204,6 +205,7 @@
 - reflow
 - Viewport
 - dom-meta-content
+- showModal
 
 # Unsure why the dictionary does not have these words
 - programmatically
@@ -259,6 +261,8 @@
 - 2px
 - 3px
 - 4px
+- 10px
+- 15px
 - 16px
 - 20px
 - 24px

_rules/aria-attr-defined-5f99a7.md

@@ -6,9 +6,9 @@ description: |
   This rule checks that each `aria-` attribute specified is defined in ARIA 1.2.
 accessibility_requirements:
   wcag20:1.3.1: # Info and Relationships (A)
-    secondary: true
+    secondary: This success criterion is **less strict** than this rule. This is because the rule does not ignore irrelevant ARIA properties. Some of the failed examples satisfy this success criterion.
   wcag20:4.1.2: # Name, Role, Value (A)
-    secondary: true
+    secondary: This success criterion is **less strict** than this rule. This is because the rule does not ignore irrelevant ARIA properties. Some of the failed examples satisfy this success criterion.
 input_aspects:
   - DOM Tree
 acknowledgments:
@@ -36,7 +36,7 @@ There are no accessibility support issues known.
 
 ## Background
 
-The presence of unknown ARIA attributes is often the result of a typo or other developer error. These attributes are ignored by browsers and other assistive technologies. This often means that a state or property which should exist is missing. This can cause issues under [success criterion 1.3.1 Info and Relationships][sc131] or [4.1.2 Name, Rule Value][sc412].
+The presence of unknown ARIA attributes is often the result of a typo or other developer error. These attributes are ignored by browsers and other assistive technologies. This often means that a state or property which should exist is missing.
 
 ### Bibliography
 
@@ -122,5 +122,3 @@ This `canvas` element does not have an `aria-` attribute specified.
 ```
 
 [wai-aria specifications]: #wai-aria-specifications 'Definition of WAI-ARIA specifications'
-[sc131]: https://www.w3.org/TR/WCAG21/#info-and-relationships
-[sc412]: https://www.w3.org/TR/WCAG21/#name-role-value

_rules/aria-hidden-no-focusable-content-6cfa84.md

@@ -54,7 +54,7 @@ The 1 second time span introduced in the exception of the definition of [focusab
 
 ### Related rules
 
-- [Element with presentational children has no focusable content](https://www.w3.org/WAI/standards-guidelines/act/rules/307n5z/proposed/)
+- [Element with presentational children has no focusable content](https://www.w3.org/WAI/standards-guidelines/act/rules/307n5z/)
 
 ### Bibliography
 

_rules/aria-required-id-references-in6db8.md

@@ -12,9 +12,9 @@ accessibility_requirements:
     passed: satisfied
     inapplicable: satisfied
   wcag20:1.3.1: # Info and Relationships (A)
-    secondary: true
+    secondary: This success criterion is **less strict** than this rule. This is because the rule does not check for alternatives which may be accessible. Some of the failed examples satisfy this success criterion.
   wcag20:4.1.2: # Name, Role, Value (A)
-    secondary: true
+    secondary: This success criterion is **less strict** than this rule. This is because the rule does not check for alternatives which may be accessible. Some of the failed examples satisfy this success criterion.
 input_aspects:
   - DOM Tree
   - CSS Styling
@@ -32,7 +32,7 @@ This rule applies to any `aria-controls` attribute defined on an [HTML element][
 
 ## Expectation
 
-Each test target's [attribute value][] is a space-separated list of one or more IDs. At least one of those IDs must match an `id` [attribute value][] in the same [shadow tree][] or, if not within a [shadow tree][], within the same [document][document tree] 
+Each test target's [attribute value][] is a space-separated list of one or more IDs. At least one of those IDs must match an `id` [attribute value][] in the same [shadow tree][] or, if not within a [shadow tree][], within the same [document][document tree].
 
 ## Assumptions
 

_rules/aria-state-or-property-permitted-5c01ea.md

@@ -17,9 +17,9 @@ accessibility_requirements:
     passed: satisfied
     inapplicable: satisfied
   wcag20:1.3.1: # Info and Relationships (A)
-    secondary: true
+    secondary: This success criterion is **less strict** than this rule. This is because the rule does not ignore irrelevant ARIA properties. Some of the failed examples satisfy this success criterion.
   wcag20:4.1.2: # Name, Role, Value (A)
-    secondary: true
+    secondary: This success criterion is **less strict** than this rule. This is because the rule does not ignore irrelevant ARIA properties. Some of the failed examples satisfy this success criterion.
 input_aspects:
   - Accessibility Tree
   - CSS styling
@@ -60,15 +60,15 @@ Implementation of [Presentational Roles Conflict Resolution][] varies from one b
 
 ## Background
 
-The presence of prohibited ARIA attributes is often the result of a developer using an incorrect role, or a misunderstanding of the attribute. These attributes are ignored by browsers and other assistive technologies. This often means that a state or property which should exist is missing. This can cause issues under [success criterion 1.3.1 Info and Relationships][sc131] or [4.1.2 Name, Rule Value][sc412].
+The presence of prohibited ARIA attributes is often the result of a developer using an incorrect role, or a misunderstanding of the attribute. These attributes are ignored by browsers and other assistive technologies. This often means that a state or property which should exist is missing.
 
 In HTML, there are language features that do not have corresponding implicit WAI-ARIA semantics. As per [ARIA in HTML](https://www.w3.org/TR/html-aria/), those elements can have [global states or properties][global]. Some of those elements can also have [inherited][], [supported][], or [required][] [states][state] or [properties][property] that correspond to a [WAI-ARIA role](https://www.w3.org/TR/wai-aria-1.2/#introroles). For example, the `audio` element has no corresponding ARIA semantics but it can have [inherited][], [supported][], or [required][] [states][state] or [properties][property] of the [`application` role](https://www.w3.org/TR/wai-aria-1.2/#application).
 
 Assessing the value of the attribute is out of scope for this rule.
 
 ### Related rules
 
-- [ARIA state or property has valid value](https://www.w3.org/WAI/standards-guidelines/act/rules/6a7281/proposed/)
+- [ARIA state or property has valid value](https://www.w3.org/WAI/standards-guidelines/act/rules/6a7281/)
 
 ### Bibliography
 
@@ -233,5 +233,3 @@ This `div` element is not [included in the accessibility tree][], hence its [WAI
 [wai-aria state or property]: https://www.w3.org/TR/wai-aria-1.2/#state_prop_def 'Definition of ARIA States and Properties'
 [namespaced element]: #namespaced-element
 [prohibited]: https://www.w3.org/TR/wai-aria-1.2/#prohibitedattributes 'WAI-ARIA 1.2 Definition of Prohibited States and Properties'
-[sc131]: https://www.w3.org/TR/WCAG21/#info-and-relationships
-[sc412]: https://www.w3.org/TR/WCAG21/#name-role-value