Skip to content

Commit 822d241

Browse files
authored
Merge pull request #105 from browserstack/revert-104-revert-103-AXE-570_a11yEngineErrors
Revert "Revert "Fix: AXE-570 Fixed a11yEngineErrors being accessed on undefined""
2 parents a8b0958 + 3251c8c commit 822d241

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

lib/core/public/load.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@ function runCommand(data, keepalive, callback) {
4242
//a11y-engine iframe rules error merging logic
4343
const errors = a11yEngine.getErrors();
4444
if (Object.keys(errors).length !== 0) {
45-
if (results[results.length - 1].a11yEngineErrors) {
45+
if (
46+
results.length > 0 &&
47+
results[results.length - 1]?.a11yEngineErrors
48+
) {
4649
const error = results.pop();
4750
delete error.a11yEngineErrors;
4851
const mergedErrors = mergeErrors(error, errors);

lib/core/public/run-rules.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,10 @@ export default function runRules(context, options, resolve, reject) {
6767
// after should only run once, so ensure we are in the top level window
6868
if (context.initiator) {
6969
// Return a11y-engine errors when at top level window
70-
if (results[results.length - 1].a11yEngineErrors) {
70+
if (
71+
results.length > 0 &&
72+
results[results.length - 1]?.a11yEngineErrors
73+
) {
7174
const error = results.pop();
7275
delete error.a11yEngineErrors;
7376
a11yEngine.mergeErrors(error);

lib/core/utils/merge-results.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ function mergeResults(frameResults, options) {
8686

8787
const frameSpec = getFrameSpec(frameResult);
8888
// Extract existing errors and merge with new ones
89-
if (results[results.length - 1].a11yEngineErrors) {
89+
if (results.length > 0 && results[results.length - 1]?.a11yEngineErrors) {
9090
const error = results.pop();
9191
delete error.a11yEngineErrors;
9292
mergedErrors = mergeErrors(mergedErrors, error, frameSpec);

0 commit comments

Comments
 (0)