From aef4ab16e9208e68f237fb2869343b851b79eb7c Mon Sep 17 00:00:00 2001
From: Leo Horie <leohorie@hotmail.com>
Date: Wed, 26 Oct 2016 20:27:20 -0400
Subject: [PATCH] fix tests

---
 request/tests/test-jsonp.js   | 12 ++---
 request/tests/test-request.js | 86 +++++++++++++++++------------------
 tests/test-api.js             |  2 +-
 3 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/request/tests/test-jsonp.js b/request/tests/test-jsonp.js
index a0aff58c..5fcc728c 100644
--- a/request/tests/test-jsonp.js
+++ b/request/tests/test-jsonp.js
@@ -21,9 +21,9 @@ o.spec("jsonp", function() {
 				return {status: 200, responseText: queryData["callback"] + "(" + JSON.stringify({a: 1}) + ")"}
 			}
 		})
-		jsonp({url: "/item"}).map(function(data) {
+		jsonp({url: "/item"}).run(function(data) {
 			o(data).deepEquals({a: 1})
-		}).map(done)
+		}).run(done)
 	})
 	o("works w/ other querystring params", function(done) {
 		mock.$defineRoutes({
@@ -32,10 +32,10 @@ o.spec("jsonp", function() {
 				return {status: 200, responseText: queryData["callback"] + "(" + JSON.stringify(queryData) + ")"}
 			}
 		})
-		jsonp({url: "/item", data: {a: "b", c: "d"}}).map(function(data) {
+		jsonp({url: "/item", data: {a: "b", c: "d"}}).run(function(data) {
 			delete data["callback"]
 			o(data).deepEquals({a: "b", c: "d"})
-		}).map(done)
+		}).run(done)
 	})
 	o("works w/ custom callbackKey", function(done) {
 		mock.$defineRoutes({
@@ -44,9 +44,9 @@ o.spec("jsonp", function() {
 				return {status: 200, responseText: queryData["cb"] + "(" + JSON.stringify({a: 2}) + ")"}
 			}
 		})
-		jsonp({url: "/item", callbackKey: "cb"}).map(function(data) {
+		jsonp({url: "/item", callbackKey: "cb"}).run(function(data) {
 			o(data).deepEquals({a: 2})
-		}).map(done)
+		}).run(done)
 	})
 	o("handles error", function(done) {
 		jsonp({url: "/item", callbackKey: "cb"}).catch(function(e) {
diff --git a/request/tests/test-request.js b/request/tests/test-request.js
index b39718f2..402c10fc 100644
--- a/request/tests/test-request.js
+++ b/request/tests/test-request.js
@@ -21,9 +21,9 @@ o.spec("xhr", function() {
 					return {status: 200, responseText: JSON.stringify({a: 1})}
 				}
 			})
-			xhr({method: "GET", url: "/item"}).map(function(data) {
+			xhr({method: "GET", url: "/item"}).run(function(data) {
 				o(data).deepEquals({a: 1})
-			}).map(function() {
+			}).run(function() {
 				done()
 			})
 		})
@@ -33,9 +33,9 @@ o.spec("xhr", function() {
 					return {status: 200, responseText: JSON.stringify({a: 1})}
 				}
 			})
-			xhr({method: "GET", url: "/item"}).map(function(data) {
+			xhr({method: "GET", url: "/item"}).run(function(data) {
 				o(data).deepEquals({a: 1})
-			}).map(done)
+			}).run(done)
 		})
 		o("works w/ parameterized data via GET", function(done) {
 			mock.$defineRoutes({
@@ -43,9 +43,9 @@ o.spec("xhr", function() {
 					return {status: 200, responseText: JSON.stringify({a: request.query})}
 				}
 			})
-			xhr({method: "GET", url: "/item", data: {x: "y"}}).map(function(data) {
+			xhr({method: "GET", url: "/item", data: {x: "y"}}).run(function(data) {
 				o(data).deepEquals({a: "?x=y"})
-			}).map(done)
+			}).run(done)
 		})
 		o("works w/ parameterized data via POST", function(done) {
 			mock.$defineRoutes({
@@ -53,9 +53,9 @@ o.spec("xhr", function() {
 					return {status: 200, responseText: JSON.stringify({a: JSON.parse(request.body)})}
 				}
 			})
-			xhr({method: "POST", url: "/item", data: {x: "y"}}).map(function(data) {
+			xhr({method: "POST", url: "/item", data: {x: "y"}}).run(function(data) {
 				o(data).deepEquals({a: {x: "y"}})
-			}).map(done)
+			}).run(done)
 		})
 		o("works w/ parameterized data containing colon via GET", function(done) {
 			mock.$defineRoutes({
@@ -63,9 +63,9 @@ o.spec("xhr", function() {
 					return {status: 200, responseText: JSON.stringify({a: request.query})}
 				}
 			})
-			xhr({method: "GET", url: "/item", data: {x: ":y"}}).map(function(data) {
+			xhr({method: "GET", url: "/item", data: {x: ":y"}}).run(function(data) {
 				o(data).deepEquals({a: "?x=%3Ay"})
-			}).map(done)
+			}).run(done)
 		})
 		o("works w/ parameterized data containing colon via POST", function(done) {
 			mock.$defineRoutes({
@@ -73,9 +73,9 @@ o.spec("xhr", function() {
 					return {status: 200, responseText: JSON.stringify({a: JSON.parse(request.body)})}
 				}
 			})
-			xhr({method: "POST", url: "/item", data: {x: ":y"}}).map(function(data) {
+			xhr({method: "POST", url: "/item", data: {x: ":y"}}).run(function(data) {
 				o(data).deepEquals({a: {x: ":y"}})
-			}).map(done)
+			}).run(done)
 		})
 		o("works w/ parameterized url via GET", function(done) {
 			mock.$defineRoutes({
@@ -83,9 +83,9 @@ o.spec("xhr", function() {
 					return {status: 200, responseText: JSON.stringify({a: request.url, b: request.query})}
 				}
 			})
-			xhr({method: "GET", url: "/item/:x", data: {x: "y"}}).map(function(data) {
+			xhr({method: "GET", url: "/item/:x", data: {x: "y"}}).run(function(data) {
 				o(data).deepEquals({a: "/item/y", b: {}})
-			}).map(done)
+			}).run(done)
 		})
 		o("works w/ parameterized url via POST", function(done) {
 			mock.$defineRoutes({
@@ -93,9 +93,9 @@ o.spec("xhr", function() {
 					return {status: 200, responseText: JSON.stringify({a: request.url, b: JSON.parse(request.body)})}
 				}
 			})
-			xhr({method: "POST", url: "/item/:x", data: {x: "y"}}).map(function(data) {
+			xhr({method: "POST", url: "/item/:x", data: {x: "y"}}).run(function(data) {
 				o(data).deepEquals({a: "/item/y", b: {}})
-			}).map(done)
+			}).run(done)
 		})
 		o("ignores unresolved parameter via GET", function(done) {
 			mock.$defineRoutes({
@@ -103,9 +103,9 @@ o.spec("xhr", function() {
 					return {status: 200, responseText: JSON.stringify({a: request.url})}
 				}
 			})
-			xhr({method: "GET", url: "/item/:x"}).map(function(data) {
+			xhr({method: "GET", url: "/item/:x"}).run(function(data) {
 				o(data).deepEquals({a: "/item/:x"})
-			}).map(done)
+			}).run(done)
 		})
 		o("ignores unresolved parameter via POST", function(done) {
 			mock.$defineRoutes({
@@ -113,9 +113,9 @@ o.spec("xhr", function() {
 					return {status: 200, responseText: JSON.stringify({a: request.url})}
 				}
 			})
-			xhr({method: "GET", url: "/item/:x"}).map(function(data) {
+			xhr({method: "GET", url: "/item/:x"}).run(function(data) {
 				o(data).deepEquals({a: "/item/:x"})
-			}).map(done)
+			}).run(done)
 		})
 		o("type parameter works for Array responses", function(done) {
 			var Entity = function(args) {
@@ -127,9 +127,9 @@ o.spec("xhr", function() {
 					return {status: 200, responseText: JSON.stringify([{id: 1}, {id: 2}, {id: 3}])}
 				}
 			})
-			xhr({method: "GET", url: "/item", type: Entity}).map(function(data) {
+			xhr({method: "GET", url: "/item", type: Entity}).run(function(data) {
 				o(data).deepEquals([{_id: 1}, {_id: 2}, {_id: 3}])
-			}).map(done)
+			}).run(done)
 		})
 		o("type parameter works for Object responses", function(done) {
 			var Entity = function(args) {
@@ -141,9 +141,9 @@ o.spec("xhr", function() {
 					return {status: 200, responseText: JSON.stringify({id: 1})}
 				}
 			})
-			xhr({method: "GET", url: "/item", type: Entity}).map(function(data) {
+			xhr({method: "GET", url: "/item", type: Entity}).run(function(data) {
 				o(data).deepEquals({_id: 1})
-			}).map(done)
+			}).run(done)
 		})
 		o("serialize parameter works in GET", function(done) {
 			var serialize = function(data) {
@@ -155,9 +155,9 @@ o.spec("xhr", function() {
 					return {status: 200, responseText: JSON.stringify({body: request.query})}
 				}
 			})
-			xhr({method: "GET", url: "/item", serialize: serialize, data: {id: 1}}).map(function(data) {
+			xhr({method: "GET", url: "/item", serialize: serialize, data: {id: 1}}).run(function(data) {
 				o(data.body).equals("?id=1")
-			}).map(done)
+			}).run(done)
 		})
 		o("serialize parameter works in POST", function(done) {
 			var serialize = function(data) {
@@ -169,9 +169,9 @@ o.spec("xhr", function() {
 					return {status: 200, responseText: JSON.stringify({body: request.body})}
 				}
 			})
-			xhr({method: "POST", url: "/item", serialize: serialize, data: {id: 1}}).map(function(data) {
+			xhr({method: "POST", url: "/item", serialize: serialize, data: {id: 1}}).run(function(data) {
 				o(data.body).equals("id=1")
-			}).map(done)
+			}).run(done)
 		})
 		o("deserialize parameter works in GET", function(done) {
 			var deserialize = function(data) {
@@ -183,9 +183,9 @@ o.spec("xhr", function() {
 					return {status: 200, responseText: JSON.stringify({test: 123})}
 				}
 			})
-			xhr({method: "GET", url: "/item", deserialize: deserialize}).map(function(data) {
+			xhr({method: "GET", url: "/item", deserialize: deserialize}).run(function(data) {
 				o(data).equals("{\"test\":123}")
-			}).map(done)
+			}).run(done)
 		})
 		o("deserialize parameter works in POST", function(done) {
 			var deserialize = function(data) {
@@ -197,9 +197,9 @@ o.spec("xhr", function() {
 					return {status: 200, responseText: JSON.stringify({test: 123})}
 				}
 			})
-			xhr({method: "POST", url: "/item", deserialize: deserialize}).map(function(data) {
+			xhr({method: "POST", url: "/item", deserialize: deserialize}).run(function(data) {
 				o(data).equals("{\"test\":123}")
-			}).map(done)
+			}).run(done)
 		})
 		o("extract parameter works in GET", function(done) {
 			var extract = function(data) {
@@ -211,9 +211,9 @@ o.spec("xhr", function() {
 					return {status: 200, responseText: ""}
 				}
 			})
-			xhr({method: "GET", url: "/item", extract: extract}).map(function(data) {
+			xhr({method: "GET", url: "/item", extract: extract}).run(function(data) {
 				o(data).equals("{\"test\":123}")
-			}).map(done)
+			}).run(done)
 		})
 		o("extract parameter works in POST", function(done) {
 			var extract = function(data) {
@@ -225,9 +225,9 @@ o.spec("xhr", function() {
 					return {status: 200, responseText: ""}
 				}
 			})
-			xhr({method: "POST", url: "/item", extract: extract}).map(function(data) {
+			xhr({method: "POST", url: "/item", extract: extract}).run(function(data) {
 				o(data).equals("{\"test\":123}")
-			}).map(done)
+			}).run(done)
 		})
 		o("ignores deserialize if extract is defined", function(done) {
 			var extract = function(data) {
@@ -240,11 +240,11 @@ o.spec("xhr", function() {
 					return {status: 200, responseText: ""}
 				}
 			})
-			xhr({method: "GET", url: "/item", extract: extract, deserialize: deserialize}).map(function(data) {
+			xhr({method: "GET", url: "/item", extract: extract, deserialize: deserialize}).run(function(data) {
 				o(data).equals(200)
-			}).map(function() {
+			}).run(function() {
 				o(deserialize.callCount).equals(0)
-			}).map(done)
+			}).run(done)
 		})
 		o("config parameter works", function(done) {
 			mock.$defineRoutes({
@@ -252,7 +252,7 @@ o.spec("xhr", function() {
 					return {status: 200, responseText: ""}
 				}
 			})
-			xhr({method: "POST", url: "/item", config: config}).map(done)
+			xhr({method: "POST", url: "/item", config: config}).run(done)
 			
 			function config(xhr) {
 				o(typeof xhr.setRequestHeader).equals("function")
@@ -281,7 +281,7 @@ o.spec("xhr", function() {
 			xhr({method: "GET", url: "/item"}).catch(function(e) {
 				o(e instanceof Error).equals(true)
 				o(e.message).equals(JSON.stringify({error: "error"}))
-			}).map(done)
+			}).run(done)
 		})
 		o("extends Error with JSON response", function(done) {
 			mock.$defineRoutes({
@@ -293,7 +293,7 @@ o.spec("xhr", function() {
 				o(e instanceof Error).equals(true)
 				o(e.message).equals("error")
 				o(e.stack).equals("error on line 1")
-			}).map(done)
+			}).run(done)
 		})
 		o("rejects on non-JSON server error", function(done) {
 			mock.$defineRoutes({
@@ -303,7 +303,7 @@ o.spec("xhr", function() {
 			})
 			xhr({method: "GET", url: "/item"}).catch(function(e) {
 				o(e.message).equals("error")
-			}).map(done)
+			}).run(done)
 		})
 	})
 })
diff --git a/tests/test-api.js b/tests/test-api.js
index e8e24260..f54d1daf 100644
--- a/tests/test-api.js
+++ b/tests/test-api.js
@@ -88,7 +88,7 @@ o.spec("api", function() {
 		o("works", function() {
 			var query = m.parseQueryString("?a=1&b=2")
 			
-			o(query).deepEquals({a: 1, b: 2})
+			o(query).deepEquals({a: "1", b: "2"})
 		})
 	})
 	o.spec("m.buildQueryString", function() {