Merge pull request #104 from browserstack/revert-103-AXE-570_a11yEngi…

…neErrors Revert "Fix: AXE-570 Fixed a11yEngineErrors being accessed on undefined"
browserstack · Oct 9, 2024 · a8b0958 · a8b0958
2 parents 1f811bf + 5610917
commit a8b0958
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/lib/core/public/load.js b/lib/core/public/load.js
@@ -42,10 +42,7 @@ function runCommand(data, keepalive, callback) {
           //a11y-engine iframe rules error merging logic
           const errors = a11yEngine.getErrors();
           if (Object.keys(errors).length !== 0) {
-            if (
-              results.length > 0 &&
-              results[results.length - 1]?.a11yEngineErrors
-            ) {
+            if (results[results.length - 1].a11yEngineErrors) {
               const error = results.pop();
               delete error.a11yEngineErrors;
               const mergedErrors = mergeErrors(error, errors);

diff --git a/lib/core/public/run-rules.js b/lib/core/public/run-rules.js
@@ -67,10 +67,7 @@ export default function runRules(context, options, resolve, reject) {
       // after should only run once, so ensure we are in the top level window
       if (context.initiator) {
         // Return a11y-engine errors when at top level window
-        if (
-          results.length > 0 &&
-          results[results.length - 1]?.a11yEngineErrors
-        ) {
+        if (results[results.length - 1].a11yEngineErrors) {
           const error = results.pop();
           delete error.a11yEngineErrors;
           a11yEngine.mergeErrors(error);

diff --git a/lib/core/utils/merge-results.js b/lib/core/utils/merge-results.js
@@ -86,7 +86,7 @@ function mergeResults(frameResults, options) {
 
     const frameSpec = getFrameSpec(frameResult);
     // Extract existing errors and merge with new ones
-    if (results.length > 0 && results[results.length - 1]?.a11yEngineErrors) {
+    if (results[results.length - 1].a11yEngineErrors) {
       const error = results.pop();
       delete error.a11yEngineErrors;
       mergedErrors = mergeErrors(mergedErrors, error, frameSpec);