Merge remote-tracking branch 'origin/develop' into rule-2ee8b8-may-2023

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 }}"

README.md

@@ -12,7 +12,7 @@ For more information, see [ACT Overview - What is ACT](https://www.w3.org/WAI/GL
 
 ## Write rules, not tools
 
-An ACT rule is a unambiguous description of what the results of accessibility test tools and methodologies be when running a conformance test for the [Web Content Accessibility Guidelines][wcag21]. The rules are written without a specific implementation in mind. The goal is not to create an accessibility test tool. Instead we aim to harmonize between existing tools, and improve their transparency and the overall quality of their results.
+An ACT rule is a unambiguous description of what the results of accessibility test tools and methodologies be when running a conformance test for the [Web Content Accessibility Guidelines][wcag22]. The rules are written without a specific implementation in mind. The goal is not to create an accessibility test tool. Instead we aim to harmonize between existing tools, and improve their transparency and the overall quality of their results.
 
 If you want to know more about us, visit our website at: [www.w3.org/community/act-r][act-r].
 
@@ -34,5 +34,5 @@ For info on how to use this GitHub repository, see the [ACT-Rules GitHub Guideli
 
 This repository automatically pushes changes to rules to the [w3c/wcag-act-rules](https://github.com/w3c/wcag-act-rules/) repository. There is an "Approve rule" action available which can be triggered manually by an ACT Task Force facilitator, which will set a proposed rule to "approved".
 
-[wcag21]: https://www.w3.org/TR/WCAG21/
+[wcag22]: https://www.w3.org/TR/WCAG22/
 [act-r]: https://www.w3.org/community/act-r/

__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-is-outdated.js

@@ -14,10 +14,14 @@ const uniqueArray = require('../utils/unique-array')
  * Map of bad links vs their recommendations
  */
 const badLinksAndRecommendations = {
-	'://www.w3.org/TR/WCAG20/': 'Use WCAG 2.1 reference- https://www.w3.org/WAI/WCAG21/',
-	'://www.w3.org/TR/UNDERSTANDING-WCAG20/': 'Use WCAG 2.1 reference - https://www.w3.org/WAI/WCAG21/Understanding/',
-	'://www.w3.org/TR/WCAG20-TECHS/': 'Use WCAG 2.1 reference - https://www.w3.org/WAI/WCAG21/Techniques/',
-	'://www.w3.org/TR/wai-aria-1.0/': 'Use ARIA 1.1 reference - https://www.w3.org/TR/wai-aria-1.1/',
+	'://www.w3.org/TR/WCAG20/': 'Use WCAG 2.2 reference- https://www.w3.org/WAI/WCAG22/',
+	'://www.w3.org/TR/WCAG21/': 'Use WCAG 2.2 reference- https://www.w3.org/WAI/WCAG22/',
+	'://www.w3.org/TR/UNDERSTANDING-WCAG20/': 'Use WCAG 2.2 reference - https://www.w3.org/WAI/WCAG22/Understanding/',
+	'://www.w3.org/WAI/WCAG21/Understanding/': 'Use WCAG 2.2 reference- ://www.w3.org/WAI/WCAG22/Understanding/',
+	'://www.w3.org/TR/WCAG20-TECHS/': 'Use WCAG 2.2 reference - https://www.w3.org/WAI/WCAG22/Techniques/',
+	'://www.w3.org/WAI/WCAG21/Techniques/': 'Use WCAG 2.2 reference - https://www.w3.org/WAI/WCAG22/Techniques/',
+	'://www.w3.org/TR/wai-aria-1.0/': 'Use ARIA 1.2 reference - https://www.w3.org/TR/wai-aria-1.2/',
+	'://www.w3.org/TR/wai-aria-1.1/': 'Use ARIA 1.2 reference - https://www.w3.org/TR/wai-aria-1.2/',
 	'://www.w3.org/TR/dom41/': 'Use http://dom.spec.whatwg.org',
 	'://www.w3.org/TR/html/': 'Use http://html.spec.whatwg.org',
 	'://www.w3.org/TR/html52/': 'Use http://html.spec.whatwg.org',

__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

@@ -28,6 +28,7 @@
 - WCAG
 - WCAG2
 - WCAG21
+- WCAG22
 - CSS3
 - css # lowercase needed in reference list
 - UA
@@ -86,6 +87,7 @@
 - RFC
 - rfc
 - webauthn
+- customizable
 
 # spell checker checks against strict casing & hence some repeated words here
 - Autocomplete
@@ -119,6 +121,7 @@
 - multipage
 - attr-input-type
 - wai-aria-1.1
+- wai-aria-1.2
 
 # Notes and acronyms
 - TODO
@@ -207,6 +210,7 @@
 - reflow
 - Viewport
 - dom-meta-content
+- showModal
 
 # Unsure why the dictionary does not have these words
 - programmatically
@@ -268,6 +272,8 @@
 - 2px
 - 3px
 - 4px
+- 10px
+- 15px
 - 16px
 - 20px
 - 24px

_rules/__tests__/unique-ids.js

@@ -0,0 +1,12 @@
+const getMarkdownData = require('../../utils/get-markdown-data')
+const rulesData = getMarkdownData(`./_rules`)
+
+describe('Rule ids verification', () => {
+	const duplicates = rulesData.filter(
+		(ruleData, idx) => rulesData.findIndex(r => r.frontmatter.id === ruleData.frontmatter.id) !== idx
+	)
+
+	test('Rule ids are unique', () => {
+		expect(duplicates.length, `Duplicated rules: ${duplicates.map(ruleData => ruleData.filename).join(', ')}`).toBe(0)
+	})
+})

_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,15 +36,15 @@ 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
 
 - [ARIA in HTML](https://www.w3.org/TR/html-aria/#index-aria-global)
 - [WAI ARIA Supported States and Properties](https://www.w3.org/TR/wai-aria-1.2/#supportedState)
-- [G108: Using markup features to expose the name and role](https://www.w3.org/WAI/WCAG21/Techniques/general/G108)
-- [Understanding Success Criterion 1.3.1: Info and Relationships](https://www.w3.org/WAI/WCAG21/Understanding/name-role-value)
-- [Understanding Success Criterion 4.1.2: Name, Role, Value](https://www.w3.org/WAI/WCAG21/Understanding/name-role-value)
+- [G108: Using markup features to expose the name and role](https://www.w3.org/WAI/WCAG22/Techniques/general/G108)
+- [Understanding Success Criterion 1.3.1: Info and Relationships](https://www.w3.org/WAI/WCAG22/Understanding/name-role-value)
+- [Understanding Success Criterion 4.1.2: Name, Role, Value](https://www.w3.org/WAI/WCAG22/Understanding/name-role-value)
 - [Semantics and ARIA](https://developers.google.com/web/fundamentals/accessibility/semantics-aria/)
 
 ## Test Cases
@@ -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