From 7f9398774383afa5e6914cc272d2cc76e1e95dd6 Mon Sep 17 00:00:00 2001 From: Jan Lehnardt Date: Sat, 28 Mar 2009 21:02:41 +0000 Subject: always load _conflicts in _show functions git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@759588 13f79535-47bb-0310-9956-ffa450edef68 --- share/www/script/test/show_documents.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'share') diff --git a/share/www/script/test/show_documents.js b/share/www/script/test/show_documents.js index f4aa62a7..c755898e 100644 --- a/share/www/script/test/show_documents.js +++ b/share/www/script/test/show_documents.js @@ -44,6 +44,11 @@ couchTests.show_documents = function(debug) { }; } }), + "json" : stringFun(function(doc, req) { + return { + json : doc + } + }), "req-info" : stringFun(function(doc, req) { return { json : req @@ -300,4 +305,17 @@ couchTests.show_documents = function(debug) { }); T(xhr.getResponseHeader("Content-Type") == "text/html"); T(xhr.responseText == "Ha ha, you said \"plankton\"."); + + // test inclusion of conflict state + var doc1 = {_id:"foo", a:1}; + var doc2 = {_id:"foo", a:2}; + db.save(doc1); + + //create the conflict with a all_or_nothing bulk docs request + var docs = [doc2]; + db.bulkSave(docs, {all_or_nothing:true}); + + xhr = CouchDB.request("GET", "/test_suite_db/_design/template/_show/json/foo"); + TEquals(1, JSON.parse(xhr.responseText)._conflicts.length); + }; -- cgit v1.2.3