Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Follow up: Add conflicts true parameter to tests

  • Loading branch information...
commit c4eebafa9ac184aa000eee2ec233c7b063a61a6c 1 parent 4e5019d
@daleharvey daleharvey authored
Showing with 4 additions and 4 deletions.
  1. +4 −4 tests/test.replication.js
View
8 tests/test.replication.js
@@ -236,7 +236,7 @@ adapters.map(function(adapters) {
db.put(doc1, function(err, localres) {
remote.put(doc2, function(err, remoteres) {
db.replicate.to(self.remote, function(err, _) {
-
+
var queryFun = {
map: function(doc) {
if (doc._conflicts) {
@@ -245,7 +245,7 @@ adapters.map(function(adapters) {
}
};
- remote.query(queryFun, {reduce: false}, function(_, res) {
+ remote.query(queryFun, {reduce: false, conflicts: true}, function(_, res) {
equal(res.rows.length, 1, "_conflict key exists");
start();
});
@@ -415,8 +415,8 @@ adapters.map(function(adapters) {
});
});
});
- });
-
+ });
+
asyncTest("Replication with deleted doc", function() {
console.info('Starting Test: Replication with deleted doc');
Please sign in to comment.
Something went wrong with that request. Please try again.