fix(response content-type checking): more robust JSON response hand…

…ling (#89) Use `json: true` with request: request has more robust `content-type` checking.
godaddy · Mar 3, 2017 · ace816e · ace816e
1 parent f836101
commit ace816e
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 5 deletions.
diff --git a/lib/api-group.js b/lib/api-group.js
@@ -88,7 +88,8 @@ class ApiGroup {
     const requestOptions = Object.assign({
       method: method || 'GET',
       uri: this._url(options.path),
-      body: options.body && JSON.stringify(options.body),
+      body: options.body,
+      json: true,
       qs: options.qs,
       headers: options.headers
     }, this.requestOptions);
@@ -97,9 +98,6 @@ class ApiGroup {
 
     return request(requestOptions, (err, res, body) => {
       if (err) return cb(err);
-      if (res.headers['content-type'] === 'application/json') {
-        body = JSON.parse(body);
-      }
       cb(null, { statusCode: res.statusCode, body: body });
     });
   }

diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
   "dependencies": {
     "async": "^2.0.0-rc.6",
     "js-yaml": "^3.7.0",
-    "request": "^2.72.0"
+    "request": "^2.79.0"
   },
   "devDependencies": {
     "assume": "^1.4.1",

diff --git a/test/pods.test.js b/test/pods.test.js
@@ -23,6 +23,20 @@ const testPod = {
   }
 };
 
+const testPatch = {
+  metadata: {
+    name: 'test-pod'
+  },
+  spec: {
+    containers: [
+      {
+        image: 'still-does-not-matter:latest',
+        name: 'test'
+      }
+    ]
+  }
+};
+
 describe('lib.pods', () => {
 
   describe('.post', () => {
@@ -45,6 +59,32 @@ describe('lib.pods', () => {
     });
   });
 
+  describe('.patch', () => {
+    beforeTesting('int', done => {
+      common.changeName(err => {
+        assume(err).is.falsy();
+        common.api.ns.pods.post({ body: testPod }, (postErr, pod) => {
+          assume(postErr).is.falsy();
+          done();
+        });
+      });
+    });
+    beforeTestingEach('unit', () => {
+      nock(common.api.url)
+        .patch(`/api/v1/namespaces/${ common.currentName }/pods/test-pod`)
+        .reply(200, Object.assign({ kind: 'Pod' }, testPatch));
+    });
+
+    it('succeeds at updating a pod', done => {
+      common.api.ns.pods('test-pod').patch({ body: testPatch }, (err, pod) => {
+        assume(err).is.falsy();
+        assume(pod.metadata.name).is.equal('test-pod');
+        assume(pod.spec.containers[0].image).is.equal('still-does-not-matter:latest');
+        done();
+      });
+    });
+  });
+
   describe('.get', () => {
     beforeTesting('int', done => {
       common.changeName(err => {