Fix expectedIndex for move items

Author: sunesimonsen

lib/arrayChanges.js

@@ -59,6 +59,13 @@ module.exports = function arrayChanges(actual, expected, equal, similar, options
         return i;
     }
 
+
+    function findMoveTargetWithId(id) {
+        return mutatedArray.find(function (diffItem) {
+            return diffItem.type === 'moveTarget' && diffItem.id === id;
+        });
+    }
+
     var removes = itemsDiff.filter(function (diffItem) {
         return diffItem.type === 'remove';
     });
@@ -76,15 +83,13 @@ module.exports = function arrayChanges(actual, expected, equal, similar, options
         return diffItem.type === 'move';
     });
 
-
+    var ids = 0;
     moves.forEach(function (diffItem) {
         var moveFromIndex = offsetIndex(diffItem.from + 1) - 1;
         var removed = mutatedArray.slice(moveFromIndex, diffItem.howMany + moveFromIndex);
         removed.forEach(function (v, index) {
             v.type = 'moveSource';
-            v.expectedIndex = offsetIndex(diffItem.to + index);
-            v.expected = expected[v.expectedIndex];
-            v.equal = equal(v.value, v.expected);
+            v.id = ids++;
         });
         var added = removed.map(function (v, index) {
             return extend({}, v, { last: false, type: 'moveTarget' });
@@ -93,7 +98,6 @@ module.exports = function arrayChanges(actual, expected, equal, similar, options
         Array.prototype.splice.apply(mutatedArray, [insertIndex, 0].concat(added));
     });
 
-
     var inserts = itemsDiff.filter(function (diffItem) {
         return diffItem.type === 'insert';
     });
@@ -114,14 +118,27 @@ module.exports = function arrayChanges(actual, expected, equal, similar, options
     var offset = 0;
     mutatedArray.forEach(function (diffItem, index) {
         var type = diffItem.type;
-        if (type === 'remove' || type === 'moveSource') {
+        if (type === 'moveTarget') {
+            diffItem.expected = expected[offset + index];
+            diffItem.expectedIndex = offset + index;
+            diffItem.equal = equal(diffItem.value, diffItem.expected);
+        } else if (type === 'remove' || type === 'moveSource') {
             offset -= 1;
         } else if (type === 'similar') {
             diffItem.expected = expected[offset + index];
             diffItem.expectedIndex = offset + index;
         }
     });
 
+    mutatedArray.forEach(function (diffItem) {
+        if (diffItem.type === 'moveSource') {
+            var moveTarget = findMoveTargetWithId(diffItem.id);
+            diffItem.expected = moveTarget.expected;
+            diffItem.expectedIndex = moveTarget.expectedIndex;
+            diffItem.equal = moveTarget.equal;
+        }
+    });
+
     var conflicts = mutatedArray.reduce(function (conflicts, item) {
         return item.type === 'similar' || item.type === 'moveSource' || item.type === 'moveTarget' ? conflicts : conflicts + 1;
     }, 0);