Merge pull request core-api#37 from ruipgil/master

tomchristie · web-flow · commit 26cad758f155 · 2017-10-05T10:35:03.000+01:00
Fix null contentType in negotiateDecoder
diff --git a/lib/utils.js b/lib/utils.js
@@ -14,7 +14,7 @@ const determineTransport = function (transports, url) {
 }
 
 const negotiateDecoder = function (decoders, contentType) {
-  if (contentType === undefined) {
+  if (contentType === undefined || contentType === null) {
     return decoders[0]
   }
 
diff --git a/tests/utils.js b/tests/utils.js
@@ -29,6 +29,12 @@ describe('Test the Utils/negotiateDecoder function', function () {
     expect(result instanceof coreapi.codecs.CoreJSONCodec).toBeTruthy()
   })
 
+  it('should return the default decoder if content type is null', function () {
+    const contentType = null
+    const result = utils.negotiateDecoder(decoders, contentType)
+    expect(result instanceof coreapi.codecs.CoreJSONCodec).toBeTruthy()
+  })
+
   it('should return the decoder for a content type (application/json)', function () {
     const contentType = 'application/json'
     const result = utils.negotiateDecoder(decoders, contentType)

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ const determineTransport = function (transports, url) {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`const negotiateDecoder = function (decoders, contentType) {`
`17`		`- if (contentType === undefined) {`
	`17`	`+ if (contentType === undefined \|\| contentType === null) {`
`18`	`18`	`return decoders[0]`
`19`	`19`	`}`
`20`	`20`