Upgrade to WCAG 2.2 (#33)

* Upgrade to WCAG 2.2 * Tweak
act-rules · Aug 8, 2024 · b611ae1 · b611ae1
1 parent cc2208a
commit b611ae1
Show file tree

Hide file tree

Showing 14 changed files with 568 additions and 474 deletions.
diff --git a/src/EarlReport/context.ts b/src/EarlReport/context.ts
@@ -1,7 +1,7 @@
 export const context = {
   "@vocab": "http://www.w3.org/ns/earl#",
   earl: "http://www.w3.org/ns/earl#",
-  WCAG2: "http://www.w3.org/TR/WCAG21/#",
+  WCAG2: "http://www.w3.org/TR/WCAG22/#",
   dct: "http://purl.org/dc/terms/",
   sch: "https://schema.org/",
   testRuns: "@graph",

diff --git a/src/act/__tests__/get-accessibility-requirement.ts b/src/act/__tests__/get-accessibility-requirement.ts
@@ -10,7 +10,7 @@ describe("getAccessibilityRequirement", () => {
       title:
         "H2: Combining adjacent image and text links for the same resource",
       shortTitle: "technique H2",
-      url: "https://www.w3.org/WAI/WCAG21/Techniques/html/H2",
+      url: "https://www.w3.org/WAI/WCAG22/Techniques/html/H2",
     });
   });
 
@@ -23,7 +23,7 @@ describe("getAccessibilityRequirement", () => {
       requirementType: "success criterion",
       title: "1.1.1 Non-text Content (Level A)",
       shortTitle: "1.1.1 Non-text Content",
-      url: "https://www.w3.org/TR/WCAG21/#non-text-content",
+      url: "https://www.w3.org/TR/WCAG22/#non-text-content",
     });
   });
 

diff --git a/src/act/accessibility-requirements/__tests__/get-wcag-criterion.ts b/src/act/accessibility-requirements/__tests__/get-wcag-criterion.ts
@@ -8,18 +8,29 @@ describe("getWcagCriterion", () => {
       conformanceLevel: "WCAG 2.0 and later on level A and higher",
       title: "1.1.1 Non-text Content (Level A)",
       shortTitle: "1.1.1 Non-text Content",
-      url: "https://www.w3.org/TR/WCAG21/#non-text-content",
+      url: "https://www.w3.org/TR/WCAG22/#non-text-content",
     });
   });
 
   it("returns a criterion for WCAG 2.1 level AA", () => {
     const criterion = getWcagCriterion("1.3.4");
     expect(criterion).toEqual({
       requirementType: "success criterion",
-      conformanceLevel: "WCAG 2.1 on level AA and higher",
+      conformanceLevel: "WCAG 2.1 and later on level AA and higher",
       title: "1.3.4 Orientation (Level AA)",
       shortTitle: "1.3.4 Orientation",
-      url: "https://www.w3.org/TR/WCAG21/#orientation",
+      url: "https://www.w3.org/TR/WCAG22/#orientation",
+    });
+  });
+
+  it("returns a criterion for WCAG 2.2 level AA", () => {
+    const criterion = getWcagCriterion("2.5.8");
+    expect(criterion).toEqual({
+      requirementType: "success criterion",
+      conformanceLevel: "WCAG 2.2 on level AA and higher",
+      title: "2.5.8 Target Size (Minimum) (Level AA)",
+      shortTitle: "2.5.8 Target Size (Minimum)",
+      url: "https://www.w3.org/TR/WCAG22/#target-size-minimum",
     });
   });
 
@@ -30,7 +41,7 @@ describe("getWcagCriterion", () => {
       conformanceLevel: "WCAG 2.0 and later on level AAA",
       title: "1.2.9 Audio-only (Live) (Level AAA)",
       shortTitle: "1.2.9 Audio-only (Live)",
-      url: "https://www.w3.org/TR/WCAG21/#audio-only-live",
+      url: "https://www.w3.org/TR/WCAG22/#audio-only-live",
     });
   });
 
@@ -39,7 +50,7 @@ describe("getWcagCriterion", () => {
     expect(criterion).toEqual({
       requirementType: "success criterion",
       title: "0.0.0 Unknown success criterion",
-      url: "https://www.w3.org/TR/WCAG21/",
+      url: "https://www.w3.org/TR/WCAG22/",
     });
   });
 });
diff --git a/src/act/accessibility-requirements/__tests__/get-wcag-technique.ts b/src/act/accessibility-requirements/__tests__/get-wcag-technique.ts
@@ -9,7 +9,7 @@ describe("getWcagTechnique", () => {
       title:
         "H2: Combining adjacent image and text links for the same resource",
       shortTitle: "technique H2",
-      url: "https://www.w3.org/WAI/WCAG21/Techniques/html/H2",
+      url: "https://www.w3.org/WAI/WCAG22/Techniques/html/H2",
     });
   });
 
@@ -19,7 +19,7 @@ describe("getWcagTechnique", () => {
       requirementType: "technique",
       title: "H1: Unknown technique",
       shortTitle: "technique H1",
-      url: "https://www.w3.org/WAI/WCAG21/Techniques/#html",
+      url: "https://www.w3.org/WAI/WCAG22/Techniques/#html",
     });
   });
 
@@ -29,7 +29,7 @@ describe("getWcagTechnique", () => {
       requirementType: "technique",
       title: "X123: Unknown technique",
       shortTitle: "technique X123",
-      url: "https://www.w3.org/WAI/WCAG21/Techniques/",
+      url: "https://www.w3.org/WAI/WCAG22/Techniques/",
     });
   });
 });
diff --git a/src/act/accessibility-requirements/get-wcag-criterion.ts b/src/act/accessibility-requirements/get-wcag-criterion.ts
@@ -11,7 +11,7 @@ type SuccessCriterion = {
 const scUrls: Record<string, SuccessCriterion | undefined> = successCriteria;
 
 const requirementType = "success criterion";
-const latestWcagVersion = "2.1";
+const latestWcagVersion = "2.2";
 const highestLevel = "AAA";
 
 // For WCAG SC. Title, URL and more is grabbed from data fetched during build.
@@ -47,6 +47,6 @@ function fallbackCriterion(scNumber: string) {
   return {
     requirementType,
     title: `${scNumber} Unknown success criterion`,
-    url: "https://www.w3.org/TR/WCAG21/",
+    url: "https://www.w3.org/TR/WCAG22/",
   };
 }
diff --git a/src/act/accessibility-requirements/get-wcag-technique.ts b/src/act/accessibility-requirements/get-wcag-technique.ts
@@ -34,7 +34,7 @@ const technologyMap: Record<string, string | undefined> = {
 };
 
 function getTechniqueUrl(techniqueId: string): string {
-  const baseUrl = `https://www.w3.org/WAI/WCAG21/Techniques/`;
+  const baseUrl = `https://www.w3.org/WAI/WCAG22/Techniques/`;
   techniqueId = techniqueId.toUpperCase();
   const prefix = techniqueId.replace(/[0-9]/g, "").toLowerCase();
   const techniqueType = technologyMap[prefix];

diff --git a/src/act/get-accessibility-requirement.ts b/src/act/get-accessibility-requirement.ts
@@ -38,8 +38,8 @@ const accessibilityDocs: AccessibilityDocuments = {
     requirementType: "WAI-ARIA rule",
   },
   "wcag-text": {
-    conformanceLevel: "WCAG 2.1",
-    baseURL: "https://www.w3.org/TR/WCAG21/#",
+    conformanceLevel: "WCAG 2.2",
+    baseURL: "https://www.w3.org/TR/WCAG22/#",
     requirementType: "WCAG 2 conformance requirement",
   },
 };

diff --git a/src/data/readme.md b/src/data/readme.md
@@ -0,0 +1,11 @@
+# Data
+
+These data files are maintained by hand.
+
+The technique-titles.json file can be updated by running the following code in the console on the [techniques page](https://www.w3.org/WAI/WCAG22/Techniques/).
+
+```js
+JSON.stringify(Object.fromEntries($$('.toc-wcag-docs a').map(a => {
+  return a.textContent.split(': ').map(t => t.replaceAll(/\s+/g, ' ').trim())
+})), null, 2)
+```