WIP: add more cases to remote change sorter

cozy-labs · May 9, 2019 · 64056f9 · 64056f9
1 parent 76a9543
commit 64056f9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/core/remote/change.js b/core/remote/change.js
@@ -280,7 +280,12 @@ const sorter = (a, b) => {
 
   // if there isnt 2 add paths, sort by del path
   if (lower(deletedId(b), deletedId(a))) return aFirst
-  return bFirst
+  if (lower(deletedId(a), deletedId(b))) return bFirst
+
+  if (lower(createdId(a), deletedId(b))) return bFirst
+  if (lower(deletedId(a), createdId(b))) return aFirst
+
+  return 0
 }
 
 function sort(changes /*: Array<RemoteChange> */) /*: void */ {

diff --git a/test/unit/remote/change.js b/test/unit/remote/change.js
@@ -16,7 +16,7 @@ describe('remote change sort', () => {
     }
     const a = [child, parent]
     remoteChange.sort(a)
-    a.should.deepEqual([parent, child])
+    a.should.deepEqual([child, parent])
   })
 
   describe('sorts deleted before created for the same path', () => {
@@ -152,15 +152,15 @@ describe('remote change sort', () => {
       // - conflicts before anything else on same id
       // - deletion before addition on same id
       changes.should.deepEqual([
-        alanInsuranceCardDeletion,
-        alanInsuranceCardAddition,
+        edfContract3Deletion,
         digipostBouyguesBill,
         edfContract1ConflictCreation,
         edfContract1Addition,
         edfContract2ConflictCreation,
         edfContract2Addition,
-        edfContract3Deletion,
         edfContract3Addition,
+        alanInsuranceCardDeletion,
+        alanInsuranceCardAddition,
         netflixBillAddition,
         photoAddition
       ])