Added test case for document handling, fixed bugs on the go

felixge · Jun 27, 2009 · 38ab66e · 38ab66e
1 parent e661da0
commit 38ab66e
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/module/node-couch.js b/module/node-couch.js
@@ -162,12 +162,16 @@ exports.CouchDB = {
 				doc = doc || {};
 				var success = options.success;
 				options.success = function(result) {
-					doc._id = result._id;
-					doc._rev = result._rev;
-					if (success) { success(result); }
+					if (!result.ok) {
+						options.error(result);
+					} else {
+						doc._id = result.id;
+						doc._rev = result.rev;
+					}
+					if (success) { success(doc); }
 				};
 
-				options.body = toJSON(doc);
+				options.body = doc;
 
 				if (doc._id === undefined) {
 					this.interact("post", "", 201, options);
@@ -178,13 +182,18 @@ exports.CouchDB = {
 
 			removeDoc : function(doc, options) {
 				options = options || {};
+				options.rev = doc._rev;
+
 				var success = options.success;
 				options.success = function(result) {
+					if (!result.ok) {
+						options.error(result);
+					}
 					delete doc._rev;
 					if (success) {
-						success(result); 
+						success(doc);						 
 					}
-				}
+				};
 
 				this.interact("del", doc._id, 200, options);
 			},

diff --git a/test/mjsunit/test-activeTasks.js b/test/mjsunit/test-activeTasks.js
@@ -2,7 +2,7 @@ include("mjsunit.js");
 include("../../module/node-couch.js");
 
 function unwantedError(result) {
-	throw new Exception("Unwanted error " + result);
+	throw("Unwanted error" + JSON.stringify(result));
 }
 
 var result;

diff --git a/test/mjsunit/test-allDbs.js b/test/mjsunit/test-allDbs.js
@@ -2,7 +2,7 @@ include("mjsunit.js");
 include("../../module/node-couch.js");
 
 function unwantedError(result) {
-	throw new Exception("Unwanted error " + result);
+	throw("Unwanted error" + JSON.stringify(result));
 }
 
 var result;

diff --git a/test/mjsunit/test-create-compact-info-drop.js b/test/mjsunit/test-create-compact-info-drop.js
@@ -2,7 +2,7 @@ include("mjsunit.js");
 include("../../module/node-couch.js");
 
 function unwantedError(result) {
-	throw new Exception("Unwanted error " + result);
+	throw("Unwanted error" + JSON.stringify(result));
 }
 
 var db;

diff --git a/test/mjsunit/test-generateUUIDs.js b/test/mjsunit/test-generateUUIDs.js
@@ -2,7 +2,7 @@ include("mjsunit.js");
 include("../../module/node-couch.js");
 
 function unwantedError(result) {
-	throw new Exception("Unwanted error " + result);
+	throw("Unwanted error" + JSON.stringify(result));
 }
 
 var result = 0;