chore: consistent node sorting

dequelabs · Jun 11, 2021 · cafc413 · cafc413
1 parent 88147ad
commit cafc413
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/lib/core/utils/merge-results.js b/lib/core/utils/merge-results.js
@@ -106,14 +106,21 @@ function mergeResults(frameResults, options) {
  mergedResult.forEach(result => {
  if (result.nodes) {
  result.nodes.sort((nodeA, nodeB) => {
- return nodeIndexSort(nodeA.node.nodeIndexes, nodeB.node.nodeIndexes);
+ return nodeIndexSort(
+ nodeA.node.nodeIndexes,
+ nodeB.node.nodeIndexes
+ );
  });
  }
  });
  return mergedResult;
 }
 
-function nodeIndexSort(nodeIndexesA, nodeIndexesB) {
+function nodeIndexSort(nodeIndexesA = [], nodeIndexesB = []) {
+ if (!Array.isArray(nodeIndexesB) || nodeIndexesB.length === 0 ) {
+ return -1
+ }
+
  for (let i = 0; i <= nodeIndexesA?.length; i++) {
  const indexA = nodeIndexesA[i];
  const indexB = nodeIndexesB?.[i];

diff --git a/test/core/utils/merge-results.js b/test/core/utils/merge-results.js
@@ -253,12 +253,12 @@ describe('axe.utils.mergeResults', function() {
  });
  // Order of "nill" varies between JS engines
  assert.deepEqual(ids, [
- 'nill',
- 'nill',
- 'nill',
  'h1',
  'iframe1 >> h2',
- 'h3'
+ 'h3',
+ 'nill',
+ 'nill',
+ 'nill'
  ]);
  });
 
@@ -327,12 +327,12 @@ describe('axe.utils.mergeResults', function() {
  });
  // Order of "nill" varies between JS engines
  assert.deepEqual(ids, [
- 'nill',
- 'nill',
- 'nill',
  'h1',
  'iframe1 >> h2',
- 'h3'
+ 'h3',
+ 'nill',
+ 'nill',
+ 'nill'
  ]);
  });
 });