Skip to content

Commit

Permalink
Merge branch 'master' into issue-baselines
Browse files Browse the repository at this point in the history
  • Loading branch information
shunguoy authored Nov 13, 2024
2 parents 45e8c27 + 464d47d commit 3119a3c
Show file tree
Hide file tree
Showing 6 changed files with 142 additions and 14 deletions.
8 changes: 4 additions & 4 deletions accessibility-checker-engine/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@
//{ pattern: 'test/v2/checker/accessibility/rules/label_name_visible_ruleunit/label_offscreen.html', watched: true },
//{ pattern: 'test/v2/checker/accessibility/rules/aria_role_valid_ruleunit/td_attribute_invalid_copy.html', watched: true },
//{ pattern: 'test/v2/checker/accessibility/rules/text_block_heading_ruleunit/Headings-noneUsedEmphasizedText.html', watched: true },
{ pattern: 'test/v2/checker/accessibility/rules/aria_parent_required_ruleunit/webComponentPass.html', watched: true },
{ pattern: 'test/v2/checker/accessibility/rules/aria_parent_required_ruleunit/webComponentPass2.html', watched: true },
{ pattern: 'test/v2/checker/accessibility/rules/aria_landmark_name_unique_ruleunit/*.html', watched: true },
// { pattern: 'test/v2/checker/accessibility/rules/aria_parent_required_ruleunit/webComponentPass2.html', watched: true },


{ pattern: 'test/**/*_ruleunit/*.html', watched: true },
{ pattern: 'test/**/*_ruleunit/*.htm', watched: true },
// { pattern: 'test/**/*_ruleunit/*.html', watched: true },
// { pattern: 'test/**/*_ruleunit/*.htm', watched: true },
// all files ending in "_test"
// { pattern: 'test/*_test.js', watched: true },
{ pattern: 'test/**/*_test.js', watched: true }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export const element_accesskey_labelled: Rule = {
if (!roles || roles.length === 0) return;

let patterns = ARIADefinitions.designPatterns[roles[0]]
if (!patterns.nameFrom)
if (!patterns || !patterns.nameFrom)
return;

// ignore if accessble name is required (checked in other rules) or prohibited (text element)
Expand Down
2 changes: 1 addition & 1 deletion accessibility-checker-engine/src/v4/util/AriaUtil.ts
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,7 @@ export class AriaUtil {
if (widget === null) {
let ret = false;
const role = AriaUtil.getResolvedRole(element);
if (role && ARIADefinitions.designPatterns[role].roleType === 'widget')
if (role && ARIADefinitions.designPatterns[role] && ARIADefinitions.designPatterns[role].roleType === 'widget')
ret = true;

CacheUtil.setCache(element.ownerDocument, "is_element_widget", ret);
Expand Down
4 changes: 2 additions & 2 deletions accessibility-checker-engine/src/v4/util/CommonUtil.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1646,8 +1646,8 @@ export class CommonUtil {
}

// truncate the given text to a given number of characters
// return truncated text
public static truncateText(text: string, len = 60) {
// return truncated text to 150 chars, same with the media_alt_brief rule
public static truncateText(text: string, len = 150) {
if (!text) return text;
text = text.trim();
if (text.length > len)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">

<!--
/******************************************************************************
Copyright:: 2020- IBM, Inc
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*****************************************************************************/
-->

<html lang="en">
<head>
<title>RPT Test Suite</title>
</head>

<body>
<main role="main">
<section
role="region"
aria-labelledby="twlp_sec_jca__adeappbind__title__1"
id="twlp_sec_jca__adeappbind"
>
<h2
id="twlp_sec_jca__adeappbind__title__1"
>
Configuring authentication data and aliases with
authData and a resource reference
</h2>
</section>

<section
role="region"
aria-labelledby="twlp_sec_jca__cdade__title__1"
id="twlp_sec_jca__cdade"
>
<h2 id="twlp_sec_jca__cdade__title__1">
Configuring authentication data and aliases with
containerAuthData
</h2>
</section>

<section
role="region"
aria-labelledby="twlp_sec_jca__adcadr__title__1"
id="twlp_sec_jca__adcadr"
>
<h2
id="twlp_sec_jca__adcadr__title__1"
>
Configuring authentication data and aliases with
authData and containerAuthDataRef
</h2>
</section>
</main>
<script type="text/javascript">
UnitTest = {
ruleIds: ["aria_landmark_name_unique"],
results: [
{
"ruleId": "aria_landmark_name_unique",
"value": [
"INFORMATION",
"PASS"
],
"path": {
"dom": "/html[1]/body[1]/main[1]/section[1]",
"aria": "/document[1]/main[1]/region[1]"
},
"reasonId": "Pass_0",
"message": "Multiple elements with \"region\" landmarks within the same parent region are distinguished by unique 'aria-label' or 'aria-labelledby'",
"messageArgs": [
"region"
],
"apiArgs": [],
"category": "Accessibility"
},
{
"ruleId": "aria_landmark_name_unique",
"value": [
"INFORMATION",
"PASS"
],
"path": {
"dom": "/html[1]/body[1]/main[1]/section[2]",
"aria": "/document[1]/main[1]/region[2]"
},
"reasonId": "Pass_0",
"message": "Multiple elements with \"region\" landmarks within the same parent region are distinguished by unique 'aria-label' or 'aria-labelledby'",
"messageArgs": [
"region"
],
"apiArgs": [],
"category": "Accessibility"
},
{
"ruleId": "aria_landmark_name_unique",
"value": [
"INFORMATION",
"PASS"
],
"path": {
"dom": "/html[1]/body[1]/main[1]/section[3]",
"aria": "/document[1]/main[1]/region[3]"
},
"reasonId": "Pass_0",
"message": "Multiple elements with \"region\" landmarks within the same parent region are distinguished by unique 'aria-label' or 'aria-labelledby'",
"messageArgs": [
"region"
],
"apiArgs": [],
"category": "Accessibility"
}
],
};
//]]>
</script>
</body>
</html>
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,9 @@ <h3>Input type Tests</h3>
"aria": "/document[1]/form[2]/group[1]"
},
"reasonId": "Fail_2",
"message": "Group/Fieldset \"this is a potentially very long description of the fieldset...\" has a duplicate name to another group",
"message": "Group/Fieldset \"this is a potentially very long description of the fieldset and more description is possible\" has a duplicate name to another group",
"messageArgs": [
"this is a potentially very long description of the fieldset..."
"this is a potentially very long description of the fieldset and more description is possible"
],
"apiArgs": [],
"category": "Accessibility"
Expand All @@ -148,9 +148,9 @@ <h3>Input type Tests</h3>
"aria": "/document[1]/form[3]/group[1]"
},
"reasonId": "Fail_2",
"message": "Group/Fieldset \"this is a potentially very long description of the fieldset...\" has a duplicate name to another group",
"message": "Group/Fieldset \"this is a potentially very long description of the fieldset and more description is possible\" has a duplicate name to another group",
"messageArgs": [
"this is a potentially very long description of the fieldset..."
"this is a potentially very long description of the fieldset and more description is possible"
],
"apiArgs": [],
"category": "Accessibility"
Expand All @@ -166,9 +166,9 @@ <h3>Input type Tests</h3>
"aria": "/document[1]/form[4]/group[1]"
},
"reasonId": "Fail_2",
"message": "Group/Fieldset \"this is a potentially very long description of the fieldset...\" has a duplicate name to another group",
"message": "Group/Fieldset \"this is a potentially very long description of the fieldset and more description is possible\" has a duplicate name to another group",
"messageArgs": [
"this is a potentially very long description of the fieldset..."
"this is a potentially very long description of the fieldset and more description is possible"
],
"apiArgs": [],
"category": "Accessibility"
Expand Down

0 comments on commit 3119a3c

Please sign in to comment.