(#312) - Add deletions to remaining collectLeaves functions

pouchdb · Feb 21, 2013 · 43882ca · 43882ca
1 parent e4be4d0
commit 43882ca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/adapters/pouch.idb.js b/src/adapters/pouch.idb.js
@@ -613,7 +613,7 @@ var IdbPouch = function(opts, callback) {
           doc.doc = data;
           doc.doc._rev = Pouch.merge.winningRev(metadata);
           if (opts.conflicts) {
-            doc.doc._conflicts = collectConflicts(metadata.rev_tree);
+            doc.doc._conflicts = collectConflicts(metadata.rev_tree, metadata.deletions);
           }
         }
         if ('keys' in opts) {
@@ -762,7 +762,7 @@ var IdbPouch = function(opts, callback) {
             change.deleted = true;
           }
           if (opts.conflicts) {
-            change.doc._conflicts = collectConflicts(metadata.rev_tree);
+            change.doc._conflicts = collectConflicts(metadata.rev_tree, metadata.deletions);
           }
 
           // Dedupe the changes feed

diff --git a/tests/test.all_docs.js b/tests/test.all_docs.js
@@ -217,17 +217,15 @@ adapters.map(function(adapter) {
                 complete: function(err, changes) {
                   var result = changes.results[3];
                   ok("3" === result.id, 'changes are ordered');
-                  ok(3 === result.changes.length, 'correct number of changes');
+                  equal(3, result.changes.length, 'correct number of changes');
                   ok(result.doc._rev === conflictDoc2._rev,
                      'correct winning revision');
                   equal("3", result.doc._id, 'correct doc id');
                   equal(winRev._rev, result.doc._rev,
                         'include doc has correct rev');
                   equal(true, result.doc._conflicts instanceof Array,
                         'include docs contains conflicts');
-                  ok(result.doc._conflicts &&
-                     2 === result.doc._conflicts.length,
-                     'correct number of changes');
+                  equal(2, result.doc._conflicts.length, 'correct number of changes');
                   db.allDocs({include_docs: true, conflicts: true}, function(err, res) {
                     var row = res.rows[3];
                     equal(4, res.rows.length, 'correct number of changes');
@@ -237,7 +235,7 @@ adapters.map(function(adapter) {
                     equal(row.doc._rev, winRev._rev, 'correct rev');
                     equal("3", row.doc._id, 'correct order');
                     ok(row.doc._conflicts instanceof Array);
-                    ok(row.doc._conflicts && 2 === row.doc._conflicts.length);
+                    equal(2, row.doc._conflicts.length, 'Correct number of conflicts');
                     start();
                   });
                 }