diff options
author | Adam Kocoloski <kocolosk@apache.org> | 2009-07-07 02:59:26 +0000 |
---|---|---|
committer | Adam Kocoloski <kocolosk@apache.org> | 2009-07-07 02:59:26 +0000 |
commit | b6b9b984330ed90886c2d135dea542406549d31d (patch) | |
tree | 573cd6d9679b2c5902b851b989772be6c6148351 /share/www/script | |
parent | 282b96ddd9a84b740788c2358ec0f5fedafb7cc6 (diff) |
fix deleted_conflicts qs parameter
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@791684 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'share/www/script')
-rw-r--r-- | share/www/script/test/replication.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/share/www/script/test/replication.js b/share/www/script/test/replication.js index c9caa5ee..5c06dd4e 100644 --- a/share/www/script/test/replication.js +++ b/share/www/script/test/replication.js @@ -205,12 +205,15 @@ couchTests.replication = function(debug) { this.afterBA2 = function(dbA, dbB) { // open documents and include the conflict meta data - var docA = dbA.open("foo", {conflicts: true}); - var docB = dbB.open("foo", {conflicts: true}); + var docA = dbA.open("foo", {conflicts: true, deleted_conflicts: true}); + var docB = dbB.open("foo", {conflicts: true, deleted_conflicts: true}); // We should have no conflicts this time T(docA._conflicts === undefined) T(docB._conflicts === undefined); + + // They show up as deleted conflicts instead + T(docA._deleted_conflicts[0] == docB._deleted_conflicts[0]); }; } }; |