Fix Merge tests

cozy-labs · Apr 24, 2017 · 13d0c3d · 13d0c3d
1 parent 8f79a44
commit 13d0c3d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/merge.js b/src/merge.js
@@ -180,7 +180,7 @@ class Merge {
         if (doc.size == null) { doc.size = file.size }
         if (doc.class == null) { doc.class = file.class }
         if (doc.mime == null) { doc.mime = file.mime }
-      } else if (!isUpToDate(side, doc)) {
+      } else if (!isUpToDate(side, file)) {
         return this.resolveConflictAsync(side, doc)
       }
       if (sameFile(file, doc)) {

diff --git a/test/unit/merge.js b/test/unit/merge.js
@@ -146,7 +146,11 @@ describe('Merge', function () {
           path: 'FIZZBUZZ.JPG',
           docType: 'file',
           md5sum: '3333333333333333333333333333333333333333',
-          tags: ['qux', 'quux']
+          tags: ['qux', 'quux'],
+          sides: {
+            local: 2,
+            remote: 2
+          }
         }
         this.merge.updateFileAsync(this.side, clone(doc)).then(() => {
           this.pouch.db.get(this.file._id, function (err, res) {