Merge pull request #142 from naugtur/fix-json-false

fix #141 - json set to false should mean no json

index.js

@@ -158,7 +158,7 @@ function _createXHR(options) {
     var isJson = false
     var timeoutTimer
 
-    if ("json" in options) {
+    if ("json" in options && options.json !== false) {
         isJson = true
         headers["accept"] || headers["Accept"] || (headers["Accept"] = "application/json") //Don't override existing accept header declared by user
         if (method !== "GET" && method !== "HEAD") {

test/index.js

@@ -203,6 +203,17 @@ test("[func] sends options.body as json body when options.json === true", functi
     })
 })
 
+test("[func] doesn't freak out when json option is false", function(assert) {
+    xhr.post("/mock/echo", {
+        json: false,
+        body: "{\"a\":1}"
+    }, function(err, resp, body) {
+        assert.notEqual(resp.rawRequest.headers["Content-Type"], "application/json")
+        assert.equal(body, "{\"a\":1}")
+        assert.end()
+    })
+})
+
 test("[func] sends options.json as body when it's not a boolean", function(assert) {
     xhr.post("/mock/echo", {
         json: {