Merge pull request #2061 from IBMa/acc-req-7.3

ErickRenteria · web-flow · commit 5bb82420f795 · 2024-10-01T18:08:48.000-05:00
feature(engine): Update IBM_Accessibility policy to include new WCAG 2.2 rules
diff --git a/accessibility-checker-engine/src/v4/rules/draggable_alternative_exists.ts b/accessibility-checker-engine/src/v4/rules/draggable_alternative_exists.ts
@@ -37,7 +37,7 @@ export let draggable_alternative_exists: Rule = {
         }
     },
     rulesets: [{
-        id: ["IBM_Accessibility_next", "WCAG_2_2"],
+        id: [ "IBM_Accessibility", "IBM_Accessibility_next", "WCAG_2_2"],
         num: ["2.5.7"],
         level: eRulePolicy.VIOLATION,
         toolkitLevel: eToolkitLevel.LEVEL_THREE
diff --git a/accessibility-checker-engine/src/v4/rules/element_tabbable_unobscured.ts b/accessibility-checker-engine/src/v4/rules/element_tabbable_unobscured.ts
@@ -36,7 +36,7 @@ export let element_tabbable_unobscured: Rule = {
         }
     },
     rulesets: [{
-        id: ["IBM_Accessibility_next", "WCAG_2_2"],
+        id: [ "IBM_Accessibility", "IBM_Accessibility_next", "WCAG_2_2"],
         num: ["2.4.11"],
         level: eRulePolicy.VIOLATION,
         toolkitLevel: eToolkitLevel.LEVEL_THREE
diff --git a/accessibility-checker-engine/src/v4/rules/target_spacing_sufficient.ts b/accessibility-checker-engine/src/v4/rules/target_spacing_sufficient.ts
@@ -47,14 +47,14 @@
             }
         },
         rulesets: [{
-            id: ["IBM_Accessibility_next", "WCAG_2_2"],
+            id: [ "IBM_Accessibility", "IBM_Accessibility_next", "WCAG_2_2"],
             num: ["2.5.8"],
             level: eRulePolicy.VIOLATION,
             toolkitLevel: eToolkitLevel.LEVEL_THREE,
             reasonCodes: ["pass_spacing","pass_sized", "pass_inline","pass_default", "violation_spacing", "potential_overlap"]
         },
         {
-            id: ["IBM_Accessibility_next", "WCAG_2_2"],
+            id: [ "IBM_Accessibility", "IBM_Accessibility_next", "WCAG_2_2"],
             num: ["2.5.8"],
             level: eRulePolicy.RECOMMENDATION,
             toolkitLevel: eToolkitLevel.LEVEL_THREE,
diff --git a/accessibility-checker-engine/src/v4/rulesets.ts b/accessibility-checker-engine/src/v4/rulesets.ts
@@ -111,9 +111,9 @@ export let a11yRulesets: Guideline[] = [
     },
     {
         id: "IBM_Accessibility",
-        name: "IBM Accessibility 7.2",
+        name: "IBM Accessibility 7.3",
         category: eGuidelineCategory.ACCESSIBILITY,
-        description: "Rules for WCAG 2.0 & 2.1 A and AA plus additional IBM supplemental requirements.",
+        description: "Rules for WCAG 2.0, 2.1, 2.2 A and AA plus additional IBM supplemental requirements.",
         // This ruleset has all 2.0 and 2.1 checkpoints that are A or AA
         checkpoints: SCs
             .filter(sc => (sc.level === "A" || sc.level === "AA" || sc.level === "NA") && (sc.wcagType === "2.0" || sc.wcagType === "2.1" || sc.wcagType === "2.2" || sc.wcagType === "NA"))
@@ -127,7 +127,7 @@ export let a11yRulesets: Guideline[] = [
     },
     {
         id: "IBM_Accessibility_next",
-        name: "IBM Accessibility 7.3",
+        name: "IBM Accessibility next",
         category: eGuidelineCategory.ACCESSIBILITY,
         description: "Rules for WCAG 2.0, 2.1, 2.2 A and AA plus additional IBM supplemental requirements.",
         // This ruleset has all 2.0 and 2.1 checkpoints that are A or AA
diff --git a/accessibility-checker-extension/src/ts/docs/QuickGuideACApp.tsx b/accessibility-checker-extension/src/ts/docs/QuickGuideACApp.tsx
@@ -472,7 +472,7 @@ export class QuickGuideACApp extends React.Component<{}, quickGuideACAppState> {
                         Select one of the following:</p>
                         <UnorderedList>
                             <ListItem><strong>IBM Accessibility 7.2</strong>: includes checking against WCAG 2.1 plus additional IBM requirements</ListItem>
-                            <ListItem><strong>IBM Accessibility 7.3</strong>: includes checking against WCAG 2.2 plus additional IBM requirements. This will be the default starting Oct 1, 2024.</ListItem>
+                            <ListItem><strong>IBM Accessibility 7.3</strong>: includes checking against WCAG 2.2 plus additional IBM requirements. Default Oct 1, 2024.</ListItem>
                             <ListItem><strong>WCAG 2.2 (A, AA)</strong>: this is the latest W3C specification. Content that conforms to WCAG 2.2 also conforms to WCAG 2.1 and 2.0</ListItem>
                             <ListItem><strong>WCAG 2.1 (A, AA)</strong>: referenced by EN 301 549 and other policies, but not the latest W3C specification</ListItem>
                             <ListItem><strong>WCAG 2.0 (A, AA)</strong>: referenced by US Section 508</ListItem>
diff --git a/accessibility-checker-extension/src/ts/docs/UsingACApp.tsx b/accessibility-checker-extension/src/ts/docs/UsingACApp.tsx
@@ -982,7 +982,7 @@ class UsingACApp extends React.Component<{}, UsingACAppState> {
                 </p>
                     <UnorderedList>
                         <ListItem><strong>IBM Accessibility 7.2</strong>: includes checking against WCAG 2.1 plus additional IBM requirements.</ListItem>
-                        <ListItem><strong>IBM Accessibility 7.3</strong>: includes checking against WCAG 2.2 plus additional IBM requirements. This will be the default starting Oct 1, 2024.</ListItem>
+                        <ListItem><strong>IBM Accessibility 7.3</strong>: includes checking against WCAG 2.2 plus additional IBM requirements. Default Oct 1, 2024.</ListItem>
                         <ListItem><strong>WCAG 2.2 (A, AA)</strong>: this is the latest W3C specification with no additional IBM requirements. Content that conforms to WCAG 2.2 also conforms to WCAG 2.1 and 2.0.</ListItem>
                         <ListItem><strong>WCAG 2.1 (A, AA)</strong>: referenced by earlier versions of EN 301 549 and other policies, but not the latest W3C specification. Content that conforms to WCAG 2.1 also conforms to WCAG 2.0.</ListItem>
                         <ListItem><strong>WCAG 2.0 (A, AA)</strong>: referenced by US Section 508.</ListItem>
diff --git a/accessibility-checker-extension/src/ts/options/OptionsApp.tsx b/accessibility-checker-extension/src/ts/options/OptionsApp.tsx
@@ -545,7 +545,7 @@ export class OptionsApp extends React.Component<{}, OptionsAppState> {
                             }).bind(this)}
                         >
                             <p style={{ maxWidth: "100%" }}><strong>IBM Accessibility 7.2</strong>: Rules for WCAG 2.1 plus additional IBM requirements.</p>
-                            <p style={{ maxWidth: "100%" }}><strong>IBM Accessibility 7.3</strong>: Rules for WCAG 2.2 plus additional IBM requirements. This will be the default starting Oct 1, 2024.</p>
+                            <p style={{ maxWidth: "100%" }}><strong>IBM Accessibility 7.3</strong>: Rules for WCAG 2.2 plus additional IBM requirements. Default Oct 1, 2024.</p>
                             <p style={{ maxWidth: "100%" }}><strong>WCAG 2.2 (A, AA)</strong>: Rules for the latest W3C specification. Content that conforms to WCAG 2.2 also conforms to 2.1 and 2.0.</p>
                             <p style={{ maxWidth: "100%" }}><strong>WCAG 2.1 (A, AA)</strong>: Content that conforms to WCAG 2.1 also conforms to WCAG 2.0. Referenced by EN 301 549 and other policies, but not the latest W3C specification.</p>
                             <p style={{ maxWidth: "100%" }}><strong>WCAG 2.0 (A, AA)</strong>: Referenced by US Section 508, but not the latest W3C specification.</p>
diff --git a/accessibility-checker/test/baselines/JSONObjectStructureVerification.html.json b/accessibility-checker/test/baselines/JSONObjectStructureVerification.html.json
diff --git a/accessibility-checker/test/baselines/JSONObjectStructureVerificationSelenium.html.json b/accessibility-checker/test/baselines/JSONObjectStructureVerificationSelenium.html.json

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ export let draggable_alternative_exists: Rule = {`
`37`	`37`	`}`
`38`	`38`	`},`
`39`	`39`	`rulesets: [{`
`40`		`- id: ["IBM_Accessibility_next", "WCAG_2_2"],`
	`40`	`+ id: [ "IBM_Accessibility", "IBM_Accessibility_next", "WCAG_2_2"],`
`41`	`41`	`num: ["2.5.7"],`
`42`	`42`	`level: eRulePolicy.VIOLATION,`
`43`	`43`	`toolkitLevel: eToolkitLevel.LEVEL_THREE`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ export let element_tabbable_unobscured: Rule = {`
`36`	`36`	`}`
`37`	`37`	`},`
`38`	`38`	`rulesets: [{`
`39`		`- id: ["IBM_Accessibility_next", "WCAG_2_2"],`
	`39`	`+ id: [ "IBM_Accessibility", "IBM_Accessibility_next", "WCAG_2_2"],`
`40`	`40`	`num: ["2.4.11"],`
`41`	`41`	`level: eRulePolicy.VIOLATION,`
`42`	`42`	`toolkitLevel: eToolkitLevel.LEVEL_THREE`
Original file line number	Diff line number	Diff line change
`@@ -545,7 +545,7 @@ export class OptionsApp extends React.Component<{}, OptionsAppState> {`
`545`	`545`	`}).bind(this)}`
`546`	`546`	`>`
`547`	`547`	`<p style={{ maxWidth: "100%" }}><strong>IBM Accessibility 7.2</strong>: Rules for WCAG 2.1 plus additional IBM requirements.</p>`
`548`		`- <p style={{ maxWidth: "100%" }}><strong>IBM Accessibility 7.3</strong>: Rules for WCAG 2.2 plus additional IBM requirements. This will be the default starting Oct 1, 2024.</p>`
	`548`	`+ <p style={{ maxWidth: "100%" }}><strong>IBM Accessibility 7.3</strong>: Rules for WCAG 2.2 plus additional IBM requirements. Default Oct 1, 2024.</p>`
`549`	`549`	`<p style={{ maxWidth: "100%" }}><strong>WCAG 2.2 (A, AA)</strong>: Rules for the latest W3C specification. Content that conforms to WCAG 2.2 also conforms to 2.1 and 2.0.</p>`
`550`	`550`	`<p style={{ maxWidth: "100%" }}><strong>WCAG 2.1 (A, AA)</strong>: Content that conforms to WCAG 2.1 also conforms to WCAG 2.0. Referenced by EN 301 549 and other policies, but not the latest W3C specification.</p>`
`551`	`551`	`<p style={{ maxWidth: "100%" }}><strong>WCAG 2.0 (A, AA)</strong>: Referenced by US Section 508, but not the latest W3C specification.</p>`