Iframe error merging logic added

Author: mattscepter

lib/core/utils/merge-results.js

@@ -1,6 +1,7 @@
 import nodeSerializer from './node-serializer';
 import getAllChecks from './get-all-checks';
 import findBy from './find-by';
+import mergeErrors from './merge-errors';
 
 /**
  * Adds the owning frame's CSS selector onto each instance of DqElement
@@ -75,13 +76,20 @@ function normalizeResult(result) {
  */
 function mergeResults(frameResults, options) {
   const mergedResult = [];
+  let mergedErrors = {};
   frameResults.forEach(frameResult => {
     const results = normalizeResult(frameResult);
     if (!results || !results.length) {
       return;
     }
 
     const frameSpec = getFrameSpec(frameResult);
+    if (results[results.length - 1].errorsObj) {
+      const error = results.pop();
+      delete error.errorsObj;
+      mergedErrors = mergeErrors(mergedErrors, error, frameSpec);
+    }
+
     results.forEach(ruleResult => {
       if (ruleResult.nodes && frameSpec) {
         pushFrame(ruleResult.nodes, options, frameSpec);
@@ -106,7 +114,11 @@ function mergeResults(frameResults, options) {
       });
     }
   });
-  return mergedResult;
+
+  if (Object.keys(mergedErrors).length === 0) {
+    return mergedResult;
+  }
+  return [...mergedResult, { ...mergedErrors, errorsObj: true }];
 }
 
 function nodeIndexSort(nodeIndexesA = [], nodeIndexesB = []) {